July 2008 - Wine-Commits - list.winehq.org

Maarten Lankhorst : includes: Add video mixing renderer header.
by Alexandre Julliard July 11, 2008

July 11, 2008

Module: wine Branch: master Commit: 61ba32c0366c4dac79495efe3291bd538bcd4634 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ba32c0366c4dac79495efe3… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jul 10 10:38:47 2008 -0700 includes: Add video mixing renderer header. --- dlls/qcap/capturegraph.c | 1 + dlls/qcap/dllsetup.c | 1 + dlls/qcap/qcap_main.c | 1 + dlls/qcap/yuv.c | 1 + dlls/quartz/regsvr.c | 1 + include/Makefile.in | 1 + include/strmif.idl | 3 + include/vmrender.idl | 481 ++++++++++++++++++++++++++++++++++++++++++++++ tools/make_makefiles | 3 +- 9 files changed, 492 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=61ba32c0366c4dac79495…

1 0

Stefan Dösinger : wined3d: Samplers -> misc states.
by Alexandre Julliard July 11, 2008

July 11, 2008

Module: wine Branch: master Commit: f330815da50c0b29de60caf6b81f8a66b26cd5a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f330815da50c0b29de60caf6b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 3 07:04:59 2008 -0500 wined3d: Samplers -> misc states. --- dlls/wined3d/state.c | 61 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 41 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 0a74e79..c7f8d85 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4299,26 +4299,26 @@ const struct StateEntry FFPStateTable[] = { /*7, 31, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*7, 32, WINED3DTSS_CONSTANT */ 0 /* As long as we don't support D3DTA_CONSTANT */, NULL }, /* Sampler states */ - { /* 0, Sampler 0 */ STATE_SAMPLER(0), sampler }, - { /* 1, Sampler 1 */ STATE_SAMPLER(1), sampler }, - { /* 2, Sampler 2 */ STATE_SAMPLER(2), sampler }, - { /* 3, Sampler 3 */ STATE_SAMPLER(3), sampler }, - { /* 4, Sampler 3 */ STATE_SAMPLER(4), sampler }, - { /* 5, Sampler 5 */ STATE_SAMPLER(5), sampler }, - { /* 6, Sampler 6 */ STATE_SAMPLER(6), sampler }, - { /* 7, Sampler 7 */ STATE_SAMPLER(7), sampler }, - { /* 8, Sampler 8 */ STATE_SAMPLER(8), sampler }, - { /* 9, Sampler 9 */ STATE_SAMPLER(9), sampler }, - { /*10, Sampler 10 */ STATE_SAMPLER(10), sampler }, - { /*11, Sampler 11 */ STATE_SAMPLER(11), sampler }, - { /*12, Sampler 12 */ STATE_SAMPLER(12), sampler }, - { /*13, Sampler 13 */ STATE_SAMPLER(13), sampler }, - { /*14, Sampler 14 */ STATE_SAMPLER(14), sampler }, - { /*15, Sampler 15 */ STATE_SAMPLER(15), sampler }, - { /*16, Vertex sampler 0 */ STATE_SAMPLER(16), sampler }, - { /*17, Vertex sampler 1 */ STATE_SAMPLER(17), sampler }, - { /*18, Vertex sampler 2 */ STATE_SAMPLER(18), sampler }, - { /*19, Vertex sampler 3 */ STATE_SAMPLER(19), sampler }, + { /* 0, Sampler 0 */ STATE_SAMPLER(0), NULL }, + { /* 1, Sampler 1 */ STATE_SAMPLER(1), NULL }, + { /* 2, Sampler 2 */ STATE_SAMPLER(2), NULL }, + { /* 3, Sampler 3 */ STATE_SAMPLER(3), NULL }, + { /* 4, Sampler 3 */ STATE_SAMPLER(4), NULL }, + { /* 5, Sampler 5 */ STATE_SAMPLER(5), NULL }, + { /* 6, Sampler 6 */ STATE_SAMPLER(6), NULL }, + { /* 7, Sampler 7 */ STATE_SAMPLER(7), NULL }, + { /* 8, Sampler 8 */ STATE_SAMPLER(8), NULL }, + { /* 9, Sampler 9 */ STATE_SAMPLER(9), NULL }, + { /*10, Sampler 10 */ STATE_SAMPLER(10), NULL }, + { /*11, Sampler 11 */ STATE_SAMPLER(11), NULL }, + { /*12, Sampler 12 */ STATE_SAMPLER(12), NULL }, + { /*13, Sampler 13 */ STATE_SAMPLER(13), NULL }, + { /*14, Sampler 14 */ STATE_SAMPLER(14), NULL }, + { /*15, Sampler 15 */ STATE_SAMPLER(15), NULL }, + { /*16, Vertex sampler 0 */ STATE_SAMPLER(16), NULL }, + { /*17, Vertex sampler 1 */ STATE_SAMPLER(17), NULL }, + { /*18, Vertex sampler 2 */ STATE_SAMPLER(18), NULL }, + { /*19, Vertex sampler 3 */ STATE_SAMPLER(19), NULL }, /* Pixel shader */ { /* , Pixel Shader */ STATE_PIXELSHADER, NULL }, /* Transform states follow */ @@ -4997,6 +4997,27 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_COLORWRITEENABLE3), { STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }}, { STATE_RENDER(WINED3DRS_BLENDFACTOR), { STATE_RENDER(WINED3DRS_BLENDFACTOR), state_blendfactor }}, { STATE_RENDER(WINED3DRS_DEPTHBIAS), { STATE_RENDER(WINED3DRS_DEPTHBIAS), state_depthbias }}, + /* Samplers */ + { STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler }}, + { STATE_SAMPLER(1), { STATE_SAMPLER(1), sampler }}, + { STATE_SAMPLER(2), { STATE_SAMPLER(2), sampler }}, + { STATE_SAMPLER(3), { STATE_SAMPLER(3), sampler }}, + { STATE_SAMPLER(4), { STATE_SAMPLER(4), sampler }}, + { STATE_SAMPLER(5), { STATE_SAMPLER(5), sampler }}, + { STATE_SAMPLER(6), { STATE_SAMPLER(6), sampler }}, + { STATE_SAMPLER(7), { STATE_SAMPLER(7), sampler }}, + { STATE_SAMPLER(8), { STATE_SAMPLER(8), sampler }}, + { STATE_SAMPLER(9), { STATE_SAMPLER(9), sampler }}, + { STATE_SAMPLER(10), { STATE_SAMPLER(10), sampler }}, + { STATE_SAMPLER(11), { STATE_SAMPLER(11), sampler }}, + { STATE_SAMPLER(12), { STATE_SAMPLER(12), sampler }}, + { STATE_SAMPLER(13), { STATE_SAMPLER(13), sampler }}, + { STATE_SAMPLER(14), { STATE_SAMPLER(14), sampler }}, + { STATE_SAMPLER(15), { STATE_SAMPLER(15), sampler }}, + { STATE_SAMPLER(16), /* Vertex sampler 0 */ { STATE_SAMPLER(16), sampler }}, + { STATE_SAMPLER(17), /* Vertex sampler 1 */ { STATE_SAMPLER(17), sampler }}, + { STATE_SAMPLER(18), /* Vertex sampler 2 */ { STATE_SAMPLER(18), sampler }}, + { STATE_SAMPLER(19), /* Vertex sampler 3 */ { STATE_SAMPLER(19), sampler }}, {0 /* Terminate */, { 0, 0 }}, };

1 0

Andre Wisplinghoff : regedit: Implement deleting multiple values.
by Alexandre Julliard July 11, 2008

July 11, 2008

Module: wine Branch: master Commit: a7f84cc0351b16dffaa9038612a451e999223d0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7f84cc0351b16dffaa903861… Author: Andre Wisplinghoff <andre.wisplinghoff(a)gmail.com> Date: Thu Jul 10 14:30:27 2008 +0200 regedit: Implement deleting multiple values. --- programs/regedit/De.rc | 1 + programs/regedit/En.rc | 1 + programs/regedit/Fr.rc | 1 + programs/regedit/edit.c | 7 ++++--- programs/regedit/framewnd.c | 23 +++++++++++++++++++++-- programs/regedit/listview.c | 6 +++--- programs/regedit/main.h | 3 ++- programs/regedit/resource.h | 1 + 8 files changed, 34 insertions(+), 9 deletions(-) diff --git a/programs/regedit/De.rc b/programs/regedit/De.rc index 493b219..6df36ad 100644 --- a/programs/regedit/De.rc +++ b/programs/regedit/De.rc @@ -299,6 +299,7 @@ BEGIN IDS_TOO_BIG_VALUE "Der Wert ist zu gro� (%ld)" IDS_DELETE_BOX_TITLE "Bitte best�tigen" IDS_DELETE_BOX_TEXT "Wollen Sie '%s' wirklich l�schen?" + IDS_DELETE_BOX_TEXT_MULTIPLE "Wollen Sie diese Werte wirklich l�schen?" IDS_NEWKEY "Neuer Schl�ssel #%d" IDS_NEWVALUE "Neuer Wert #%d" IDS_NOTFOUND "Suchfolge '%s' wurde nicht gefunden." diff --git a/programs/regedit/En.rc b/programs/regedit/En.rc index e538c02..8cc37aa 100644 --- a/programs/regedit/En.rc +++ b/programs/regedit/En.rc @@ -371,6 +371,7 @@ BEGIN IDS_TOO_BIG_VALUE "Value is too big (%ld)" IDS_DELETE_BOX_TITLE "Confirm Value Delete" IDS_DELETE_BOX_TEXT "Are you sure you want to delete value '%s'?" + IDS_DELETE_BOX_TEXT_MULTIPLE "Are you sure you want to delete these values?" IDS_NEWKEY "New Key #%d" IDS_NEWVALUE "New Value #%d" IDS_NOTFOUND "Search string '%s' not found" diff --git a/programs/regedit/Fr.rc b/programs/regedit/Fr.rc index fc455f0..079457f 100644 --- a/programs/regedit/Fr.rc +++ b/programs/regedit/Fr.rc @@ -294,6 +294,7 @@ BEGIN IDS_TOO_BIG_VALUE "La valeur est trop grande (%ld)" IDS_DELETE_BOX_TITLE "Confirmez l'effacement de valeur" IDS_DELETE_BOX_TEXT "�tes vous s�r vous voulez supprimer la valeur '%s'?" + IDS_DELETE_BOX_TEXT_MULTIPLE "�tes vous s�r vous voulez supprimer cette valeurs?" IDS_NEWKEY "Nouvelle Cl� #%d" IDS_NEWVALUE "Nouvelle Valeur #%d" IDS_NOTFOUND "Occurence de '%s' non trouv�e" diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 5135dea..954e647 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -413,7 +413,7 @@ done: return result; } -BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath, LPCTSTR valueName) +BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath, LPCTSTR valueName, BOOL showMessageBox) { BOOL result = FALSE; LONG lRet; @@ -423,8 +423,9 @@ BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath, LPCTSTR valueName) lRet = RegOpenKeyEx(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); if (lRet != ERROR_SUCCESS) return FALSE; - if (messagebox(hwnd, MB_YESNO | MB_ICONEXCLAMATION, IDS_DELETE_BOX_TITLE, IDS_DELETE_BOX_TEXT, visibleValueName) != IDYES) - goto done; + if (showMessageBox) + if (messagebox(hwnd, MB_YESNO | MB_ICONEXCLAMATION, IDS_DELETE_BOX_TITLE, IDS_DELETE_BOX_TEXT, visibleValueName) != IDYES) + goto done; lRet = RegDeleteValue(hKey, valueName ? valueName : ""); if (lRet != ERROR_SUCCESS && valueName) { diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 4bf78af..5262e55 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -629,9 +629,10 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) LPCTSTR valueName; TCHAR newKey[MAX_NEW_KEY_LEN]; DWORD valueType; + int curIndex; + BOOL firstItem = TRUE; keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); - valueName = GetValueName(g_pChildWnd->hListWnd); if (LOWORD(wParam) >= ID_FAVORITE_FIRST && LOWORD(wParam) <= ID_FAVORITE_LAST) { HKEY hKey; @@ -674,11 +675,29 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) DeleteNode(g_pChildWnd->hTreeWnd, 0); } } else if (GetFocus() == g_pChildWnd->hListWnd) { - if (DeleteValue(hWnd, hKeyRoot, keyPath, valueName)) + curIndex = ListView_GetNextItem(g_pChildWnd->hListWnd, -1, LVNI_SELECTED); + while(curIndex != -1) { + valueName = GetItemText(g_pChildWnd->hListWnd, curIndex); + curIndex = ListView_GetNextItem(g_pChildWnd->hListWnd, curIndex, LVNI_SELECTED); + if(curIndex != -1 && firstItem) { + TCHAR title[256]; + TCHAR text[1024]; + if(!LoadString(hInst, IDS_DELETE_BOX_TITLE, title, COUNT_OF(title))) + lstrcpy(title, "Error"); + if(!LoadString(hInst, IDS_DELETE_BOX_TEXT_MULTIPLE, text, COUNT_OF(text))) + lstrcpy(text, "Unknown error string!"); + if (MessageBox(hWnd, text, title, MB_YESNO | MB_ICONEXCLAMATION) != IDYES) + break; + } + if (!DeleteValue(hWnd, hKeyRoot, keyPath, valueName, curIndex==-1 && firstItem)) + break; + firstItem = FALSE; + } RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath, NULL); } break; case ID_EDIT_MODIFY: + valueName = GetValueName(g_pChildWnd->hListWnd); if (ModifyValue(hWnd, hKeyRoot, keyPath, valueName)) RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath, valueName); break; diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 4e2010f..ebb456a 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -54,7 +54,7 @@ static TCHAR g_szValueNotSet[64]; static int default_column_widths[MAX_LIST_COLUMNS] = { 200, 175, 400 }; static int column_alignment[MAX_LIST_COLUMNS] = { LVCFMT_LEFT, LVCFMT_LEFT, LVCFMT_LEFT }; -static LPTSTR get_item_text(HWND hwndLV, int item) +LPTSTR GetItemText(HWND hwndLV, UINT item) { LPTSTR newStr, curStr; unsigned int maxLen = 128; @@ -88,7 +88,7 @@ LPCTSTR GetValueName(HWND hwndLV) item = ListView_GetNextItem(hwndLV, -1, LVNI_FOCUSED); if (item == -1) return NULL; - g_valueName = get_item_text(hwndLV, item); + g_valueName = GetItemText(hwndLV, item); return g_valueName; } @@ -391,7 +391,7 @@ static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR break; case LVN_ENDLABELEDIT: { LPNMLVDISPINFO dispInfo = (LPNMLVDISPINFO)lParam; - LPTSTR valueName = get_item_text(hWnd, dispInfo->item.iItem); + LPTSTR valueName = GetItemText(hWnd, dispInfo->item.iItem); LONG ret; if (!valueName) return -1; /* cannot rename a default value */ ret = RenameValue(hWnd, g_currentRootKey, g_currentPath, valueName, dispInfo->item.pszText); diff --git a/programs/regedit/main.h b/programs/regedit/main.h index 0c39101..7547ea0 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -109,6 +109,7 @@ extern void UpdateStatusBar(void); extern HWND CreateListView(HWND hwndParent, UINT id); extern BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCTSTR keyPath, LPCTSTR highlightValue); extern HWND StartValueRename(HWND hwndLV); +extern LPTSTR GetItemText(HWND hwndLV, UINT item); extern LPCTSTR GetValueName(HWND hwndLV); extern BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result); extern BOOL IsDefaultValue(HWND hwndLV, int i); @@ -129,7 +130,7 @@ extern BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath, LPTSTR newKeyNa extern BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath, DWORD valueType, LPTSTR valueName); extern BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath, LPCTSTR valueName); extern BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath); -extern BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath, LPCTSTR valueName); +extern BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath, LPCTSTR valueName, BOOL showMessageBox); extern BOOL RenameValue(HWND hwnd, HKEY hRootKey, LPCTSTR keyPath, LPCTSTR oldName, LPCTSTR newName); extern BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCTSTR keyPath, LPCTSTR newName); extern void error(HWND hwnd, INT resId, ...); diff --git a/programs/regedit/resource.h b/programs/regedit/resource.h index 711dada..c3b8456 100644 --- a/programs/regedit/resource.h +++ b/programs/regedit/resource.h @@ -121,6 +121,7 @@ #define IDS_DELETE_BOX_TITLE 32840 #define IDS_DELETE_BOX_TEXT 32841 #define IDS_NOTFOUND 32842 +#define IDS_DELETE_BOX_TEXT_MULTIPLE 32843 #define IDD_EDIT_DWORD 32850 #define IDC_DWORD_BASE 32852 #define IDC_DWORD_HEX 32853

1 0

Stefan Dösinger : wined3d: Set ffp caps in the ffp backend, not the shader backend.
by Alexandre Julliard July 11, 2008

July 11, 2008

Module: wine Branch: master Commit: e4078fb0ba183fce2a1e29009607dddd8995d871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4078fb0ba183fce2a1e29009… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 3 14:36:18 2008 -0500 wined3d: Set ffp caps in the ffp backend, not the shader backend. --- dlls/wined3d/ati_fragment_shader.c | 96 ++++++++++++++++++------------------ dlls/wined3d/baseshader.c | 68 ------------------------- dlls/wined3d/directx.c | 15 ++++-- dlls/wined3d/glsl_shader.c | 5 -- dlls/wined3d/state.c | 72 +++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 15 +++-- 6 files changed, 140 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e4078fb0ba183fce2a1e2…

1 0

Stefan Dösinger : Wined3d: Move the last states.
by Alexandre Julliard July 11, 2008

July 11, 2008

Module: wine Branch: master Commit: f8824996e9c8fd16f1fe06159ced4dbce7b87ebb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8824996e9c8fd16f1fe06159… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 22:26:20 2008 -0500 Wined3d: Move the last states. --- dlls/wined3d/state.c | 33 ++++++++++++++++++++++----------- 1 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d8dcaad..0a74e79 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3983,23 +3983,23 @@ const struct StateEntry FFPStateTable[] = { /*158, WINED3DRS_POINTSCALE_A */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), NULL }, { /*159, WINED3DRS_POINTSCALE_B */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), NULL }, { /*160, WINED3DRS_POINTSCALE_C */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), NULL }, - { /*161, WINED3DRS_MULTISAMPLEANTIALIAS */ STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_multisampleaa }, - { /*162, WINED3DRS_MULTISAMPLEMASK */ STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), state_multisampmask }, + { /*161, WINED3DRS_MULTISAMPLEANTIALIAS */ STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), NULL }, + { /*162, WINED3DRS_MULTISAMPLEMASK */ STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), NULL }, { /*163, WINED3DRS_PATCHEDGESTYLE */ STATE_RENDER(WINED3DRS_PATCHEDGESTYLE), NULL }, { /*164, WINED3DRS_PATCHSEGMENTS */ STATE_RENDER(WINED3DRS_PATCHSEGMENTS), NULL }, { /*165, WINED3DRS_DEBUGMONITORTOKEN */ STATE_RENDER(WINED3DRS_DEBUGMONITORTOKEN), state_nogl }, { /*166, WINED3DRS_POINTSIZE_MAX */ STATE_RENDER(WINED3DRS_POINTSIZE_MAX), NULL }, { /*167, WINED3DRS_INDEXEDVERTEXBLENDENABLE */ 0, state_nogl }, - { /*168, WINED3DRS_COLORWRITEENABLE */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, + { /*168, WINED3DRS_COLORWRITEENABLE */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), NULL }, { /*169, Undefined */ 0, state_undefined }, { /*170, WINED3DRS_TWEENFACTOR */ 0, state_nogl }, - { /*171, WINED3DRS_BLENDOP */ STATE_RENDER(WINED3DRS_BLENDOP), state_blendop }, + { /*171, WINED3DRS_BLENDOP */ STATE_RENDER(WINED3DRS_BLENDOP), NULL }, { /*172, WINED3DRS_POSITIONDEGREE */ STATE_RENDER(WINED3DRS_POSITIONDEGREE), NULL }, { /*173, WINED3DRS_NORMALDEGREE */ STATE_RENDER(WINED3DRS_NORMALDEGREE), NULL }, /*172, WINED3DRS_POSITIONORDER */ /* Value assigned to 2 state names */ /*173, WINED3DRS_NORMALORDER */ /* Value assigned to 2 state names */ - { /*174, WINED3DRS_SCISSORTESTENABLE */ STATE_RENDER(WINED3DRS_SCISSORTESTENABLE), state_scissor }, - { /*175, WINED3DRS_SLOPESCALEDEPTHBIAS */ STATE_RENDER(WINED3DRS_DEPTHBIAS), state_depthbias }, + { /*174, WINED3DRS_SCISSORTESTENABLE */ STATE_RENDER(WINED3DRS_SCISSORTESTENABLE), NULL }, + { /*175, WINED3DRS_SLOPESCALEDEPTHBIAS */ STATE_RENDER(WINED3DRS_DEPTHBIAS), NULL }, { /*176, WINED3DRS_ANTIALIASEDLINEENABLE */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, { /*177, undefined */ 0, state_undefined }, { /*178, WINED3DRS_MINTESSELLATIONLEVEL */ STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), NULL }, @@ -4014,12 +4014,12 @@ const struct StateEntry FFPStateTable[] = { /*187, WINED3DRS_CCW_STENCILZFAIL */ STATE_RENDER(WINED3DRS_STENCILENABLE), NULL }, { /*188, WINED3DRS_CCW_STENCILPASS */ STATE_RENDER(WINED3DRS_STENCILENABLE), NULL }, { /*189, WINED3DRS_CCW_STENCILFUNC */ STATE_RENDER(WINED3DRS_STENCILENABLE), NULL }, - { /*190, WINED3DRS_COLORWRITEENABLE1 */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, - { /*191, WINED3DRS_COLORWRITEENABLE2 */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, - { /*192, WINED3DRS_COLORWRITEENABLE3 */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, - { /*193, WINED3DRS_BLENDFACTOR */ STATE_RENDER(WINED3DRS_BLENDFACTOR), state_blendfactor }, + { /*190, WINED3DRS_COLORWRITEENABLE1 */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), NULL }, + { /*191, WINED3DRS_COLORWRITEENABLE2 */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), NULL }, + { /*192, WINED3DRS_COLORWRITEENABLE3 */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), NULL }, + { /*193, WINED3DRS_BLENDFACTOR */ STATE_RENDER(WINED3DRS_BLENDFACTOR), NULL }, { /*194, WINED3DRS_SRGBWRITEENABLE */ STATE_PIXELSHADER, NULL }, - { /*195, WINED3DRS_DEPTHBIAS */ STATE_RENDER(WINED3DRS_DEPTHBIAS), state_depthbias }, + { /*195, WINED3DRS_DEPTHBIAS */ STATE_RENDER(WINED3DRS_DEPTHBIAS), NULL }, { /*196, undefined */ 0, state_undefined }, { /*197, undefined */ 0, state_undefined }, { /*198, WINED3DRS_WRAP8 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, @@ -4986,6 +4986,17 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_ADAPTIVETESS_Z), { STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation }}, { STATE_RENDER(WINED3DRS_ADAPTIVETESS_W), { STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation }}, { STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), { STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation }}, + { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_multisampleaa }}, + { STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), { STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), state_multisampmask }}, + { STATE_RENDER(WINED3DRS_COLORWRITEENABLE), { STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }}, + { STATE_RENDER(WINED3DRS_BLENDOP), { STATE_RENDER(WINED3DRS_BLENDOP), state_blendop }}, + { STATE_RENDER(WINED3DRS_SCISSORTESTENABLE), { STATE_RENDER(WINED3DRS_SCISSORTESTENABLE), state_scissor }}, + { STATE_RENDER(WINED3DRS_SLOPESCALEDEPTHBIAS), { STATE_RENDER(WINED3DRS_DEPTHBIAS), state_depthbias }}, + { STATE_RENDER(WINED3DRS_COLORWRITEENABLE1), { STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }}, + { STATE_RENDER(WINED3DRS_COLORWRITEENABLE2), { STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }}, + { STATE_RENDER(WINED3DRS_COLORWRITEENABLE3), { STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }}, + { STATE_RENDER(WINED3DRS_BLENDFACTOR), { STATE_RENDER(WINED3DRS_BLENDFACTOR), state_blendfactor }}, + { STATE_RENDER(WINED3DRS_DEPTHBIAS), { STATE_RENDER(WINED3DRS_DEPTHBIAS), state_depthbias }}, {0 /* Terminate */, { 0, 0 }}, };

1 0

Stefan Dösinger : wined3d: One more psize state.
by Alexandre Julliard July 11, 2008

July 11, 2008

Module: wine Branch: master Commit: 9b15e25411f48598b61272e262ab8c4f126d3006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b15e25411f48598b61272e26… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 22:22:48 2008 -0500 wined3d: One more psize state. --- dlls/wined3d/state.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4a28bee..d8dcaad 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3988,7 +3988,7 @@ const struct StateEntry FFPStateTable[] = { /*163, WINED3DRS_PATCHEDGESTYLE */ STATE_RENDER(WINED3DRS_PATCHEDGESTYLE), NULL }, { /*164, WINED3DRS_PATCHSEGMENTS */ STATE_RENDER(WINED3DRS_PATCHSEGMENTS), NULL }, { /*165, WINED3DRS_DEBUGMONITORTOKEN */ STATE_RENDER(WINED3DRS_DEBUGMONITORTOKEN), state_nogl }, - { /*166, WINED3DRS_POINTSIZE_MAX */ STATE_RENDER(WINED3DRS_POINTSIZE_MAX), state_psizemax }, + { /*166, WINED3DRS_POINTSIZE_MAX */ STATE_RENDER(WINED3DRS_POINTSIZE_MAX), NULL }, { /*167, WINED3DRS_INDEXEDVERTEXBLENDENABLE */ 0, state_nogl }, { /*168, WINED3DRS_COLORWRITEENABLE */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, { /*169, Undefined */ 0, state_undefined }, @@ -5341,6 +5341,7 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_RENDER(WINED3DRS_POINTSCALE_A), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }}, { STATE_RENDER(WINED3DRS_POINTSCALE_B), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }}, { STATE_RENDER(WINED3DRS_POINTSCALE_C), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }}, + { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), state_psizemax }}, {0 /* Terminate */, { 0, 0 }}, };

1 0

Stefan Dösinger : wined3d: Point size vertex states.
by Alexandre Julliard July 11, 2008

July 11, 2008

Module: wine Branch: master Commit: 721301fb3f14a31f318e5f8310938217376f9075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=721301fb3f14a31f318e5f831… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 22:21:35 2008 -0500 wined3d: Point size vertex states. --- dlls/wined3d/state.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 7780367..4a28bee 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3976,13 +3976,13 @@ const struct StateEntry FFPStateTable[] = { /*151, WINED3DRS_VERTEXBLEND */ STATE_RENDER(WINED3DRS_VERTEXBLEND), NULL }, { /*152, WINED3DRS_CLIPPLANEENABLE */ STATE_RENDER(WINED3DRS_CLIPPING), NULL }, { /*153, WINED3DRS_SOFTWAREVERTEXPROCESSING */ 0, state_nogl }, - { /*154, WINED3DRS_POINTSIZE */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, - { /*155, WINED3DRS_POINTSIZE_MIN */ STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin }, - { /*156, WINED3DRS_POINTSPRITEENABLE */ STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), state_pointsprite }, - { /*157, WINED3DRS_POINTSCALEENABLE */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, - { /*158, WINED3DRS_POINTSCALE_A */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, - { /*159, WINED3DRS_POINTSCALE_B */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, - { /*160, WINED3DRS_POINTSCALE_C */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, + { /*154, WINED3DRS_POINTSIZE */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), NULL }, + { /*155, WINED3DRS_POINTSIZE_MIN */ STATE_RENDER(WINED3DRS_POINTSIZE_MIN), NULL }, + { /*156, WINED3DRS_POINTSPRITEENABLE */ STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), NULL }, + { /*157, WINED3DRS_POINTSCALEENABLE */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), NULL }, + { /*158, WINED3DRS_POINTSCALE_A */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), NULL }, + { /*159, WINED3DRS_POINTSCALE_B */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), NULL }, + { /*160, WINED3DRS_POINTSCALE_C */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), NULL }, { /*161, WINED3DRS_MULTISAMPLEANTIALIAS */ STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_multisampleaa }, { /*162, WINED3DRS_MULTISAMPLEMASK */ STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), state_multisampmask }, { /*163, WINED3DRS_PATCHEDGESTYLE */ STATE_RENDER(WINED3DRS_PATCHEDGESTYLE), NULL }, @@ -5334,6 +5334,13 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_RENDER(WINED3DRS_AMBIENTMATERIALSOURCE), { STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat }}, { STATE_RENDER(WINED3DRS_EMISSIVEMATERIALSOURCE), { STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat }}, { STATE_RENDER(WINED3DRS_VERTEXBLEND), { STATE_RENDER(WINED3DRS_VERTEXBLEND), state_vertexblend }}, + { STATE_RENDER(WINED3DRS_POINTSIZE), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }}, + { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin }}, + { STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), { STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), state_pointsprite }}, + { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }}, + { STATE_RENDER(WINED3DRS_POINTSCALE_A), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }}, + { STATE_RENDER(WINED3DRS_POINTSCALE_B), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }}, + { STATE_RENDER(WINED3DRS_POINTSCALE_C), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }}, {0 /* Terminate */, { 0, 0 }}, };

1 0

Dylan Smith : richedit: Use system colour for highlighting after v2.0.
by Alexandre Julliard July 11, 2008

July 11, 2008

Module: wine Branch: master Commit: 0f14d65c70f4aea75b6cb4ac61a5572ac9b3449c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f14d65c70f4aea75b6cb4ac6… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jul 10 18:28:45 2008 -0400 richedit: Use system colour for highlighting after v2.0. In version 1.0 of the richedit controls highlighting is done by inverting the colours. Version 2.0 and up highlight instead draw the text using system colours for the background and the text. --- dlls/riched20/paint.c | 132 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 99 insertions(+), 33 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index ec39953..c2e8b06 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -192,7 +192,20 @@ static void ME_HighlightSpace(ME_Context *c, int x, int y, LPCWSTR szText, } ME_UnselectStyleFont(c, s, hOldFont); - PatBlt(hDC, x, ymin, selWidth, cy, DSTINVERT); + if (c->editor->bEmulateVersion10) + PatBlt(hDC, x, ymin, selWidth, cy, DSTINVERT); + else + { + RECT rect; + HBRUSH hBrush; + rect.left = x; + rect.top = ymin; + rect.right = x + selWidth; + rect.bottom = ymin + cy; + hBrush = CreateSolidBrush(GetSysColor(COLOR_HIGHLIGHT)); + FillRect(hDC, &rect, hBrush); + DeleteObject(hBrush); + } } static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, @@ -205,6 +218,10 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, int yOffset = 0, yTwipsOffset = 0; SIZE sz; COLORREF rgb; + HPEN hPen = NULL, hOldPen = NULL; + BOOL bHighlightedText = (nSelFrom < nChars && nSelTo >= 0 + && nSelFrom < nSelTo && !c->editor->bHideSelection); + int xSelStart = x, xSelEnd = x; int *lpDx = NULL; /* lpDx is only needed for tabs to make sure the underline done automatically * by the font extends to the end of the tab. Tabs are always stored as @@ -214,13 +231,6 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, lpDx = &width; /* Make sure underline for tab extends across tab space */ hOldFont = ME_SelectStyleFont(c, s); - if ((s->fmt.dwMask & CFM_LINK) && (s->fmt.dwEffects & CFE_LINK)) - rgb = RGB(0,0,255); - else if ((s->fmt.dwMask & CFM_COLOR) && (s->fmt.dwEffects & CFE_AUTOCOLOR)) - rgb = GetSysColor(COLOR_WINDOWTEXT); - else - rgb = s->fmt.crTextColor; - rgbOld = SetTextColor(hDC, rgb); if ((s->fmt.dwMask & s->fmt.dwEffects) & CFM_OFFSET) { yTwipsOffset = s->fmt.yOffset; } @@ -230,15 +240,45 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, } if (yTwipsOffset) yOffset = ME_twips2pointsY(c, yTwipsOffset); - ExtTextOutW(hDC, x, y-yOffset, 0, NULL, szText, nChars, lpDx); + + if ((s->fmt.dwMask & CFM_LINK) && (s->fmt.dwEffects & CFE_LINK)) + rgb = RGB(0,0,255); + else if ((s->fmt.dwMask & CFM_COLOR) && (s->fmt.dwEffects & CFE_AUTOCOLOR)) + rgb = GetSysColor(COLOR_WINDOWTEXT); + else + rgb = s->fmt.crTextColor; + + /* Determine the area that is selected in the run. */ GetTextExtentPoint32W(hDC, szText, nChars, &sz); /* Treat width as an optional parameter. We can get the width from the * text extent of the string if it isn't specified. */ if (!width) width = sz.cx; + if (bHighlightedText) + { + if (nSelFrom <= 0) + { + nSelFrom = 0; + } + else + { + GetTextExtentPoint32W(hDC, szText, nSelFrom, &sz); + xSelStart = x + sz.cx; + } + if (nSelTo >= nChars) + { + nSelTo = nChars; + xSelEnd = x + width; + } + else + { + GetTextExtentPoint32W(hDC, szText+nSelFrom, nSelTo-nSelFrom, &sz); + xSelEnd = xSelStart + sz.cx; + } + } + /* Choose the pen type for underlining the text. */ if (s->fmt.dwMask & CFM_UNDERLINETYPE) { - HPEN hPen = NULL; switch (s->fmt.bUnderlineType) { case CFU_UNDERLINE: @@ -257,41 +297,67 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, hPen = NULL; break; } - if (hPen != NULL) + if (hPen) { - HPEN hOldPen = SelectObject(hDC, hPen); - /* FIXME: should use textmetrics info for Descent info */ - MoveToEx(hDC, x, y - yOffset + 1, NULL); - LineTo(hDC, x + width, y - yOffset + 1); - SelectObject(hDC, hOldPen); - DeleteObject(hPen); + hOldPen = SelectObject(hDC, hPen); } } - if (nSelFrom < nChars && nSelTo >= 0 && nSelFrom < nSelTo - && !c->editor->bHideSelection) + + rgbOld = SetTextColor(hDC, rgb); + if (bHighlightedText && !c->editor->bEmulateVersion10) { - int xSelStart, xSelEnd; - if (nSelFrom <= 0) + COLORREF rgbBackOld; + RECT dim; + /* FIXME: should use textmetrics info for Descent info */ + if (hPen) + MoveToEx(hDC, x, y - yOffset + 1, NULL); + if (xSelStart > x) { - nSelFrom = 0; - xSelStart = x; + ExtTextOutW(hDC, x, y-yOffset, 0, NULL, szText, nSelFrom, NULL); + if (hPen) + LineTo(hDC, xSelStart, y - yOffset + 1); } - else + dim.top = ymin; + dim.bottom = ymin + cy; + dim.left = xSelStart; + dim.right = xSelEnd; + SetTextColor(hDC, GetSysColor(COLOR_HIGHLIGHTTEXT)); + rgbBackOld = SetBkColor(hDC, GetSysColor(COLOR_HIGHLIGHT)); + ExtTextOutW(hDC, xSelStart, y-yOffset, ETO_OPAQUE, &dim, + szText+nSelFrom, nSelTo-nSelFrom, lpDx); + if (hPen) + LineTo(hDC, xSelEnd, y - yOffset + 1); + SetBkColor(hDC, rgbBackOld); + if (xSelEnd < x + width) { - GetTextExtentPoint32W(hDC, szText, nSelFrom, &sz); - xSelStart = x + sz.cx; + SetTextColor(hDC, rgb); + ExtTextOutW(hDC, xSelEnd, y-yOffset, 0, NULL, szText+nSelTo, + nChars-nSelTo, NULL); + if (hPen) + LineTo(hDC, x + width, y - yOffset + 1); } - if (nSelTo >= nChars) + } + else + { + ExtTextOutW(hDC, x, y-yOffset, 0, NULL, szText, nChars, lpDx); + + /* FIXME: should use textmetrics info for Descent info */ + if (hPen) { - nSelTo = nChars; - xSelEnd = x + width; + MoveToEx(hDC, x, y - yOffset + 1, NULL); + LineTo(hDC, x + width, y - yOffset + 1); } - else + + if (bHighlightedText) /* v1.0 inverts the selection */ { - GetTextExtentPoint32W(hDC, szText+nSelFrom, nSelTo-nSelFrom, &sz); - xSelEnd = xSelStart + sz.cx; + PatBlt(hDC, xSelStart, ymin, xSelEnd-xSelStart, cy, DSTINVERT); } - PatBlt(hDC, xSelStart, ymin, xSelEnd-xSelStart, cy, DSTINVERT); + } + + if (hPen) + { + SelectObject(hDC, hOldPen); + DeleteObject(hPen); } SetTextColor(hDC, rgbOld); ME_UnselectStyleFont(c, s, hOldFont);

1 0

Dylan Smith : richedit: Prevented underlining the end of paragraph character.
by Alexandre Julliard July 11, 2008

July 11, 2008

Module: wine Branch: master Commit: 9bcfa942a0dfe629a32d0d8b0e7d684f903f9c49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bcfa942a0dfe629a32d0d8b0… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jul 10 18:28:41 2008 -0400 richedit: Prevented underlining the end of paragraph character. --- dlls/riched20/paint.c | 48 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 43 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 1aa10b1..ec39953 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -160,6 +160,41 @@ int ME_twips2pointsY(ME_Context *c, int y) return y * c->dpi.cy * c->editor->nZoomNumerator / 1440 / c->editor->nZoomDenominator; } +static void ME_HighlightSpace(ME_Context *c, int x, int y, LPCWSTR szText, + int nChars, ME_Style *s, int width, + int nSelFrom, int nSelTo, int ymin, int cy) +{ + HDC hDC = c->hDC; + HGDIOBJ hOldFont = NULL; + SIZE sz; + int selWidth; + /* Only highlight if there is a selection in the run and when + * EM_HIDESELECTION is not being used to hide the selection. */ + if (nSelFrom >= nChars || nSelTo < 0 || nSelFrom >= nSelTo + || c->editor->bHideSelection) + return; + hOldFont = ME_SelectStyleFont(c, s); + if (width <= 0) + { + GetTextExtentPoint32W(hDC, szText, nChars, &sz); + width = sz.cx; + } + if (nSelFrom < 0) nSelFrom = 0; + if (nSelTo > nChars) nSelTo = nChars; + GetTextExtentPoint32W(hDC, szText, nSelFrom, &sz); + x += sz.cx; + if (nSelTo != nChars) + { + GetTextExtentPoint32W(hDC, szText+nSelFrom, nSelTo-nSelFrom, &sz); + selWidth = sz.cx; + } else { + selWidth = width - sz.cx; + } + ME_UnselectStyleFont(c, s, hOldFont); + + PatBlt(hDC, x, ymin, selWidth, cy, DSTINVERT); +} + static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, int nChars, ME_Style *s, int width, int nSelFrom, int nSelTo, int ymin, int cy) @@ -287,14 +322,17 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa ME_GetSelection(c->editor, &nSelFrom, &nSelTo); /* Draw selected end-of-paragraph mark */ - if (run->nFlags & MERF_ENDPARA && runofs >= nSelFrom && runofs < nSelTo) - ME_DrawTextWithStyle(c, x, y, wszSpace, 1, run->style, 0, 0, 1, - c->pt.y + start->member.row.nYPos, - start->member.row.nHeight); - /* you can always comment it out if you need visible paragraph marks */ if (run->nFlags & MERF_ENDPARA) + { + if (runofs >= nSelFrom && runofs < nSelTo) + { + ME_HighlightSpace(c, x, y, wszSpace, 1, run->style, 0, 0, 1, + c->pt.y + start->member.row.nYPos, + start->member.row.nHeight); + } return; + } if (run->nFlags & (MERF_TAB | MERF_CELL)) {

1 0

Dylan Smith : richedit: Tabs are now highlighted and underlined.
by Alexandre Julliard July 11, 2008

July 11, 2008

Module: wine Branch: master Commit: 5ec188d955e799ecd29c6c090a5fd8c08cfce682 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ec188d955e799ecd29c6c090… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jul 10 18:26:56 2008 -0400 richedit: Tabs are now highlighted and underlined. --- dlls/riched20/paint.c | 89 ++++++++++++++++++++++++++++++++++-------------- 1 files changed, 63 insertions(+), 26 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index a2bc7c5..1aa10b1 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -160,14 +160,23 @@ int ME_twips2pointsY(ME_Context *c, int y) return y * c->dpi.cy * c->editor->nZoomNumerator / 1440 / c->editor->nZoomDenominator; } -static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, int nChars, - ME_Style *s, int *width, int nSelFrom, int nSelTo, int ymin, int cy) { +static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, + int nChars, ME_Style *s, int width, + int nSelFrom, int nSelTo, int ymin, int cy) +{ HDC hDC = c->hDC; HGDIOBJ hOldFont; COLORREF rgbOld; int yOffset = 0, yTwipsOffset = 0; SIZE sz; COLORREF rgb; + int *lpDx = NULL; + /* lpDx is only needed for tabs to make sure the underline done automatically + * by the font extends to the end of the tab. Tabs are always stored as + * a single character run, so we can handle this case separately, since + * otherwise lpDx would need to specify the lengths of each character. */ + if (width && nChars == 1) + lpDx = &width; /* Make sure underline for tab extends across tab space */ hOldFont = ME_SelectStyleFont(c, s); if ((s->fmt.dwMask & CFM_LINK) && (s->fmt.dwEffects & CFE_LINK)) @@ -186,12 +195,15 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, in } if (yTwipsOffset) yOffset = ME_twips2pointsY(c, yTwipsOffset); - ExtTextOutW(hDC, x, y-yOffset, 0, NULL, szText, nChars, NULL); + ExtTextOutW(hDC, x, y-yOffset, 0, NULL, szText, nChars, lpDx); GetTextExtentPoint32W(hDC, szText, nChars, &sz); - if (width) *width = sz.cx; + /* Treat width as an optional parameter. We can get the width from the + * text extent of the string if it isn't specified. */ + if (!width) width = sz.cx; + if (s->fmt.dwMask & CFM_UNDERLINETYPE) { - HPEN hPen; + HPEN hPen = NULL; switch (s->fmt.bUnderlineType) { case CFU_UNDERLINE: @@ -215,22 +227,36 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, in HPEN hOldPen = SelectObject(hDC, hPen); /* FIXME: should use textmetrics info for Descent info */ MoveToEx(hDC, x, y - yOffset + 1, NULL); - LineTo(hDC, x + sz.cx, y - yOffset + 1); + LineTo(hDC, x + width, y - yOffset + 1); SelectObject(hDC, hOldPen); DeleteObject(hPen); } } - if (nSelFrom < nChars && nSelTo >= 0 && nSelFrom<nSelTo) + if (nSelFrom < nChars && nSelTo >= 0 && nSelFrom < nSelTo + && !c->editor->bHideSelection) { - if (nSelFrom < 0) nSelFrom = 0; - if (nSelTo > nChars) nSelTo = nChars; - GetTextExtentPoint32W(hDC, szText, nSelFrom, &sz); - x += sz.cx; - GetTextExtentPoint32W(hDC, szText+nSelFrom, nSelTo-nSelFrom, &sz); - - /* Invert selection if not hidden by EM_HIDESELECTION */ - if (c->editor->bHideSelection == FALSE) - PatBlt(hDC, x, ymin, sz.cx, cy, DSTINVERT); + int xSelStart, xSelEnd; + if (nSelFrom <= 0) + { + nSelFrom = 0; + xSelStart = x; + } + else + { + GetTextExtentPoint32W(hDC, szText, nSelFrom, &sz); + xSelStart = x + sz.cx; + } + if (nSelTo >= nChars) + { + nSelTo = nChars; + xSelEnd = x + width; + } + else + { + GetTextExtentPoint32W(hDC, szText+nSelFrom, nSelTo-nSelFrom, &sz); + xSelEnd = xSelStart + sz.cx; + } + PatBlt(hDC, xSelStart, ymin, xSelEnd-xSelStart, cy, DSTINVERT); } SetTextColor(hDC, rgbOld); ME_UnselectStyleFont(c, s, hOldFont); @@ -262,14 +288,25 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa /* Draw selected end-of-paragraph mark */ if (run->nFlags & MERF_ENDPARA && runofs >= nSelFrom && runofs < nSelTo) - ME_DrawTextWithStyle(c, x, y, wszSpace, 1, run->style, NULL, 0, 1, + ME_DrawTextWithStyle(c, x, y, wszSpace, 1, run->style, 0, 0, 1, c->pt.y + start->member.row.nYPos, start->member.row.nHeight); - + /* you can always comment it out if you need visible paragraph marks */ - if (run->nFlags & (MERF_ENDPARA | MERF_TAB | MERF_CELL)) + if (run->nFlags & MERF_ENDPARA) return; + if (run->nFlags & (MERF_TAB | MERF_CELL)) + { + /* wszSpace is used instead of the tab character because otherwise + * an unwanted symbol can be inserted instead. */ + ME_DrawTextWithStyle(c, x, y, wszSpace, 1, run->style, run->nWidth, + nSelFrom-runofs,nSelTo-runofs, + c->pt.y + start->member.row.nYPos, + start->member.row.nHeight); + return; + } + if (run->nFlags & MERF_GRAPHICS) ME_DrawOLE(c, x, y, run, para, (runofs >= nSelFrom) && (runofs < nSelTo)); else @@ -277,16 +314,16 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa if (c->editor->cPasswordMask) { ME_String *szMasked = ME_MakeStringR(c->editor->cPasswordMask,ME_StrVLen(run->strText)); - ME_DrawTextWithStyle(c, x, y, - szMasked->szData, ME_StrVLen(szMasked), run->style, NULL, - nSelFrom-runofs,nSelTo-runofs, c->pt.y+start->member.row.nYPos, start->member.row.nHeight); + ME_DrawTextWithStyle(c, x, y, + szMasked->szData, ME_StrVLen(szMasked), run->style, run->nWidth, + nSelFrom-runofs,nSelTo-runofs, c->pt.y+start->member.row.nYPos, start->member.row.nHeight); ME_DestroyString(szMasked); } else - ME_DrawTextWithStyle(c, x, y, - run->strText->szData, ME_StrVLen(run->strText), run->style, NULL, - nSelFrom-runofs,nSelTo-runofs, c->pt.y+start->member.row.nYPos, start->member.row.nHeight); - } + ME_DrawTextWithStyle(c, x, y, + run->strText->szData, ME_StrVLen(run->strText), run->style, run->nWidth, + nSelFrom-runofs,nSelTo-runofs, c->pt.y+start->member.row.nYPos, start->member.row.nHeight); + } } static const struct {unsigned width_num : 4, width_den : 4, pen_style : 4, dble : 1;} border_details[] = {

1 0