wine-commits March 2009

wine-commits@winehq.org

2 participants
834 discussions

Damjan Jovanovic : winemenubuilder: Use the user-dirs desktop directory instead of hardcoding ~/Desktop.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 612d47d3b573d19b3d8f195a8e70d8b718d2addf URL: http://source.winehq.org/git/wine.git/?a=commit;h=612d47d3b573d19b3d8f195a8… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Mar 30 20:06:31 2009 +0200 winemenubuilder: Use the user-dirs desktop directory instead of hardcoding ~/Desktop. --- programs/winemenubuilder/winemenubuilder.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 0c42b30..96d3c0f 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -146,6 +146,7 @@ typedef struct static char *xdg_config_dir; static char *xdg_data_dir; +static char *xdg_desktop_dir; /* Icon extraction routines * @@ -1382,7 +1383,7 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) lastEntry = link_name; else ++lastEntry; - location = heap_printf("%s/Desktop/%s.desktop", getenv("HOME"), lastEntry); + location = heap_printf("%s/%s.desktop", xdg_desktop_dir, lastEntry); if (location) { r = !write_desktop_entry(location, lastEntry, escaped_path, escaped_args, escaped_description, work_dir, icon_name); @@ -1464,7 +1465,7 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link lastEntry = link_name; else ++lastEntry; - location = heap_printf("%s/Desktop/%s.desktop", getenv("HOME"), lastEntry); + location = heap_printf("%s/%s.desktop", xdg_desktop_dir, lastEntry); if (location) { r = !write_desktop_entry(location, lastEntry, "winebrowser", escaped_urlPath, NULL, NULL, NULL); @@ -1705,6 +1706,16 @@ static CHAR *next_token( LPSTR *p ) static BOOL init_xdg(void) { + WCHAR shellDesktopPath[MAX_PATH]; + HRESULT hr = SHGetFolderPathW(NULL, CSIDL_DESKTOP, NULL, SHGFP_TYPE_CURRENT, shellDesktopPath); + if (SUCCEEDED(hr)) + xdg_desktop_dir = wine_get_unix_file_name(shellDesktopPath); + if (xdg_desktop_dir == NULL) + { + WINE_ERR("error looking up the desktop directory\n"); + return FALSE; + } + if (getenv("XDG_CONFIG_HOME")) xdg_config_dir = heap_printf("%s/menus/applications-merged", getenv("XDG_CONFIG_HOME")); else @@ -1730,6 +1741,7 @@ static BOOL init_xdg(void) } HeapFree(GetProcessHeap(), 0, xdg_config_dir); } + WINE_ERR("out of memory\n"); return FALSE; } @@ -1744,7 +1756,8 @@ int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show BOOL bURL = FALSE; int ret = 0; - init_xdg(); + if (!init_xdg()) + return 1; for( p = cmdline; p && *p; ) {

1 0

Jacek Caban : urlmon.idl: Added PROTOCOLFILTERDATA declaration.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 1929bfb98f08f27623ce4ebe259fca13c3c411cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1929bfb98f08f27623ce4ebe2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 31 02:42:46 2009 +0200 urlmon.idl: Added PROTOCOLFILTERDATA declaration. --- include/urlmon.idl | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index a3dd39a..3a31452 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1367,6 +1367,14 @@ typedef enum _tagINTERNETFEATURELIST FEATURE_ENTRY_COUNT } INTERNETFEATURELIST; +typedef struct _tagPROTOCOLFILTERDATA { + DWORD cbSize; + IInternetProtocolSink *pProtocolSink; + IInternetProtocol *pProtocol; + IUnknown *pUnk; + DWORD dwFilterFlags; +} PROTOCOLFILTERDATA; + /***************************************************************************** * IUri interface */

1 0

Michael Stefaniuc : credui: Add the Romanian translation.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 9f3055e192901e31a6386777b2d3d3d49d2ca99e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f3055e192901e31a6386777b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 31 00:17:47 2009 +0200 credui: Add the Romanian translation. --- dlls/credui/credui.rc | 1 + dlls/credui/credui_Ro.rc | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/credui/credui.rc b/dlls/credui/credui.rc index d144fd2..f66a942 100644 --- a/dlls/credui/credui.rc +++ b/dlls/credui/credui.rc @@ -38,6 +38,7 @@ IDB_BANNER BITMAP LOADONCALL DISCARDABLE banner.bmp #include "credui_No.rc" #include "credui_Pl.rc" #include "credui_Pt.rc" +#include "credui_Ro.rc" #include "credui_Ru.rc" #include "credui_Si.rc" #include "credui_Sv.rc" diff --git a/dlls/credui/credui_Ro.rc b/dlls/credui/credui_Ro.rc new file mode 100644 index 0000000..73a1140 --- /dev/null +++ b/dlls/credui/credui_Ro.rc @@ -0,0 +1,53 @@ +/* + * Copyright 2007 Robert Shearman (for CodeWeavers) + * Copyright 2009 Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "Nume &utilizator:",-1,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "&Parolă:",-1,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "Ține minte pa&rola",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "OK",IDOK,97,128,50,14 + PUSHBUTTON "Renunță",IDCANCEL,156,128,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "Conectare la %s" + IDS_MESSAGEFORMAT "Conectez la %s" + IDS_INCORRECTPASSWORDTITLE "Autentificare eșuată" + IDS_INCORRECTPASSWORD "Verificați numele de utilizator și parola." + IDS_CAPSLOCKONTITLE "Tasta Caps Lock este activată" + IDS_CAPSLOCKON "Cu tasta Caps Lock activată este foarte probabil că veți introduce parola greșit. \n\nInainte de a introduce parola apăsați tasta Caps Lock pentru a dezactiva scrierea cu majuscule." +} + +#pragma code_page(default)

1 0

Nikolay Sivov : rpcrt4: Implemented RpcEpRegisterW wrapping RpcEpRegisterA.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: fd3b57c53a3cd042e169eb627b6514e08389159b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd3b57c53a3cd042e169eb627… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Mar 30 15:43:58 2009 -0400 rpcrt4: Implemented RpcEpRegisterW wrapping RpcEpRegisterA. --- dlls/rpcrt4/rpc_epmap.c | 15 +++++++++++++++ dlls/rpcrt4/rpcrt4.spec | 2 +- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_epmap.c b/dlls/rpcrt4/rpc_epmap.c index 3035b21..c7eb222 100644 --- a/dlls/rpcrt4/rpc_epmap.c +++ b/dlls/rpcrt4/rpc_epmap.c @@ -281,6 +281,21 @@ RPC_STATUS WINAPI RpcEpRegisterA( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *Bind } /*********************************************************************** + * RpcEpRegisterW (RPCRT4.@) + */ +RPC_STATUS WINAPI RpcEpRegisterW( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *BindingVector, + UUID_VECTOR *UuidVector, RPC_WSTR Annotation ) +{ + LPSTR annA = RPCRT4_strdupWtoA(Annotation); + RPC_STATUS status; + + status = RpcEpRegisterA(IfSpec, BindingVector, UuidVector, (RPC_CSTR)annA); + + HeapFree(GetProcessHeap(), 0, annA); + return status; +} + +/*********************************************************************** * RpcEpUnregister (RPCRT4.@) */ RPC_STATUS WINAPI RpcEpUnregister( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *BindingVector, diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 8c01c84..b8349be 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -371,7 +371,7 @@ @ stdcall RpcEpRegisterA(ptr ptr ptr str) @ stub RpcEpRegisterNoReplaceA @ stub RpcEpRegisterNoReplaceW -@ stub RpcEpRegisterW +@ stdcall RpcEpRegisterW(ptr ptr ptr wstr) @ stdcall RpcEpResolveBinding(ptr ptr) @ stdcall RpcEpUnregister(ptr ptr ptr) @ stub RpcErrorAddRecord # wxp

1 0

Igor Tarasov : comctl32: Correct handling of toolbar separators size.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 2d751ee56afced908d0788b936fa4aac1b29f1a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d751ee56afced908d0788b93… Author: Igor Tarasov <tarasov.igor(a)gmail.com> Date: Mon Mar 30 21:08:18 2009 +0500 comctl32: Correct handling of toolbar separators size. --- dlls/comctl32/toolbar.c | 48 +++++++++++++++++++++++----------------------- 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 92a1366..fe4c539 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1326,17 +1326,14 @@ TOOLBAR_WrapToolbar( HWND hwnd, DWORD dwStyle ) if (btnPtr[i].fsState & TBSTATE_HIDDEN) continue; - /* UNDOCUMENTED: If a separator has a non zero bitmap index, */ - /* it is the actual width of the separator. This is used for */ - /* custom controls in toolbars. */ - /* */ + if (btnPtr[i].cx > 0) + cx = btnPtr[i].cx; /* horizontal separators are treated as buttons for width */ - if ((btnPtr[i].fsStyle & BTNS_SEP) && + else if ((btnPtr[i].fsStyle & BTNS_SEP) && !(infoPtr->dwStyle & CCS_VERT)) - cx = (btnPtr[i].iBitmap > 0) ? - btnPtr[i].iBitmap : SEPARATOR_WIDTH; + cx = SEPARATOR_WIDTH; else - cx = (btnPtr[i].cx) ? btnPtr[i].cx : infoPtr->nButtonWidth; + cx = infoPtr->nButtonWidth; /* Two or more adjacent separators form a separator group. */ /* The first separator in a group should be wrapped to the */ @@ -1684,18 +1681,13 @@ TOOLBAR_LayoutToolbar(HWND hwnd) cy = infoPtr->nButtonHeight; - /* UNDOCUMENTED: If a separator has a non zero bitmap index, */ - /* it is the actual width of the separator. This is used for */ - /* custom controls in toolbars. */ if (btnPtr->fsStyle & BTNS_SEP) { if (infoPtr->dwStyle & CCS_VERT) { - cy = (btnPtr->iBitmap > 0) ? - btnPtr->iBitmap : SEPARATOR_WIDTH; - cx = infoPtr->nButtonWidth; + cy = SEPARATOR_WIDTH; + cx = (btnPtr->cx > 0) ? btnPtr->cx : infoPtr->nButtonWidth; } else - cx = (btnPtr->iBitmap > 0) ? - btnPtr->iBitmap : SEPARATOR_WIDTH; + cx = (btnPtr->cx > 0) ? btnPtr->cx : SEPARATOR_WIDTH; } else { @@ -1758,12 +1750,9 @@ TOOLBAR_LayoutToolbar(HWND hwnd) y += cy; else { - /* UNDOCUMENTED: If a separator has a non zero bitmap index, */ - /* it is the actual width of the separator. This is used for */ - /* custom controls in toolbars. */ if ( !(infoPtr->dwStyle & CCS_VERT)) - y += cy + ( (btnPtr->iBitmap > 0 ) ? - btnPtr->iBitmap : SEPARATOR_WIDTH) * 2 /3; + y += cy + ( (btnPtr->cx > 0 ) ? + btnPtr->cx : SEPARATOR_WIDTH) * 2 /3; else y += cy; @@ -1845,7 +1834,12 @@ TOOLBAR_InternalInsertButtonsT(TOOLBAR_INFO *infoPtr, INT iIndex, UINT nAddButto TOOLBAR_DumpTBButton(lpTbb, fUnicode); ZeroMemory(btnPtr, sizeof(*btnPtr)); - btnPtr->iBitmap = lpTbb[iButton].iBitmap; + + /* When inserting separator, iBitmap controls it's size */ + if (lpTbb[iButton].fsStyle & BTNS_SEP) { + btnPtr->cx = lpTbb[iButton].iBitmap; + } else + btnPtr->iBitmap = lpTbb[iButton].iBitmap; btnPtr->idCommand = lpTbb[iButton].idCommand; btnPtr->fsState = lpTbb[iButton].fsState; btnPtr->fsStyle = lpTbb[iButton].fsStyle; @@ -3400,7 +3394,11 @@ TOOLBAR_GetButtonInfoT(HWND hwnd, WPARAM wParam, LPARAM lParam, BOOL bUnicode) if (lpTbInfo->dwMask & TBIF_LPARAM) lpTbInfo->lParam = btnPtr->dwData; if (lpTbInfo->dwMask & TBIF_SIZE) - lpTbInfo->cx = (WORD)(btnPtr->rect.right - btnPtr->rect.left); + /* tests show that for separators TBIF_SIZE returns not calculated width, + but cx property, that differs from 0 only if application have + specifically set it */ + lpTbInfo->cx = (btnPtr->fsStyle & BTNS_SEP) + ? btnPtr->cx : (WORD)(btnPtr->rect.right - btnPtr->rect.left); if (lpTbInfo->dwMask & TBIF_STATE) lpTbInfo->fsState = btnPtr->fsState; if (lpTbInfo->dwMask & TBIF_STYLE) @@ -4240,7 +4238,9 @@ TOOLBAR_Restore(TOOLBAR_INFO *infoPtr, const TBSAVEPARAMSW *lpSave) { /* separator */ nmtbr.tbButton.fsStyle = TBSTYLE_SEP; - nmtbr.tbButton.iBitmap = SEPARATOR_WIDTH; + /* when inserting separators, iBitmap controls it's size. + 0 sets default size (width) */ + nmtbr.tbButton.iBitmap = 0; } else if (*nmtbr.pCurrent == (DWORD)-2) /* hidden button */

1 0

Igor Tarasov : comctl32: CCS_VERT flips toolbar separators orientation.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 88b64d486d865679ace4eb942df2855ce71310a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88b64d486d865679ace4eb942… Author: Igor Tarasov <tarasov.igor(a)gmail.com> Date: Mon Mar 30 21:05:40 2009 +0500 comctl32: CCS_VERT flips toolbar separators orientation. --- dlls/comctl32/toolbar.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 5ef701d..92a1366 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -492,9 +492,9 @@ TOOLBAR_DrawFlatSeparator (const RECT *lpRect, HDC hdc, const TOOLBAR_INFO *info /*********************************************************************** -* TOOLBAR_DrawDDFlatSeparator +* TOOLBAR_DrawFlatHorizontalSeparator * -* This function draws the separator that was flagged as BTNS_DROPDOWN. +* This function draws horizontal separator for toolbars having CCS_VERT style. * In this case, the separator is a pixel high line of COLOR_BTNSHADOW, * followed by a pixel high line of COLOR_BTNHIGHLIGHT. These separators * are horizontal as opposed to the vertical separators for not dropdown @@ -503,7 +503,7 @@ TOOLBAR_DrawFlatSeparator (const RECT *lpRect, HDC hdc, const TOOLBAR_INFO *info * FIXME: It is possible that the height of each line is really SM_CYBORDER. */ static void -TOOLBAR_DrawDDFlatSeparator (const RECT *lpRect, HDC hdc, +TOOLBAR_DrawFlatHorizontalSeparator (const RECT *lpRect, HDC hdc, const TOOLBAR_INFO *infoPtr) { RECT myrect; @@ -855,8 +855,8 @@ TOOLBAR_DrawButton (HWND hwnd, TBUTTON_INFO *btnPtr, HDC hdc, DWORD dwBaseCustDr /* empirical tests show that iBitmap can/will be non-zero */ /* when drawing the vertical bar... */ if ((dwStyle & TBSTYLE_FLAT) /* && (btnPtr->iBitmap == 0) */) { - if (btnPtr->fsStyle & BTNS_DROPDOWN) - TOOLBAR_DrawDDFlatSeparator (&rc, hdc, infoPtr); + if (dwStyle & CCS_VERT) + TOOLBAR_DrawFlatHorizontalSeparator (&rc, hdc, infoPtr); else TOOLBAR_DrawFlatSeparator (&rc, hdc, infoPtr); } @@ -1330,10 +1330,9 @@ TOOLBAR_WrapToolbar( HWND hwnd, DWORD dwStyle ) /* it is the actual width of the separator. This is used for */ /* custom controls in toolbars. */ /* */ - /* BTNS_DROPDOWN separators are treated as buttons for */ - /* width. - GA 8/01 */ + /* horizontal separators are treated as buttons for width */ if ((btnPtr[i].fsStyle & BTNS_SEP) && - !(btnPtr[i].fsStyle & BTNS_DROPDOWN)) + !(infoPtr->dwStyle & CCS_VERT)) cx = (btnPtr[i].iBitmap > 0) ? btnPtr[i].iBitmap : SEPARATOR_WIDTH; else @@ -1689,7 +1688,7 @@ TOOLBAR_LayoutToolbar(HWND hwnd) /* it is the actual width of the separator. This is used for */ /* custom controls in toolbars. */ if (btnPtr->fsStyle & BTNS_SEP) { - if (btnPtr->fsStyle & BTNS_DROPDOWN) { + if (infoPtr->dwStyle & CCS_VERT) { cy = (btnPtr->iBitmap > 0) ? btnPtr->iBitmap : SEPARATOR_WIDTH; cx = infoPtr->nButtonWidth; @@ -1762,7 +1761,7 @@ TOOLBAR_LayoutToolbar(HWND hwnd) /* UNDOCUMENTED: If a separator has a non zero bitmap index, */ /* it is the actual width of the separator. This is used for */ /* custom controls in toolbars. */ - if ( !(btnPtr->fsStyle & BTNS_DROPDOWN)) + if ( !(infoPtr->dwStyle & CCS_VERT)) y += cy + ( (btnPtr->iBitmap > 0 ) ? btnPtr->iBitmap : SEPARATOR_WIDTH) * 2 /3; else

1 0

Tobias Jakobi : wined3d: Simplify sampler_texmatrix using pow2Matrix_identity.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 94a7cd42ed13d1f644ef5ac4d0e8aa614083541e URL: http://source.winehq.org/git/wine.git/?a=commit;h=94a7cd42ed13d1f644ef5ac4d… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Thu Mar 26 03:47:58 2009 +0100 wined3d: Simplify sampler_texmatrix using pow2Matrix_identity. --- dlls/wined3d/state.c | 19 ++----------------- 1 files changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2aa2b78..47a94a0 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3290,8 +3290,7 @@ static void tex_bumpenvlscale(DWORD state, IWineD3DStateBlockImpl *stateblock, W } static void sampler_texmatrix(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { - BOOL texIsPow2 = FALSE; - DWORD sampler = state - STATE_SAMPLER(0); + const DWORD sampler = state - STATE_SAMPLER(0); IWineD3DBaseTexture *texture = stateblock->textures[sampler]; TRACE("state %#x, stateblock %p, context %p\n", state, stateblock, context); @@ -3305,21 +3304,7 @@ static void sampler_texmatrix(DWORD state, IWineD3DStateBlockImpl *stateblock, W * misc pipeline */ if(sampler < MAX_TEXTURES) { - UINT texture_dimensions = IWineD3DBaseTexture_GetTextureDimensions(texture); - - if (texture_dimensions == GL_TEXTURE_2D || texture_dimensions == GL_TEXTURE_RECTANGLE_ARB) - { - if(((IWineD3DTextureImpl *)texture)->baseTexture.pow2Matrix[0] != 1.0 || - ((IWineD3DTextureImpl *)texture)->baseTexture.pow2Matrix[5] != 1.0 ) { - texIsPow2 = TRUE; - } - } - else if (texture_dimensions == GL_TEXTURE_CUBE_MAP_ARB) - { - if(((IWineD3DCubeTextureImpl *)texture)->baseTexture.pow2Matrix[0] != 1.0) { - texIsPow2 = TRUE; - } - } + const BOOL texIsPow2 = !((IWineD3DBaseTextureImpl *)texture)->baseTexture.pow2Matrix_identity; if (texIsPow2 || (context->lastWasPow2Texture & (1 << sampler))) {

1 0

Tobias Jakobi : wined3d: GLSL: Implement texrect coord fixup.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 38239be58ca709ca107752ca7d3fee0763832725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38239be58ca709ca107752ca7… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Thu Mar 26 03:19:41 2009 +0100 wined3d: GLSL: Implement texrect coord fixup. --- dlls/wined3d/glsl_shader.c | 53 +++++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/state.c | 17 ++++++++++++- 2 files changed, 67 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index da0b1a8..c92f99b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -100,6 +100,7 @@ struct glsl_shader_prog_link { GLint vuniformI_locations[MAX_CONST_I]; GLint puniformI_locations[MAX_CONST_I]; GLint posFixup_location; + GLint rectFixup_location[MAX_FRAGMENT_SAMPLERS]; GLint bumpenvmat_location[MAX_TEXTURES]; GLint luminancescale_location[MAX_TEXTURES]; GLint luminanceoffset_location[MAX_TEXTURES]; @@ -587,6 +588,24 @@ static void shader_glsl_load_constants( } GL_EXTCALL(glUniform4fvARB(prog->ycorrection_location, 1, correction_params)); } + + /* Constant loading for texture rect coord fixup. */ + if (prog->ps_args.texrect_fixup) { + UINT fixup = prog->ps_args.texrect_fixup; + + for (i = 0; fixup; fixup >>= 1, ++i) { + if (-1 != prog->rectFixup_location[i]) { + const IWineD3DBaseTextureImpl* const tex = (const IWineD3DBaseTextureImpl*) stateBlock->textures[i]; + if (!tex) { + FIXME("Non-existant texture is flagged for NP2 texcoord fixup\n"); + continue; + } else { + const float tex_dim[2] = {tex->baseTexture.pow2Matrix[0], tex->baseTexture.pow2Matrix[5]}; + GL_EXTCALL(glUniform2fvARB(prog->rectFixup_location[i], 1, tex_dim)); + } + } + } + } } if (priv->next_constant_version == UINT_MAX) @@ -774,6 +793,14 @@ static void shader_generate_glsl_declarations(IWineD3DBaseShader *iface, const s } else { shader_addline(buffer, "uniform sampler2D %csampler%u;\n", prefix, i); } + + if(ps_args->texrect_fixup & (1 << i)) { + /* RECT textures in OpenGL use texcoords in the range [0,width]x[0,height] + * while D3D has them in the (normalized) [0,1]x[0,1] range. + * samplerRectFixup stores texture dimensions and is updated through + * shader_glsl_load_constants when the sampler changes. */ + shader_addline(buffer, "uniform vec2 %csamplerRectFixup%u;\n", prefix, i); + } break; case WINED3DSTT_CUBE: shader_addline(buffer, "uniform samplerCube %csampler%u;\n", prefix, i); @@ -1475,6 +1502,7 @@ static void PRINTF_ATTR(6, 7) shader_glsl_gen_sample_code(const SHADER_OPCODE_AR const char *sampler_base; char dst_swizzle[6]; struct color_fixup_desc fixup; + BOOL rect_fixup = FALSE; va_list args; shader_glsl_get_swizzle(swizzle, FALSE, arg->dst, dst_swizzle); @@ -1483,6 +1511,14 @@ static void PRINTF_ATTR(6, 7) shader_glsl_gen_sample_code(const SHADER_OPCODE_AR IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *) arg->shader; fixup = This->cur_args->color_fixup[sampler]; sampler_base = "Psampler"; + + if(This->cur_args->texrect_fixup & (1 << sampler)) { + if(bias) { + FIXME("Biased sampling from RECT textures is unsupported\n"); + } else { + rect_fixup = TRUE; + } + } } else { sampler_base = "Vsampler"; fixup = COLOR_FIXUP_IDENTITY; /* FIXME: Vshader color fixup */ @@ -1499,7 +1535,11 @@ static void PRINTF_ATTR(6, 7) shader_glsl_gen_sample_code(const SHADER_OPCODE_AR if(bias) { shader_addline(arg->buffer, ", %s)%s);\n", bias, dst_swizzle); } else { - shader_addline(arg->buffer, ")%s);\n", dst_swizzle); + if (rect_fixup) { + shader_addline(arg->buffer, " * PsamplerRectFixup%u)%s);\n", sampler, dst_swizzle); + } else { + shader_addline(arg->buffer, ")%s);\n", dst_swizzle); + } } if(!is_identity_fixup(fixup)) { @@ -3479,6 +3519,17 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use } } + if (use_ps && ps_compile_args.texrect_fixup) { + char name[32]; + for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) { + if (ps_compile_args.texrect_fixup & (1 << i)) { + sprintf(name, "PsamplerRectFixup%u", i); + entry->rectFixup_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); + } else { + entry->rectFixup_location[i] = -1; + } + } + } entry->posFixup_location = GL_EXTCALL(glGetUniformLocationARB(programId, "posFixup")); entry->ycorrection_location = GL_EXTCALL(glGetUniformLocationARB(programId, "ycorrection")); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 0953042..2aa2b78 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3022,8 +3022,12 @@ static void transform_texture(DWORD state, IWineD3DStateBlockImpl *stateblock, W if(generated) { FIXME("Non-power2 texture being used with generated texture coords\n"); } - TRACE("Non power two matrix multiply fixup\n"); - glMultMatrixf(((IWineD3DTextureImpl *) stateblock->textures[texUnit])->baseTexture.pow2Matrix); + /* NP2 texcoord fixup is implemented for pixelshaders (currently only in GLSL backend) so + only enable the fixed-function-pipeline fixup via pow2Matrix when no PS is used. */ + if (!use_ps(stateblock)) { + TRACE("Non power two matrix multiply fixup\n"); + glMultMatrixf(((IWineD3DTextureImpl *) stateblock->textures[texUnit])->baseTexture.pow2Matrix); + } } } @@ -3375,6 +3379,15 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont state_alpha(WINED3DRS_COLORKEYENABLE, stateblock, context); } } + + /* Trigger shader constant reloading (for NP2 texcoord fixup) + * Only do this if pshaders are used (note: fixup is currently only implemented in GLSL). */ + if (!tex_impl->baseTexture.pow2Matrix_identity && use_ps(stateblock)) { + IWineD3DDeviceImpl* d3ddevice = stateblock->wineD3DDevice; + /* FIXME: add something like shader_load_rectfixup_consts to the backend to only reload the + * constants that are used for the fixup (and not the other ones too) */ + d3ddevice->shader_backend->shader_load_constants((IWineD3DDevice*)d3ddevice, use_ps(stateblock), use_vs(stateblock)); + } } else if(mapped_stage < GL_LIMITS(textures)) { if(sampler < stateblock->lowest_disabled_stage) { /* TODO: What should I do with pixel shaders here ??? */

1 0

Tobias Jakobi : wined3d: Add texrect_fixup bitfield to ps_compile_args struct.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 1b335dfaaa8fc2f2a45c5979beecaae84e019ae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b335dfaaa8fc2f2a45c5979b… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Thu Mar 26 03:15:21 2009 +0100 wined3d: Add texrect_fixup bitfield to ps_compile_args struct. Initialization of the bitfield done in find_ps_compile_args based on the previously introduced pow2Matrix_identity flag. --- dlls/wined3d/pixelshader.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 6 +++++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index a974ca5..de609a7 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -460,6 +460,7 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImp memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set */ args->srgb_correction = stateblock->renderState[WINED3DRS_SRGBWRITEENABLE] ? 1 : 0; + args->texrect_fixup = 0; for(i = 0; i < MAX_FRAGMENT_SAMPLERS; i++) { if(shader->baseShader.reg_maps.samplers[i] == 0) continue; @@ -469,6 +470,11 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImp continue; } args->color_fixup[i] = tex->resource.format_desc->color_fixup; + + /* Flag samplers that need NP2 texcoord fixup. */ + if(!tex->baseTexture.pow2Matrix_identity) { + args->texrect_fixup |= (1 << i); + } } if (shader->baseShader.reg_maps.shader_version >= WINED3DPS_VERSION(3,0)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index abab9dc..8907b0f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -446,11 +446,15 @@ enum fogmode { */ struct ps_compile_args { struct color_fixup_desc color_fixup[MAX_FRAGMENT_SAMPLERS]; - BOOL srgb_correction; enum vertexprocessing_mode vp_mode; enum fogmode fog; /* Projected textures(ps 1.0-1.3) */ /* Texture types(2D, Cube, 3D) in ps 1.x */ + BOOL srgb_correction; + WORD texrect_fixup; + /* Bitmap for texture rect coord fixups (16 samplers max currently). + D3D9 has a limit of 16 samplers and the fixup is superfluous + in D3D10 (unconditional NP2 support mandatory). */ }; #define MAX_ATTRIBS 16

1 0

Tobias Jakobi : wined3d: Add pow2Matrix_identity flag to BaseTextureClass struct.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 31f8cd9621f6074293eeac21745adfce7cefdaef URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f8cd9621f6074293eeac217… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Thu Mar 26 03:12:50 2009 +0100 wined3d: Add pow2Matrix_identity flag to BaseTextureClass struct. New flag helps to quickly find out whether the pow2Matrix is a identity matrix (no texcoord fixup needed) or not. --- dlls/wined3d/basetexture.c | 1 + dlls/wined3d/device.c | 18 +++++++++++++++--- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 8349064..caf2148 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -35,6 +35,7 @@ void basetexture_init(struct IWineD3DBaseTextureClass *texture, UINT levels, DWO texture->dirty = TRUE; texture->srgbDirty = TRUE; texture->is_srgb = FALSE; + texture->pow2Matrix_identity = TRUE; } void basetexture_cleanup(IWineD3DBaseTexture *iface) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5d3f400..0f6885f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1233,6 +1233,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, (Width != pow2Width || Height != pow2Height) && !((Format == WINED3DFMT_P8) && GL_SUPPORT(EXT_PALETTED_TEXTURE) && (wined3d_settings.rendertargetlock_mode == RTL_READTEX || wined3d_settings.rendertargetlock_mode == RTL_TEXTEX))) { + if ((Width != 1) || (Height != 1)) { + object->baseTexture.pow2Matrix_identity = FALSE; + } + object->baseTexture.pow2Matrix[0] = (float)Width; object->baseTexture.pow2Matrix[5] = (float)Height; object->baseTexture.pow2Matrix[10] = 1.0; @@ -1241,8 +1245,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, object->cond_np2 = TRUE; object->baseTexture.minMipLookup = minMipLookup_noFilter; } else { - object->baseTexture.pow2Matrix[0] = (((float)Width) / ((float)pow2Width)); - object->baseTexture.pow2Matrix[5] = (((float)Height) / ((float)pow2Height)); + if ((Width != pow2Width) || (Height != pow2Height)) { + object->baseTexture.pow2Matrix_identity = FALSE; + object->baseTexture.pow2Matrix[0] = (((float)Width) / ((float)pow2Width)); + object->baseTexture.pow2Matrix[5] = (((float)Height) / ((float)pow2Height)); + } else { + object->baseTexture.pow2Matrix[0] = 1.0; + object->baseTexture.pow2Matrix[5] = 1.0; + } + object->baseTexture.pow2Matrix[10] = 1.0; object->baseTexture.pow2Matrix[15] = 1.0; object->target = GL_TEXTURE_2D; @@ -1540,7 +1551,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface pow2EdgeLength = 1; while (pow2EdgeLength < EdgeLength) pow2EdgeLength <<= 1; - if (GL_SUPPORT(ARB_TEXTURE_NON_POWER_OF_TWO)) { + if (GL_SUPPORT(ARB_TEXTURE_NON_POWER_OF_TWO) || (EdgeLength == pow2EdgeLength)) { /* Precalculated scaling for 'faked' non power of two texture coords */ object->baseTexture.pow2Matrix[ 0] = 1.0; object->baseTexture.pow2Matrix[ 5] = 1.0; @@ -1552,6 +1563,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface object->baseTexture.pow2Matrix[ 5] = ((float)EdgeLength) / ((float)pow2EdgeLength); object->baseTexture.pow2Matrix[10] = ((float)EdgeLength) / ((float)pow2EdgeLength); object->baseTexture.pow2Matrix[15] = 1.0; + object->baseTexture.pow2Matrix_identity = FALSE; } if (object->resource.format_desc->Flags & WINED3DFMT_FLAG_FILTERING) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fdd28da..abab9dc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1384,6 +1384,7 @@ typedef struct IWineD3DBaseTextureClass LONG bindCount; DWORD sampler; BOOL is_srgb; + BOOL pow2Matrix_identity; const struct min_lookup *minMipLookup; const GLenum *magLookup; void (*internal_preload)(IWineD3DBaseTexture *iface, enum WINED3DSRGB srgb);

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 March 2009