August 2008 - Wine-commits - list.winehq.org

Luis C. Busquets Pérez : d3dx9: Add types to d3dx9shader.h.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: 5c1fa0eeded73e7cf42703377acc388999e61733 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1fa0eeded73e7cf42703377… Author: Luis C. Busquets Pérez <luiscar2001(a)yahoo.es> Date: Mon Aug 25 18:47:45 2008 +0200 d3dx9: Add types to d3dx9shader.h. --- include/d3dx9shader.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h index 0e629d9..a50b72a 100644 --- a/include/d3dx9shader.h +++ b/include/d3dx9shader.h @@ -21,6 +21,50 @@ #include "d3dx9.h" +typedef LPCSTR D3DXHANDLE; + +typedef enum D3DXPARAMETER_CLASS +{ + D3DXPC_SCALAR, + D3DXPC_VECTOR, + D3DXPC_MATRIX_ROWS, + D3DXPC_MATRIX_COLUMNS, + D3DXPC_OBJECT, + D3DXPC_STRUCT, + D3DXPC_FORCE_DWORD = 0x7fffffff, +} D3DXPARAMETER_CLASS, *LPD3DXPARAMETER_CLASS; + +typedef enum D3DXPARAMETER_TYPE +{ + D3DXPT_VOID, + D3DXPT_BOOL, + D3DXPT_INT, + D3DXPT_FLOAT, + D3DXPT_STRING, + D3DXPT_TEXTURE, + D3DXPT_TEXTURE1D, + D3DXPT_TEXTURE2D, + D3DXPT_TEXTURE3D, + D3DXPT_TEXTURECUBE, + D3DXPT_SAMPLER, + D3DXPT_SAMPLER1D, + D3DXPT_SAMPLER2D, + D3DXPT_SAMPLER3D, + D3DXPT_SAMPLERCUBE, + D3DXPT_PIXELSHADER, + D3DXPT_VERTEXSHADER, + D3DXPT_PIXELFRAGMENT, + D3DXPT_VERTEXFRAGMENT, + D3DXPT_UNSUPPORTED, + D3DXPT_FORCE_DWORD = 0x7fffffff, +} D3DXPARAMETER_TYPE, *LPD3DXPARAMETER_TYPE; + +typedef struct _D3DXMACRO { + LPCSTR Name; + LPCSTR Definition; +} D3DXMACRO, *LPD3DXMACRO; + + #ifdef __cplusplus extern "C" { #endif

1 0

Alexander Nicolaysen Sørnes : regedit: Convert searching to Unicode.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: 583bf6e4bfcd6421fc07ad867be01e54f768d39b URL: http://source.winehq.org/git/wine.git/?a=commit;h=583bf6e4bfcd6421fc07ad867… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Aug 25 22:21:58 2008 +0200 regedit: Convert searching to Unicode. --- programs/regedit/framewnd.c | 16 +++++++++------- programs/regedit/main.h | 2 +- programs/regedit/treeview.c | 30 +++++++++++++++--------------- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 958b2c7..1a91826 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -39,7 +39,7 @@ static WCHAR favoritesKey[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','A','p','p','l','e','t','s','\\','R','e','g','E','d','i','t','\\','F','a','v','o','r','i','t','e','s',0}; static BOOL bInMenuLoop = FALSE; /* Tells us if we are in the menu loop */ static WCHAR favoriteName[128]; -static TCHAR searchString[128]; +static WCHAR searchString[128]; static int searchMask = SEARCH_KEYS | SEARCH_VALUES | SEARCH_CONTENT; static TCHAR FileNameBuffer[_MAX_PATH]; @@ -484,26 +484,26 @@ static INT_PTR CALLBACK find_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPA CheckDlgButton(hwndDlg, IDC_FIND_VALUES, searchMask&SEARCH_VALUES ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_FIND_CONTENT, searchMask&SEARCH_CONTENT ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_FIND_WHOLE, searchMask&SEARCH_WHOLE ? BST_CHECKED : BST_UNCHECKED); - SendMessage(hwndValue, EM_SETLIMITTEXT, 127, 0); - SetWindowText(hwndValue, searchString); + SendMessageW(hwndValue, EM_SETLIMITTEXT, 127, 0); + SetWindowTextW(hwndValue, searchString); return TRUE; case WM_COMMAND: switch(LOWORD(wParam)) { case IDC_VALUE_NAME: if (HIWORD(wParam) == EN_UPDATE) { - EnableWindow(GetDlgItem(hwndDlg, IDOK), GetWindowTextLength(hwndValue)>0); + EnableWindow(GetDlgItem(hwndDlg, IDOK), GetWindowTextLengthW(hwndValue)>0); return TRUE; } break; case IDOK: - if (GetWindowTextLength(hwndValue)>0) { + if (GetWindowTextLengthW(hwndValue)>0) { int mask = 0; if (IsDlgButtonChecked(hwndDlg, IDC_FIND_KEYS)) mask |= SEARCH_KEYS; if (IsDlgButtonChecked(hwndDlg, IDC_FIND_VALUES)) mask |= SEARCH_VALUES; if (IsDlgButtonChecked(hwndDlg, IDC_FIND_CONTENT)) mask |= SEARCH_CONTENT; if (IsDlgButtonChecked(hwndDlg, IDC_FIND_WHOLE)) mask |= SEARCH_WHOLE; searchMask = mask; - GetWindowText(hwndValue, searchString, 128); + GetWindowTextW(hwndValue, searchString, 128); EndDialog(hwndDlg, IDOK); } return TRUE; @@ -747,7 +747,9 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) SetFocus(g_pChildWnd->hTreeWnd); } } else { - error(hWnd, IDS_NOTFOUND, searchString); + CHAR* searchStringA = GetMultiByteString(searchString); + error(hWnd, IDS_NOTFOUND, searchStringA); + HeapFree(GetProcessHeap(), 0, searchStringA); } } break; diff --git a/programs/regedit/main.h b/programs/regedit/main.h index abd2d59..0398f57 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -137,7 +137,7 @@ extern BOOL DeleteNode(HWND hwndTV, HTREEITEM hItem); extern HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPWSTR name); extern HWND StartKeyRename(HWND hwndTV); extern HTREEITEM FindPathInTree(HWND hwndTV, LPCWSTR lpKeyName); -extern HTREEITEM FindNext(HWND hwndTV, HTREEITEM hItem, LPCTSTR sstring, int mode, int *row); +extern HTREEITEM FindNext(HWND hwndTV, HTREEITEM hItem, LPCWSTR sstring, int mode, int *row); /* edit.c */ extern BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR newKeyName); diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 98f6de4..e3ea8b8 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -258,18 +258,18 @@ static HTREEITEM AddEntryToTree(HWND hwndTV, HTREEITEM hParent, LPWSTR label, HK return TreeView_InsertItemW(hwndTV, &tvins); } -static BOOL match_string(LPCTSTR sstring1, LPCTSTR sstring2, int mode) +static BOOL match_string(LPCWSTR sstring1, LPCWSTR sstring2, int mode) { if (mode & SEARCH_WHOLE) - return !stricmp(sstring1, sstring2); + return !lstrcmpiW(sstring1, sstring2); else - return NULL != StrStrI(sstring1, sstring2); + return NULL != StrStrIW(sstring1, sstring2); } -static BOOL match_item(HWND hwndTV, HTREEITEM hItem, LPCTSTR sstring, int mode, int *row) +static BOOL match_item(HWND hwndTV, HTREEITEM hItem, LPCWSTR sstring, int mode, int *row) { - TVITEM item; - TCHAR keyname[KEY_MAX_LEN]; + TVITEMW item; + WCHAR keyname[KEY_MAX_LEN]; item.mask = TVIF_TEXT; item.hItem = hItem; item.pszText = keyname; @@ -282,26 +282,26 @@ static BOOL match_item(HWND hwndTV, HTREEITEM hItem, LPCTSTR sstring, int mode, if (mode & (SEARCH_VALUES | SEARCH_CONTENT)) { int i, adjust; - TCHAR valName[KEY_MAX_LEN], *KeyPath; + WCHAR valName[KEY_MAX_LEN], *KeyPath; HKEY hKey, hRoot; DWORD lenName; - KeyPath = GetItemPath(hwndTV, hItem, &hRoot); + KeyPath = GetItemPathW(hwndTV, hItem, &hRoot); if (!KeyPath || !hRoot) return FALSE; - if (RegOpenKeyEx(hRoot, KeyPath, 0, KEY_READ, &hKey) != ERROR_SUCCESS) { + if (RegOpenKeyExW(hRoot, KeyPath, 0, KEY_READ, &hKey) != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, KeyPath); return FALSE; } - + HeapFree(GetProcessHeap(), 0, KeyPath); lenName = KEY_MAX_LEN; adjust = 0; /* RegEnumValue won't return empty default value, so fake it when dealing with *row, which corresponds to list view rows, not value ids */ - if (ERROR_SUCCESS == RegEnumValue(hKey, 0, valName, &lenName, NULL, NULL, NULL, NULL) && *valName) + if (ERROR_SUCCESS == RegEnumValueW(hKey, 0, valName, &lenName, NULL, NULL, NULL, NULL) && *valName) adjust = 1; i = (*row)-adjust; @@ -310,7 +310,7 @@ static BOOL match_item(HWND hwndTV, HTREEITEM hItem, LPCTSTR sstring, int mode, DWORD lenValue = 0, type = 0; lenName = KEY_MAX_LEN; - if (ERROR_SUCCESS != RegEnumValue(hKey, + if (ERROR_SUCCESS != RegEnumValueW(hKey, i, valName, &lenName, NULL, &type, NULL, &lenValue)) break; @@ -323,9 +323,9 @@ static BOOL match_item(HWND hwndTV, HTREEITEM hItem, LPCTSTR sstring, int mode, } if ((mode & SEARCH_CONTENT) && (type == REG_EXPAND_SZ || type == REG_SZ)) { - LPTSTR buffer; + LPWSTR buffer; buffer = HeapAlloc(GetProcessHeap(), 0, lenValue); - RegEnumValue(hKey, i, valName, &lenName, NULL, &type, (LPBYTE)buffer, &lenValue); + RegEnumValueW(hKey, i, valName, &lenName, NULL, &type, (LPBYTE)buffer, &lenValue); if (match_string(buffer, sstring, mode)) { HeapFree(GetProcessHeap(), 0, buffer); RegCloseKey(hKey); @@ -342,7 +342,7 @@ static BOOL match_item(HWND hwndTV, HTREEITEM hItem, LPCTSTR sstring, int mode, return FALSE; } -HTREEITEM FindNext(HWND hwndTV, HTREEITEM hItem, LPCTSTR sstring, int mode, int *row) +HTREEITEM FindNext(HWND hwndTV, HTREEITEM hItem, LPCWSTR sstring, int mode, int *row) { HTREEITEM hTry, hLast;

1 0

Alexander Nicolaysen Sørnes : regedit: Convert treeview init to Unicode.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: be43131b49eede447acdf95065e33ff9674d74d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be43131b49eede447acdf9506… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Aug 25 23:00:35 2008 +0200 regedit: Convert treeview init to Unicode. --- programs/regedit/childwnd.c | 2 +- programs/regedit/main.h | 4 ++-- programs/regedit/treeview.c | 25 +++++++++++++------------ 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 42fefca..76f354d 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -304,7 +304,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa case WM_CREATE: g_pChildWnd = HeapAlloc(GetProcessHeap(), 0, sizeof(ChildWnd)); if (!g_pChildWnd) return 0; - LoadString(hInst, IDS_REGISTRY_ROOT_NAME, g_pChildWnd->szPath, MAX_PATH); + LoadStringW(hInst, IDS_REGISTRY_ROOT_NAME, g_pChildWnd->szPath, MAX_PATH); g_pChildWnd->nSplitPos = 250; g_pChildWnd->hWnd = hWnd; g_pChildWnd->hTreeWnd = CreateTreeView(hWnd, g_pChildWnd->szPath, TREE_WINDOW); diff --git a/programs/regedit/main.h b/programs/regedit/main.h index 0398f57..55f2201 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -72,7 +72,7 @@ typedef struct { int nFocusPanel; /* 0: left 1: right */ int nSplitPos; WINDOWPLACEMENT pos; - TCHAR szPath[MAX_PATH]; + WCHAR szPath[MAX_PATH]; } ChildWnd; extern ChildWnd* g_pChildWnd; @@ -128,7 +128,7 @@ extern BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Res extern BOOL IsDefaultValue(HWND hwndLV, int i); /* treeview.c */ -extern HWND CreateTreeView(HWND hwndParent, LPTSTR pHostName, UINT id); +extern HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, UINT id); extern BOOL RefreshTreeView(HWND hWndTV); extern BOOL OnTreeExpanding(HWND hWnd, NMTREEVIEW* pnmtv); extern LPTSTR GetItemPath(HWND hwndTV, HTREEITEM hItem, HKEY* phRootKey); diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index e3ea8b8..92c2af2 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -567,9 +567,9 @@ HWND StartKeyRename(HWND hwndTV) return TreeView_EditLabel(hwndTV, hItem); } -static BOOL InitTreeViewItems(HWND hwndTV, LPTSTR pHostName) +static BOOL InitTreeViewItems(HWND hwndTV, LPWSTR pHostName) { - TVINSERTSTRUCT tvins; + TVINSERTSTRUCTW tvins; HTREEITEM hRoot; static WCHAR hkcr[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0}, hkcu[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0}, @@ -581,7 +581,7 @@ static BOOL InitTreeViewItems(HWND hwndTV, LPTSTR pHostName) tvins.u.item.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN | TVIF_PARAM; /* Set the text of the item. */ tvins.u.item.pszText = pHostName; - tvins.u.item.cchTextMax = lstrlen(pHostName); + tvins.u.item.cchTextMax = lstrlenW(pHostName); /* Assume the item is not a parent item, so give it an image. */ tvins.u.item.iImage = Image_Root; tvins.u.item.iSelectedImage = Image_Root; @@ -591,7 +591,7 @@ static BOOL InitTreeViewItems(HWND hwndTV, LPTSTR pHostName) tvins.hInsertAfter = (HTREEITEM)TVI_FIRST; tvins.hParent = TVI_ROOT; /* Add the item to the tree view control. */ - if (!(hRoot = TreeView_InsertItem(hwndTV, &tvins))) return FALSE; + if (!(hRoot = TreeView_InsertItemW(hwndTV, &tvins))) return FALSE; if (!AddEntryToTree(hwndTV, hRoot, hkcr, HKEY_CLASSES_ROOT, 1)) return FALSE; if (!AddEntryToTree(hwndTV, hRoot, hkcu, HKEY_CURRENT_USER, 1)) return FALSE; @@ -601,8 +601,8 @@ static BOOL InitTreeViewItems(HWND hwndTV, LPTSTR pHostName) if (!AddEntryToTree(hwndTV, hRoot, hkdd, HKEY_DYN_DATA, 1)) return FALSE; /* expand and select host name */ - SendMessage(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hRoot ); - SendMessage(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); + SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hRoot ); + SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); return TRUE; } @@ -624,13 +624,13 @@ static BOOL InitTreeViewImageLists(HWND hwndTV) return FALSE; /* Add the open file, closed file, and document bitmaps. */ - hico = LoadIcon(hInst, MAKEINTRESOURCE(IDI_OPEN_FILE)); + hico = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_OPEN_FILE)); Image_Open = ImageList_AddIcon(himl, hico); - hico = LoadIcon(hInst, MAKEINTRESOURCE(IDI_CLOSED_FILE)); + hico = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_CLOSED_FILE)); Image_Closed = ImageList_AddIcon(himl, hico); - hico = LoadIcon(hInst, MAKEINTRESOURCE(IDI_ROOT)); + hico = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_ROOT)); Image_Root = ImageList_AddIcon(himl, hico); /* Fail if not all of the images were added. */ @@ -640,7 +640,7 @@ static BOOL InitTreeViewImageLists(HWND hwndTV) } /* Associate the image list with the tree view control. */ - SendMessage(hwndTV, TVM_SETIMAGELIST, TVSIL_NORMAL, (LPARAM)himl); + SendMessageW(hwndTV, TVM_SETIMAGELIST, TVSIL_NORMAL, (LPARAM)himl); return TRUE; } @@ -716,14 +716,15 @@ BOOL OnTreeExpanding(HWND hwndTV, NMTREEVIEW* pnmtv) * Returns the handle to the new control if successful, or NULL otherwise. * hwndParent - handle to the control's parent window. */ -HWND CreateTreeView(HWND hwndParent, LPTSTR pHostName, UINT id) +HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, UINT id) { RECT rcClient; HWND hwndTV; + WCHAR TreeView[] = {'T','r','e','e',' ','V','i','e','w',0}; /* Get the dimensions of the parent window's client area, and create the tree view control. */ GetClientRect(hwndParent, &rcClient); - hwndTV = CreateWindowEx(WS_EX_CLIENTEDGE, WC_TREEVIEW, _T("Tree View"), + hwndTV = CreateWindowExW(WS_EX_CLIENTEDGE, WC_TREEVIEWW, TreeView, WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT, 0, 0, rcClient.right, rcClient.bottom, hwndParent, (HMENU)ULongToHandle(id), hInst, NULL);

1 0

Alexander Nicolaysen Sørnes : regedit: Use only SendMessageW in treeview.c.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: 5915b4970075e8ccbe87ddafae7f958bb1f732ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=5915b4970075e8ccbe87ddafa… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Aug 25 23:03:17 2008 +0200 regedit: Use only SendMessageW in treeview.c. --- programs/regedit/treeview.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 92c2af2..12dd87a 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -508,7 +508,7 @@ BOOL RefreshTreeView(HWND hwndTV) WINE_TRACE("\n"); hSelectedItem = TreeView_GetSelection(hwndTV); hcursorOld = SetCursor(LoadCursor(NULL, IDC_WAIT)); - SendMessage(hwndTV, WM_SETREDRAW, FALSE, 0); + SendMessageW(hwndTV, WM_SETREDRAW, FALSE, 0); hItem = TreeView_GetChild(hwndTV, TreeView_GetRoot(hwndTV)); while (hItem) { @@ -516,12 +516,12 @@ BOOL RefreshTreeView(HWND hwndTV) hItem = TreeView_GetNextSibling(hwndTV, hItem); } - SendMessage(hwndTV, WM_SETREDRAW, TRUE, 0); + SendMessageW(hwndTV, WM_SETREDRAW, TRUE, 0); InvalidateRect(hwndTV, NULL, FALSE); SetCursor(hcursorOld); /* We reselect the currently selected node, this will prompt a refresh of the listview. */ - SendMessage(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hSelectedItem); + SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hSelectedItem); return TRUE; } @@ -697,7 +697,7 @@ BOOL UpdateExpandingTree(HWND hwndTV, HTREEITEM hItem, int state) done: TreeView_SetItemState(hwndTV, hItem, TVIS_EXPANDEDONCE, TVIS_EXPANDEDONCE); - SendMessage(hwndTV, WM_SETREDRAW, TRUE, 0); + SendMessageW(hwndTV, WM_SETREDRAW, TRUE, 0); SetCursor(hcursorOld); expanding = FALSE; HeapFree(GetProcessHeap(), 0, keyPath);

1 0

Stefan Dösinger : wined3d: Make the alphaop == colorop matching a bit smarter.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: 9b94c0abb9be631d1672ebad9c701e47250a5304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b94c0abb9be631d1672ebad9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 18 16:50:04 2008 +0200 wined3d: Make the alphaop == colorop matching a bit smarter. --- dlls/wined3d/arb_program_shader.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 99cc130..eb3eed8 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2627,6 +2627,7 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB DWORD arg0, arg1, arg2; BOOL tempreg_used = FALSE, tfactor_used = FALSE; BOOL last = FALSE; + BOOL op_equal; /* Find out which textures are read */ for(stage = 0; stage < MAX_TEXTURES; stage++) { @@ -2806,6 +2807,25 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB last = TRUE; } + if(settings->op[stage].cop == WINED3DTOP_SELECTARG1 && + settings->op[stage].aop == WINED3DTOP_SELECTARG1) { + op_equal = settings->op[stage].carg1 == settings->op[stage].aarg1; + } else if(settings->op[stage].cop == WINED3DTOP_SELECTARG1 && + settings->op[stage].aop == WINED3DTOP_SELECTARG2) { + op_equal = settings->op[stage].carg1 == settings->op[stage].aarg2; + } else if(settings->op[stage].cop == WINED3DTOP_SELECTARG2 && + settings->op[stage].aop == WINED3DTOP_SELECTARG1) { + op_equal = settings->op[stage].carg2 == settings->op[stage].aarg1; + } else if(settings->op[stage].cop == WINED3DTOP_SELECTARG2 && + settings->op[stage].aop == WINED3DTOP_SELECTARG2) { + op_equal = settings->op[stage].carg2 == settings->op[stage].aarg2; + } else { + op_equal = settings->op[stage].aop == settings->op[stage].cop && + settings->op[stage].carg0 == settings->op[stage].aarg0 && + settings->op[stage].carg1 == settings->op[stage].aarg1 && + settings->op[stage].carg2 == settings->op[stage].aarg2; + } + if(settings->op[stage].aop == WINED3DTOP_DISABLE) { gen_ffp_instr(&buffer, stage, TRUE, FALSE, last, settings->op[stage].dst, settings->op[stage].cop, settings->op[stage].carg0, @@ -2817,10 +2837,7 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB } else if(stage == 0) { shader_addline(&buffer, "MOV ret.a, fragment.color.primary.a;\n"); } - } else if(settings->op[stage].aop == settings->op[stage].cop && - settings->op[stage].carg0 == settings->op[stage].aarg0 && - settings->op[stage].carg1 == settings->op[stage].aarg1 && - settings->op[stage].carg2 == settings->op[stage].aarg2) { + } else if(op_equal) { gen_ffp_instr(&buffer, stage, TRUE, TRUE, last, settings->op[stage].dst, settings->op[stage].cop, settings->op[stage].carg0, settings->op[stage].carg1, settings->op[stage].carg2);

1 0

Stefan Dösinger : wined3d: The final luminance factor is clamped.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: 4767be8cdedfbd8e03eb11df7304765d693e7f5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4767be8cdedfbd8e03eb11df7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 20 10:23:25 2008 -0500 wined3d: The final luminance factor is clamped. --- dlls/d3d9/tests/visual.c | 44 ++++++++++++++++++++++++++++++++++++- dlls/wined3d/arb_program_shader.c | 5 ++- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6562187..d36411f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7860,7 +7860,49 @@ static void fixed_function_bumpmap_test(IDirect3DDevice9 *device) * green: 0.5 * (0.25 * 2.0 + 0.1) = 0.5 * 0.6 = 0.3 = 0x4c * green: 0.75 * (0.25 * 2.0 + 0.1) = 0.75 * 0.6 = 0.45 = 0x72 */ - ok(color_match(color, 0x00994c72, 2), "bumpmap failed: Got color 0x%08x, expected 0x00ffffff.\n", color); + ok(color_match(color, 0x00994c72, 3), "bumpmap failed: Got color 0x%08x, expected 0x00994c72.\n", color); + + /* Check a result scale factor > 1.0 */ + scale = 10; + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_BUMPENVLSCALE, *((DWORD *)&scale)); + ok(SUCCEEDED(hr), "SetTextureStageState failed (%08x)\n", hr); + offset = 10; + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_BUMPENVLOFFSET, *((DWORD *)&offset)); + ok(SUCCEEDED(hr), "SetTextureStageState failed (%08x)\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed (0x%08x)\n", hr); + if(SUCCEEDED(hr)) { + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quad[0], sizeof(quad[0])); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed (0x%08x)\n", hr); + } + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x00ff80c0, 1), "bumpmap failed: Got color 0x%08x, expected 0x00ff80c0.\n", color); + + /* Check clamping in the scale factor calculation */ + scale = 1000; + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_BUMPENVLSCALE, *((DWORD *)&scale)); + ok(SUCCEEDED(hr), "SetTextureStageState failed (%08x)\n", hr); + offset = -1; + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_BUMPENVLOFFSET, *((DWORD *)&offset)); + ok(SUCCEEDED(hr), "SetTextureStageState failed (%08x)\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed (0x%08x)\n", hr); + if(SUCCEEDED(hr)) { + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quad[0], sizeof(quad[0])); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed (0x%08x)\n", hr); + } + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x00ff80c0, 1), "bumpmap failed: Got color 0x%08x, expected 0x00ff80c0.\n", color); hr = IDirect3DDevice9_SetTexture(device, 0, NULL); ok(SUCCEEDED(hr), "IDirect3DDevice9_SetTexture failed (%08x)\n", hr); diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0d8c4eb..99cc130 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2555,7 +2555,8 @@ static void gen_ffp_instr(SHADER_BUFFER *buffer, unsigned int stage, BOOL color, break; case WINED3DTOP_BLENDTEXTUREALPHAPM: - shader_addline(buffer, "SUB arg0.a, const.x, %s;\n", arg1); + arg0 = get_argreg(buffer, 0, stage, WINED3DTA_TEXTURE); + shader_addline(buffer, "SUB arg0.a, const.x, %s.a;\n", arg0); shader_addline(buffer, "MAD_SAT %s%s, %s, arg0.a, %s;\n", dstreg, dstmask, arg2, arg1); break; @@ -2776,7 +2777,7 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB shader_addline(&buffer, "TEX%s tex%u, ret, texture[%u], %s;\n", sat, stage, stage, textype); if(settings->op[stage - 1].cop == WINED3DTOP_BUMPENVMAPLUMINANCE) { - shader_addline(&buffer, "MAD ret.r, tex%u.b, luminance%u.r, luminance%u.g;\n", + shader_addline(&buffer, "MAD_SAT ret.r, tex%u.b, luminance%u.r, luminance%u.g;\n", stage - 1, stage - 1, stage - 1); shader_addline(&buffer, "MUL tex%u, tex%u, ret.r;\n", stage, stage); }

1 0

Stefan Dösinger : wined3d: Declare the texture factor when D3DTOP_BLENDFACTORALPHA is used.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: f8ead75566a8bc2ceef1b08efb8b5f4d3f375fcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8ead75566a8bc2ceef1b08ef… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 18 14:28:09 2008 +0200 wined3d: Declare the texture factor when D3DTOP_BLENDFACTORALPHA is used. --- dlls/wined3d/arb_program_shader.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 97a1cab..0d8c4eb 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2646,6 +2646,8 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB bump_used[stage] = TRUE; tex_read[stage] = TRUE; luminance_used[stage] = TRUE; + } else if(settings->op[stage].cop == WINED3DTOP_BLENDFACTORALPHA) { + tfactor_used = TRUE; } if(arg0 == WINED3DTA_TFACTOR || arg1 == WINED3DTA_TFACTOR || arg2 == WINED3DTA_TFACTOR) {

1 0

Stefan Dösinger : wined3d: Use the correct texture limit.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: 9a6bc683e11bf508a37769640d56f201462b935a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a6bc683e11bf508a37769640… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 17 23:46:47 2008 +0200 wined3d: Use the correct texture limit. We have to use the texture limit of the fragment pipeline in use here, not the fixed function GL texture limit. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 5 +++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4ff206d..92c3f75 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3750,7 +3750,7 @@ static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This) { device_update_fixed_function_usage_map(This); - if (!GL_SUPPORT(NV_REGISTER_COMBINERS) || This->stateBlock->lowest_disabled_stage <= GL_LIMITS(textures)) { + if (!GL_SUPPORT(NV_REGISTER_COMBINERS) || This->stateBlock->lowest_disabled_stage <= This->max_ffp_textures) { for (i = 0; i < This->stateBlock->lowest_disabled_stage; ++i) { if (!This->fixed_function_usage_map[i]) continue; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2cf89e7..356dd52 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3545,6 +3545,7 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, WINED3DDISPLAYMODE mode; const struct fragment_pipeline *frag_pipeline = NULL; int i; + struct fragment_caps ffp_caps; /* Validate the adapter number. If no adapters are available(no GL), ignore the adapter * number and create a device without a 3D adapter for 2D only operation. @@ -3597,10 +3598,14 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, select_shader_mode(&GLINFO_LOCATION, DeviceType, &object->ps_selected_mode, &object->vs_selected_mode); object->shader_backend = select_shader_backend(Adapter, DeviceType); + memset(&ffp_caps, 0, sizeof(ffp_caps)); frag_pipeline = select_fragment_implementation(Adapter, DeviceType); object->frag_pipe = frag_pipeline; + frag_pipeline->get_caps(DeviceType, &GLINFO_LOCATION, &ffp_caps); + object->max_ffp_textures = ffp_caps.MaxSimultaneousTextures; compile_state_table(object->StateTable, object->multistate_funcs, &GLINFO_LOCATION, ffp_vertexstate_template, frag_pipeline, misc_state_template); + object->blitter = select_blit_implementation(Adapter, DeviceType); /* Prefer the vtable with functions optimized for single dirtifyable objects if the shader diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c00300d..8daee2d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -859,6 +859,8 @@ struct IWineD3DDeviceImpl const struct fragment_pipeline *frag_pipe; const struct blit_shader *blitter; + unsigned int max_ffp_textures; + /* To store */ BOOL view_ident; /* true iff view matrix is identity */ BOOL untransformed;

1 0

Stefan Dösinger : wined3d: Implement D3DTA_ALPHAREPLICATE in arbfp and atifs.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: 6c6a6a2e617b5ebbbda829d097625838a8b1b2b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c6a6a2e617b5ebbbda829d09… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 19 10:43:03 2008 -0500 wined3d: Implement D3DTA_ALPHAREPLICATE in arbfp and atifs. Also adds a simple test for this. In the fixed function and nvrc/nvts code this already works properly. --- dlls/d3d9/tests/visual.c | 43 +++++++++ dlls/wined3d/arb_program_shader.c | 6 + dlls/wined3d/ati_fragment_shader.c | 178 +++++++++++++++++++----------------- 3 files changed, 145 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c6a6a2e617b5ebbbda82…

1 0

Stefan Dösinger : wined3d: Fix projected bump mapping.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: 8fc2cfe432680c9db1788daa1f2b3d8d6bc404de URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fc2cfe432680c9db1788daa1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 17 22:49:33 2008 +0200 wined3d: Fix projected bump mapping. --- dlls/wined3d/arb_program_shader.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 250845a..97a1cab 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2756,9 +2756,23 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB shader_addline(&buffer, "DP3 ret.r, arg1, tex%u;\n", stage - 1); shader_addline(&buffer, "SWZ arg1, bumpmat%u, y, w, 0, 0;\n", stage - 1); shader_addline(&buffer, "DP3 ret.g, arg1, tex%u;\n", stage - 1); - shader_addline(&buffer, "ADD ret, ret, fragment.texcoord[%u];\n", stage); - shader_addline(&buffer, "%s%s tex%u, ret, texture[%u], %s;\n", - instr, sat, stage, stage, textype); + + /* with projective textures, texbem only divides the static texture coord, not the displacement, + * so we can't let the GL handle this. + */ + if (settings->op[stage].projected != proj_none) { + /* Note: Currently always divide by .a because the vertex pipeline moves the correct value + * into the 4th component + */ + shader_addline(&buffer, "RCP arg1.a, fragment.texcoord[%u].a;\n", stage); + shader_addline(&buffer, "MUL arg1.rg, fragment.texcoord[%u], arg1.a;\n", stage); + shader_addline(&buffer, "ADD ret, ret, arg1;\n"); + } else { + shader_addline(&buffer, "ADD ret, ret, fragment.texcoord[%u];\n", stage); + } + + shader_addline(&buffer, "TEX%s tex%u, ret, texture[%u], %s;\n", + sat, stage, stage, textype); if(settings->op[stage - 1].cop == WINED3DTOP_BUMPENVMAPLUMINANCE) { shader_addline(&buffer, "MAD ret.r, tex%u.b, luminance%u.r, luminance%u.g;\n", stage - 1, stage - 1, stage - 1);

1 0