wine-commits December 2007

wine-commits@winehq.org

3 participants
824 discussions

Stefan Dösinger : wined3d: Combine two glScalef calls into one.
by Alexandre Julliard 27 Dec '07

27 Dec '07

Module: wine Branch: master Commit: fd711c57df5005ad2664cd66a75bbd83556c1eaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd711c57df5005ad2664cd66a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 26 22:12:05 2007 +0100 wined3d: Combine two glScalef calls into one. --- dlls/wined3d/state.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c62e3fa..59ff3d4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2826,15 +2826,15 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock */ glTranslatef(1.0 / stateblock->viewport.Width, -1.0/ stateblock->viewport.Height, -1.0); checkGLcall("glTranslatef (1.0 / width, -1.0 / height, -1.0)"); - glScalef(1.0, 1.0, 2.0); - checkGLcall("glScalef"); - - /* D3D texture coordinates are flipped compared to OpenGL ones, so - * render everything upside down when rendering offscreen. */ if (stateblock->wineD3DDevice->render_offscreen) { - glScalef(1.0, -1.0, 1.0); - checkGLcall("glScalef"); + /* D3D texture coordinates are flipped compared to OpenGL ones, so + * render everything upside down when rendering offscreen. */ + glScalef(1.0, -1.0, 2.0); + } else { + glScalef(1.0, 1.0, 2.0); } + checkGLcall("glScalef"); + glMultMatrixf((float *) &stateblock->transforms[WINED3DTS_PROJECTION].u.m[0][0]); checkGLcall("glLoadMatrixf"); }

1 0

Stefan Dösinger : wined3d: Get rid of the invymat.
by Alexandre Julliard 27 Dec '07

27 Dec '07

Module: wine Branch: master Commit: 44b8915371a7a021e39c2f298d00b8e4be583fc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44b8915371a7a021e39c2f298… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 25 23:14:05 2007 +0100 wined3d: Get rid of the invymat. glScalef(1.0, -1.0, 1.0) does the same as the glMultMatrix with the invymat matrix, and it is more optimal. --- dlls/wined3d/state.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8e9e19b..c62e3fa 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2735,12 +2735,6 @@ static void transform_view(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine } } -static const GLfloat invymat[16] = { - 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, -1.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f}; - static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { glMatrixMode(GL_PROJECTION); checkGLcall("glMatrixMode(GL_PROJECTION)"); @@ -2808,8 +2802,8 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock /* D3D texture coordinates are flipped compared to OpenGL ones, so * render everything upside down when rendering offscreen. */ if (stateblock->wineD3DDevice->render_offscreen) { - glMultMatrixf(invymat); - checkGLcall("glMultMatrixf(invymat)"); + glScalef(1.0, -1.0, 1.0); + checkGLcall("glScalef"); } } else { /* The rule is that the window coordinate 0 does not correspond to the @@ -2833,12 +2827,13 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock glTranslatef(1.0 / stateblock->viewport.Width, -1.0/ stateblock->viewport.Height, -1.0); checkGLcall("glTranslatef (1.0 / width, -1.0 / height, -1.0)"); glScalef(1.0, 1.0, 2.0); + checkGLcall("glScalef"); /* D3D texture coordinates are flipped compared to OpenGL ones, so * render everything upside down when rendering offscreen. */ if (stateblock->wineD3DDevice->render_offscreen) { - glMultMatrixf(invymat); - checkGLcall("glMultMatrixf(invymat)"); + glScalef(1.0, -1.0, 1.0); + checkGLcall("glScalef"); } glMultMatrixf((float *) &stateblock->transforms[WINED3DTS_PROJECTION].u.m[0][0]); checkGLcall("glLoadMatrixf");

1 0

Stefan Dösinger : wined3d: Fix a problem in BltOverride.
by Alexandre Julliard 27 Dec '07

27 Dec '07

Module: wine Branch: master Commit: 2bec23fd7c059e0d4c90652f12d8c0675a620602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bec23fd7c059e0d4c90652f1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 25 22:57:01 2007 +0100 wined3d: Fix a problem in BltOverride. --- dlls/wined3d/surface.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 30d6507..f9df55e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2974,13 +2974,11 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * } else if(dstSwapchain) { if(SrcSurface != myDevice->render_targets[0]) { ERR("Unexpected render target -> render target blit\n"); + return 0; } TRACE("Blit from active render target to a swapchain\n"); /* Handled with regular texture -> swapchain blit */ - } else if(srcSwapchain) { - if(This != (IWineD3DSurfaceImpl *) myDevice->render_targets[0]) { - ERR("Unexpected render target -> render target blit\n"); - } + } else if(srcSwapchain && This == (IWineD3DSurfaceImpl *) myDevice->render_targets[0]) { FIXME("Implement blit from a swapchain to the active render target\n"); return WINED3DERR_INVALIDCALL; }

1 0

Gerald Pfeifer : msi: Fix error handling in encode_streamname().
by Alexandre Julliard 27 Dec '07

27 Dec '07

Module: wine Branch: master Commit: 05cf0bdf815d6883c9bce08f3c145538090cd90b URL: http://source.winehq.org/git/wine.git/?a=commit;h=05cf0bdf815d6883c9bce08f3… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Dec 26 22:44:22 2007 +0100 msi: Fix error handling in encode_streamname(). --- dlls/msi/table.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index ca6fa1b..e5ad1af 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -189,7 +189,7 @@ LPWSTR encode_streamname(BOOL bTable, LPCWSTR in) if( next && (next<0x80) ) { next = utf2mime(next); - if( next >= 0 ) + if( next != -1 ) { next += 0x3ffffc0; ch += (next<<6);

1 0

Alexander Dorofeyev : wined3d: Also update alpha test when stage texture is NULL.
by Alexandre Julliard 27 Dec '07

27 Dec '07

Module: wine Branch: master Commit: 27c98fd6287df0595842eba8d5ef507316187f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=27c98fd6287df0595842eba8d… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Dec 27 00:23:59 2007 -0800 wined3d: Also update alpha test when stage texture is NULL. --- dlls/wined3d/state.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 08ad5c2..8e9e19b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2421,6 +2421,13 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont if(!isStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3DTSS_COLOROP))) { activate_dimensions(sampler, stateblock, context); } + + if(stateblock->renderState[WINED3DRS_COLORKEYENABLE] && sampler == 0) { + /* If color keying is enabled update the alpha test, it depends on the existence + * of a color key in stage 0 + */ + state_alpha(WINED3DRS_COLORKEYENABLE, stateblock, context); + } } /* Otherwise tex_colorop disables the stage */ glBindTexture(GL_TEXTURE_2D, stateblock->wineD3DDevice->dummyTextureName[sampler]); checkGLcall("glBindTexture(GL_TEXTURE_2D, stateblock->wineD3DDevice->dummyTextureName[sampler])");

1 0

Zachary Goldberg : Fix some typos
by Jeremy Newman 26 Dec '07

26 Dec '07

Module: website Branch: master Commit: e46cdf8cc788e468069d4642355a2a913805baac URL: http://source.winehq.org/git/website.git/?a=commit;h=e46cdf8cc788e468069d46… Author: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Mon Dec 24 10:14:15 2007 -0500 Fix some typos Thanks Dan Kegel --- wwn/wn20071224_336.xml | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/wwn/wn20071224_336.xml b/wwn/wn20071224_336.xml index 184be75..ae7bbd6 100644 --- a/wwn/wn20071224_336.xml +++ b/wwn/wn20071224_336.xml @@ -76,9 +76,7 @@ Picasa, Google's now famous iPhoto-style application now has a <a href="http://p <quote> Google has released a beta preview of Picasa 2.7 for Linux adding web album integration, more editing features and better RAW support. The new beta still isn't a native app (much of its code comes from the Windows version and runs via the included Wine components), but it does run considerably faster and the web album features will be welcome news for Picasa Web users. -Despite the improvements, the Linux version of Picasa lags behind its Windows counterpart in a number of areas - there's still no video support, full-screen slideshows won't work and many of the blogging features are missing. - -That said, Picasa's RAW support "just works" much better than any of the other options I've tried, and it remains (even as a beta) quite snappy and stable. +[...] Picasa's RAW support "just works" much better than any of the other options I've tried, and it remains (even as a beta) quite snappy and stable. </quote> @@ -190,7 +188,7 @@ volunteers the next day: </quote> -Of course this thread wouldn't be complete without Alex Julliard also reliving old memories: +Of course this thread wouldn't be complete without Alexandre Julliard also reliving old memories: <quote> The 0.0.2 release was on June 29, and 0.0.1 was about a week before

1 0

Jeremy Newman : WWN Issue 336
by Jeremy Newman 26 Dec '07

26 Dec '07

Module: website Branch: master Commit: f57f31e2466b2af4b80f5f83d2fd426b4dbb47c0 URL: http://source.winehq.org/git/website.git/?a=commit;h=f57f31e2466b2af4b80f5f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Dec 26 10:34:40 2007 -0600 WWN Issue 336 --- news/2007122401.xml | 7 + wwn/wn20071224_336.xml | 670 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 677 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=f57f31e2466b2af4b8…

1 0

Jeremy Newman : add font tag support to wwn xml parser
by Jeremy Newman 26 Dec '07

26 Dec '07

Module: website Branch: master Commit: ded81c279d350b732bdd4ec0c251cc70f852ac19 URL: http://source.winehq.org/git/website.git/?a=commit;h=ded81c279d350b732bdd4e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Dec 26 10:07:31 2007 -0600 add font tag support to wwn xml parser Author: Zachary Goldberg <zgs(a)seas.upenn.edu> --- include/wwn.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/wwn.php b/include/wwn.php index 0d9f8ec..14ca6b2 100644 --- a/include/wwn.php +++ b/include/wwn.php @@ -30,6 +30,7 @@ class wwn "center" => "center", "code" => "code", "div" => "div", + "font" => "font", "i" => "i", "img" => "img", "li" => "li",

1 0

Alexander Nicolaysen Sørnes : comdlg32: PageSetupDlgW: Load paper orientation in ChangePrinterW.
by Alexandre Julliard 26 Dec '07

26 Dec '07

Module: wine Branch: master Commit: 5624948c71157d2ec3c7864d5cc32d04e8ed922c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5624948c71157d2ec3c7864d5… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Dec 23 15:55:15 2007 +0100 comdlg32: PageSetupDlgW: Load paper orientation in ChangePrinterW. --- dlls/comdlg32/printdlg.c | 53 +++++++++++++++++++++++---------------------- 1 files changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index dd290d5..6b8ed15 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2684,6 +2684,23 @@ PRINTDLG_PS_ChangePrinterA(HWND hDlg, PageSetupDataA *pda) { return TRUE; } +static void PRINTDLG_PS_SetOrientationW(HWND hDlg, PageSetupDataW* pda) +{ + WCHAR PaperName[64]; + + GetDlgItemTextW(hDlg, cmb2, PaperName, sizeof(PaperName)/sizeof(WCHAR)); + PRINTDLG_PaperSizeW(&pda->pdlg, PaperName, &pda->curdlg.ptPaperSize); + pda->curdlg.ptPaperSize.x = _c_10mm2size((LPPAGESETUPDLGA)pda->dlga, pda->curdlg.ptPaperSize.x); + pda->curdlg.ptPaperSize.y = _c_10mm2size((LPPAGESETUPDLGA)pda->dlga, pda->curdlg.ptPaperSize.y); + + if(IsDlgButtonChecked(hDlg, rad2)) + { + DWORD tmp = pda->curdlg.ptPaperSize.x; + pda->curdlg.ptPaperSize.x = pda->curdlg.ptPaperSize.y; + pda->curdlg.ptPaperSize.y = tmp; + } +} + static BOOL PRINTDLG_PS_ChangePrinterW(HWND hDlg, PageSetupDataW *pda) { DEVNAMES *dn; @@ -2696,8 +2713,18 @@ PRINTDLG_PS_ChangePrinterW(HWND hDlg, PageSetupDataW *pda) { portname = ((WCHAR*)dn)+dn->wOutputOffset; PRINTDLG_SetUpPaperComboBoxW(hDlg,cmb2,devname,portname,dm); PRINTDLG_SetUpPaperComboBoxW(hDlg,cmb3,devname,portname,dm); + + /* Landscape orientation */ + if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE) + CheckRadioButton(hDlg, rad1, rad2, rad2); + else /* this is default if papersize is not set */ + CheckRadioButton(hDlg, rad1, rad2, rad1); + GlobalUnlock(pda->pdlg.hDevNames); GlobalUnlock(pda->pdlg.hDevMode); + + PRINTDLG_PS_SetOrientationW(hDlg, pda); + return TRUE; } @@ -3302,7 +3329,6 @@ PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { '_', '_', 'W', 'I', 'N', 'E', '_', 'P', 'A', 'G', 'E', 'S', 'E', 'T', 'U', 'P', 'D', 'L', 'G', 'D', 'A', 'T', 'A', 0 }; PageSetupDataW *pda; - LPDEVMODEW dm; BOOL res = FALSE; if (uMsg==WM_INITDIALOG) { @@ -3332,31 +3358,6 @@ PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) PRINTDLG_PS_ChangePrinterW(hDlg,pda); - if(pda->dlga->hDevMode) - { - WCHAR PaperName[64]; - - dm = GlobalLock(pda->dlga->hDevMode); - /* Landscape orientation */ - if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE) - CheckRadioButton(hDlg, rad1, rad2, rad2); - else /* this is default if papersize is not set */ - CheckRadioButton(hDlg, rad1, rad2, rad1); - - GetDlgItemTextW(hDlg, cmb2, PaperName, sizeof(PaperName)/sizeof(WCHAR)); - PRINTDLG_PaperSizeW(&pda->pdlg, PaperName, &pda->curdlg.ptPaperSize); - pda->curdlg.ptPaperSize.x = _c_10mm2size((LPPAGESETUPDLGA)pda->dlga, pda->curdlg.ptPaperSize.x); - pda->curdlg.ptPaperSize.y = _c_10mm2size((LPPAGESETUPDLGA)pda->dlga, pda->curdlg.ptPaperSize.y); - GlobalUnlock(pda->dlga->hDevMode); - - if(IsDlgButtonChecked(hDlg, rad2)) - { - DWORD tmp = pda->curdlg.ptPaperSize.x; - pda->curdlg.ptPaperSize.x = pda->curdlg.ptPaperSize.y; - pda->curdlg.ptPaperSize.y = tmp; - } - } - if (pda->dlga->Flags & PSD_DISABLEORIENTATION) { EnableWindow(GetDlgItem(hDlg,rad1),FALSE); EnableWindow(GetDlgItem(hDlg,rad2),FALSE);

1 0

Alexander Dorofeyev : wined3d: Add zero/near zero vertex rhw special case.
by Alexandre Julliard 26 Dec '07

26 Dec '07

Module: wine Branch: master Commit: 1e23602d4bc93ebf609c2a6d99654e2bf3996786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e23602d4bc93ebf609c2a6d9… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Tue Dec 25 00:18:21 2007 -0800 wined3d: Add zero/near zero vertex rhw special case. --- dlls/wined3d/directx.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9e6bf33..9536b71 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2906,9 +2906,14 @@ static void position_d3dcolor(void *data) { } static void position_float4(void *data) { GLfloat *pos = (float *) data; - float w = 1.0 / pos[3]; - glVertex4f(pos[0] * w, pos[1] * w, pos[2] * w, w); + if (pos[3] < eps && pos[3] > -eps) + glVertex3fv(pos); + else { + float w = 1.0 / pos[3]; + + glVertex4f(pos[0] * w, pos[1] * w, pos[2] * w, w); + } } static void diffuse_d3dcolor(void *data) {

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
83
Older →

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 December 2007