April 2009 - Wine-Commits - list.winehq.org

Rico Schüller : notepad: Implement replace.
by Alexandre Julliard April 27, 2009

April 27, 2009

Module: wine Branch: master Commit: 3137600651a203486f44e312b6a23cf577f27ca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3137600651a203486f44e312b… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Apr 25 17:53:58 2009 +0200 notepad: Implement replace. --- programs/notepad/De.rc | 1 + programs/notepad/En.rc | 1 + programs/notepad/dialog.c | 19 +++++++++ programs/notepad/dialog.h | 1 + programs/notepad/main.c | 82 ++++++++++++++++++++++++++++++++++++++++ programs/notepad/main.h | 1 + programs/notepad/notepad_res.h | 1 + programs/notepad/rsrc.rc | 1 + 8 files changed, 107 insertions(+), 0 deletions(-) diff --git a/programs/notepad/De.rc b/programs/notepad/De.rc index 24d713a..fb315a8 100644 --- a/programs/notepad/De.rc +++ b/programs/notepad/De.rc @@ -53,6 +53,7 @@ POPUP "&Bearbeiten" { POPUP "&Suchen" { MENUITEM "Suchen...\tStrg+F", CMD_SEARCH MENUITEM "&Weitersuchen\tF3", CMD_SEARCH_NEXT + MENUITEM "&Ersetzen...\tStrg+H", CMD_REPLACE } POPUP "&Hilfe" { MENUITEM "&Inhalt", CMD_HELP_CONTENTS diff --git a/programs/notepad/En.rc b/programs/notepad/En.rc index c68404e..c4a4baf 100644 --- a/programs/notepad/En.rc +++ b/programs/notepad/En.rc @@ -53,6 +53,7 @@ POPUP "&Edit" { POPUP "&Search" { MENUITEM "&Search...\tCtrl+F", CMD_SEARCH MENUITEM "&Search next\tF3", CMD_SEARCH_NEXT + MENUITEM "&Replace...\tCtrl+H", CMD_REPLACE } POPUP "&Help" { MENUITEM "&Contents", CMD_HELP_CONTENTS diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index d97e102..ce4bbfa 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -747,6 +747,25 @@ VOID DIALOG_SearchNext(VOID) NOTEPAD_DoFind(&Globals.lastFind); } +VOID DIALOG_Replace(VOID) +{ + ZeroMemory(&Globals.find, sizeof(Globals.find)); + Globals.find.lStructSize = sizeof(Globals.find); + Globals.find.hwndOwner = Globals.hMainWnd; + Globals.find.hInstance = Globals.hInstance; + Globals.find.lpstrFindWhat = Globals.szFindText; + Globals.find.wFindWhatLen = SIZEOF(Globals.szFindText); + Globals.find.lpstrReplaceWith = Globals.szReplaceText; + Globals.find.wReplaceWithLen = SIZEOF(Globals.szReplaceText); + Globals.find.Flags = FR_DOWN|FR_HIDEWHOLEWORD; + + /* We only need to create the modal FindReplace dialog which will */ + /* notify us of incoming events using hMainWnd Window Messages */ + + Globals.hFindReplaceDlg = ReplaceText(&Globals.find); + assert(Globals.hFindReplaceDlg !=0); +} + VOID DIALOG_HelpContents(VOID) { WinHelp(Globals.hMainWnd, helpfileW, HELP_INDEX, 0); diff --git a/programs/notepad/dialog.h b/programs/notepad/dialog.h index d780991..d927143 100644 --- a/programs/notepad/dialog.h +++ b/programs/notepad/dialog.h @@ -38,6 +38,7 @@ VOID DIALOG_EditWrap(VOID); VOID DIALOG_Search(VOID); VOID DIALOG_SearchNext(VOID); +VOID DIALOG_Replace(VOID); VOID DIALOG_SelectFont(VOID); diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 1751c90..33b4859 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -294,6 +294,7 @@ static int NOTEPAD_MenuCommand(WPARAM wParam) case CMD_SEARCH: DIALOG_Search(); break; case CMD_SEARCH_NEXT: DIALOG_SearchNext(); break; + case CMD_REPLACE: DIALOG_Replace(); break; case CMD_WRAP: DIALOG_EditWrap(); break; case CMD_FONT: DIALOG_SelectFont(); break; @@ -414,6 +415,77 @@ void NOTEPAD_DoFind(FINDREPLACE *fr) SendMessage(Globals.hEdit, EM_SETSEL, found - content, found - content + len); } +void NOTEPAD_DoReplace(FINDREPLACE *fr) +{ + LPTSTR content; + int len = lstrlen(fr->lpstrFindWhat); + int fileLen; + DWORD pos; + DWORD pos_start; + + fileLen = GetWindowTextLength(Globals.hEdit) + 1; + content = HeapAlloc(GetProcessHeap(), 0, fileLen * sizeof(TCHAR)); + if (!content) return; + GetWindowText(Globals.hEdit, content, fileLen); + + SendMessage(Globals.hEdit, EM_GETSEL, (WPARAM)&pos_start, (LPARAM)&pos); + switch (fr->Flags & (FR_DOWN|FR_MATCHCASE)) + { + case FR_DOWN: + if ( pos-pos_start == len && StrCmpNI(fr->lpstrFindWhat, content+pos_start, len) == 0) + SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)fr->lpstrReplaceWith); + break; + case FR_DOWN|FR_MATCHCASE: + if ( pos-pos_start == len && StrCmpN(fr->lpstrFindWhat, content+pos_start, len) == 0) + SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)fr->lpstrReplaceWith); + break; + default: /* shouldn't happen */ + return; + } + HeapFree(GetProcessHeap(), 0, content); + + NOTEPAD_DoFind(fr); +} + +void NOTEPAD_DoReplaceAll(FINDREPLACE *fr) +{ + LPTSTR content; + LPTSTR found; + int len = lstrlen(fr->lpstrFindWhat); + int fileLen; + DWORD pos; + + SendMessage(Globals.hEdit, EM_SETSEL, 0, 0); + while(TRUE){ + fileLen = GetWindowTextLength(Globals.hEdit) + 1; + content = HeapAlloc(GetProcessHeap(), 0, fileLen * sizeof(TCHAR)); + if (!content) return; + GetWindowText(Globals.hEdit, content, fileLen); + + SendMessage(Globals.hEdit, EM_GETSEL, 0, (LPARAM)&pos); + switch (fr->Flags & (FR_DOWN|FR_MATCHCASE)) + { + case FR_DOWN: + found = StrStrI(content+pos, fr->lpstrFindWhat); + break; + case FR_DOWN|FR_MATCHCASE: + found = StrStr(content+pos, fr->lpstrFindWhat); + break; + default: /* shouldn't happen */ + return; + } + HeapFree(GetProcessHeap(), 0, content); + + if(found == NULL) + { + SendMessage(Globals.hEdit, EM_SETSEL, 0, 0); + return; + } + SendMessage(Globals.hEdit, EM_SETSEL, found - content, found - content + len); + SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)fr->lpstrReplaceWith); + } +} + /*********************************************************************** * * NOTEPAD_WndProc @@ -432,6 +504,16 @@ static LRESULT WINAPI NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, Globals.lastFind = *fr; NOTEPAD_DoFind(fr); } + if (fr->Flags & FR_REPLACE) + { + Globals.lastFind = *fr; + NOTEPAD_DoReplace(fr); + } + if (fr->Flags & FR_REPLACEALL) + { + Globals.lastFind = *fr; + NOTEPAD_DoReplaceAll(fr); + } return 0; } diff --git a/programs/notepad/main.h b/programs/notepad/main.h index 51db639..88e7fbe 100644 --- a/programs/notepad/main.h +++ b/programs/notepad/main.h @@ -35,6 +35,7 @@ typedef struct LOGFONT lfFont; BOOL bWrapLongLines; WCHAR szFindText[MAX_PATH]; + WCHAR szReplaceText[MAX_PATH]; WCHAR szFileName[MAX_PATH]; WCHAR szFileTitle[MAX_PATH]; WCHAR szFilter[2 * MAX_STRING_LEN + 100]; diff --git a/programs/notepad/notepad_res.h b/programs/notepad/notepad_res.h index 9228a5e..8176b85 100644 --- a/programs/notepad/notepad_res.h +++ b/programs/notepad/notepad_res.h @@ -45,6 +45,7 @@ #define CMD_SEARCH 0x120 #define CMD_SEARCH_NEXT 0x121 +#define CMD_REPLACE 0x122 #define CMD_WRAP 0x119 #define CMD_FONT 0x140 diff --git a/programs/notepad/rsrc.rc b/programs/notepad/rsrc.rc index 8018a58..50b3558 100644 --- a/programs/notepad/rsrc.rc +++ b/programs/notepad/rsrc.rc @@ -30,6 +30,7 @@ ID_ACCEL ACCELERATORS "^A", CMD_SELECT_ALL "^C", CMD_COPY "^F", CMD_SEARCH + "H", CMD_REPLACE, VIRTKEY, CONTROL "^N", CMD_NEW "^O", CMD_OPEN "^P", CMD_PRINT

1 0

Austin English : winetest: When extracting tests, run in console mode.
by Alexandre Julliard April 27, 2009

April 27, 2009

Module: wine Branch: master Commit: 0d2d1e7ff9450589255454ef0bb7e50b915e048c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d2d1e7ff9450589255454ef0… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Apr 26 12:55:03 2009 -0500 winetest: When extracting tests, run in console mode. --- programs/winetest/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 6cee70c..7bbb0cb 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -912,6 +912,7 @@ int main( int argc, char *argv[] ) } break; case 'x': + report (R_TEXTMODE); if (!(extract = argv[++i])) extract = ".\\wct";

1 0

Henri Verbeet : wined3d: Add a function to read a destination parameter from SM1-3 bytecode.
by Alexandre Julliard April 27, 2009

April 27, 2009

Module: wine Branch: master Commit: abc253f52fcacf98250581ef6a4ed6f8384df266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abc253f52fcacf98250581ef6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 27 09:37:14 2009 +0200 wined3d: Add a function to read a destination parameter from SM1-3 bytecode. --- dlls/wined3d/baseshader.c | 57 +++++++++++++++++++++++--------------------- 1 files changed, 30 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index e52b91c..e9cb760 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -191,6 +191,18 @@ static void shader_parse_src_param(DWORD param, const struct wined3d_shader_src_ src->rel_addr = rel_addr; } +static void shader_parse_dst_param(DWORD param, const struct wined3d_shader_src_param *rel_addr, + struct wined3d_shader_dst_param *dst) +{ + dst->register_type = ((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) + | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); + dst->register_idx = param & WINED3DSP_REGNUM_MASK; + dst->write_mask = param & WINED3DSP_WRITEMASK_ALL; + dst->modifiers = (param & WINED3DSP_DSTMOD_MASK) >> WINED3DSP_DSTMOD_SHIFT; + dst->shift = (param & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; + dst->rel_addr = rel_addr; +} + static void shader_sm1_read_opcode(const DWORD **ptr, struct wined3d_shader_instruction *ins, UINT *param_size, const SHADER_OPCODE *opcode_table, DWORD shader_version) { @@ -233,6 +245,23 @@ static void shader_sm1_read_src_param(const DWORD **ptr, struct wined3d_shader_s } } +static void shader_sm1_read_dst_param(const DWORD **ptr, struct wined3d_shader_dst_param *dst_param, + struct wined3d_shader_src_param *dst_rel_addr, DWORD shader_version) +{ + DWORD token, addr_token; + + *ptr += shader_get_param(*ptr, shader_version, &token, &addr_token); + if (token & WINED3DSHADER_ADDRMODE_RELATIVE) + { + shader_parse_src_param(addr_token, NULL, dst_rel_addr); + shader_parse_dst_param(token, dst_rel_addr, dst_param); + } + else + { + shader_parse_dst_param(token, NULL, dst_param); + } +} + static const char *shader_opcode_names[] = { /* WINED3DSIH_ABS */ "abs", @@ -439,18 +468,6 @@ static void shader_delete_constant_list(struct list* clist) { list_init(clist); } -static void shader_parse_dst_param(DWORD param, const struct wined3d_shader_src_param *rel_addr, - struct wined3d_shader_dst_param *dst) -{ - dst->register_type = ((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) - | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); - dst->register_idx = param & WINED3DSP_REGNUM_MASK; - dst->write_mask = param & WINED3DSP_WRITEMASK_ALL; - dst->modifiers = (param & WINED3DSP_DSTMOD_MASK) >> WINED3DSP_DSTMOD_SHIFT; - dst->shift = (param & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; - dst->rel_addr = rel_addr; -} - /* Note that this does not count the loop register * as an address register. */ @@ -1115,21 +1132,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, } /* Destination token */ - if (ins.dst_count) - { - DWORD param, addr_param; - pToken += shader_get_param(pToken, shader_version, &param, &addr_param); - - if (param & WINED3DSHADER_ADDRMODE_RELATIVE) - { - shader_parse_src_param(addr_param, NULL, &dst_rel_addr); - shader_parse_dst_param(param, &dst_rel_addr, &dst_param); - } - else - { - shader_parse_dst_param(param, NULL, &dst_param); - } - } + if (ins.dst_count) shader_sm1_read_dst_param(&pToken, &dst_param, &dst_rel_addr, shader_version); /* Predication token */ if (ins.predicate) ins.predicate = *pToken++;

1 0

Henri Verbeet : wined3d: Add a wined3d pixel shader to struct d3d10_pixel_shader.
by Alexandre Julliard April 27, 2009

April 27, 2009

Module: wine Branch: master Commit: f1023815ce09a8ff38492f926bc0a97bf1c504c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1023815ce09a8ff38492f926… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 27 09:37:14 2009 +0200 wined3d: Add a wined3d pixel shader to struct d3d10_pixel_shader. --- dlls/d3d10core/d3d10core_private.h | 5 +++++ dlls/d3d10core/device.c | 21 ++++++++++++++++++++- dlls/d3d10core/shader.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index df9794f..3f782ba 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -39,6 +39,7 @@ ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') #define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') +#define TAG_SHDR MAKE_TAG('S', 'H', 'D', 'R') /* TRACE helper functions */ const char *debug_d3d10_primitive_topology(D3D10_PRIMITIVE_TOPOLOGY topology); @@ -149,8 +150,12 @@ struct d3d10_pixel_shader { const struct ID3D10PixelShaderVtbl *vtbl; LONG refcount; + + IWineD3DPixelShader *wined3d_shader; }; +HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, const DWORD **shader_code); + /* Layered device */ enum dxgi_device_layer_id { diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 2b704b3..5c91cbd 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1023,11 +1023,21 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShaderWithStreamOutp static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePixelShader(ID3D10Device *iface, const void *byte_code, SIZE_T byte_code_length, ID3D10PixelShader **shader) { + struct d3d10_device *This = (struct d3d10_device *)iface; struct d3d10_pixel_shader *object; + const DWORD *shader_code; + HRESULT hr; - FIXME("iface %p, byte_code %p, byte_code_length %lu, shader %p stub!\n", + TRACE("iface %p, byte_code %p, byte_code_length %lu, shader %p\n", iface, byte_code, byte_code_length, shader); + hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_code); + if (FAILED(hr)) + { + ERR("Failed to extract shader, hr %#x\n", hr); + return hr; + } + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -1038,6 +1048,15 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePixelShader(ID3D10Device *if object->vtbl = &d3d10_pixel_shader_vtbl; object->refcount = 1; + hr = IWineD3DDevice_CreatePixelShader(This->wined3d_device, + shader_code, &object->wined3d_shader, (IUnknown *)object); + if (FAILED(hr)) + { + ERR("CreatePixelShader failed, hr %#x\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + *shader = (ID3D10PixelShader *)object; return S_OK; diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index b614779..8b3d01e 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -24,6 +24,37 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); +static HRESULT shdr_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) +{ + const DWORD **shader_data = ctx; + char tag_str[5]; + + switch(tag) + { + case TAG_SHDR: + *shader_data = (const DWORD *)data; + return S_OK; + + default: + memcpy(tag_str, &tag, 4); + tag_str[4] = '\0'; + FIXME("Unhandled chunk %s\n", tag_str); + return S_OK; + } +} + +HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, const DWORD **shader_code) +{ + HRESULT hr; + + hr = parse_dxbc(dxbc, dxbc_length, shdr_handler, shader_code); + if (!*shader_code) hr = E_FAIL; + + if (FAILED(hr)) ERR("Failed to parse shader, hr %#x\n", hr); + + return hr; +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_QueryInterface(ID3D10VertexShader *iface,

1 0

Alexandre Julliard : Revert "kernel32: Report unixfs instead of ntfs for unknown filesystem type."
by Alexandre Julliard April 27, 2009

April 27, 2009

Module: wine Branch: master Commit: 72f89d6bfc866b49b9f63c56c72f7cdf0bd542eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=72f89d6bfc866b49b9f63c56c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 27 13:25:53 2009 +0200 Revert "kernel32: Report unixfs instead of ntfs for unknown filesystem type." This reverts commit 8044c11ecfca09e2b643feccb95a4d8f645ba656. --- dlls/kernel32/volume.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 31490b9..e0d0989 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -511,8 +511,8 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, static const WCHAR audiocdW[] = {'A','u','d','i','o',' ','C','D',0}; static const WCHAR fatW[] = {'F','A','T',0}; static const WCHAR fat32W[] = {'F','A','T','3','2',0}; + static const WCHAR ntfsW[] = {'N','T','F','S',0}; static const WCHAR cdfsW[] = {'C','D','F','S',0}; - static const WCHAR unixfsW[] = {'U','N','I','X','F','S',0}; WCHAR device[] = {'\\','\\','.','\\','A',':',0}; HANDLE handle; @@ -613,7 +613,7 @@ fill_fs_info: /* now fill in the information that depends on the file system ty if (flags) *flags = FILE_CASE_PRESERVED_NAMES; /* FIXME */ break; default: - if (fsname) lstrcpynW( fsname, unixfsW, fsname_len ); + if (fsname) lstrcpynW( fsname, ntfsW, fsname_len ); if (filename_len) *filename_len = 255; if (flags) *flags = FILE_CASE_PRESERVED_NAMES; break;

1 0

Nikolay Sivov : comctl32/listview: Remove duplicated iterator initializer.
by Alexandre Julliard April 27, 2009

April 27, 2009

Module: wine Branch: master Commit: 3f0824bdf4e0130c8c96e9e77814adf7fb460c0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f0824bdf4e0130c8c96e9e77… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Apr 26 12:37:18 2009 +0400 comctl32/listview: Remove duplicated iterator initializer. --- dlls/comctl32/listview.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index f6c09d0..38c5133 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4173,7 +4173,6 @@ static void LISTVIEW_RefreshReportGrid(LISTVIEW_INFO *infoPtr, HDC hdc) LISTVIEW_GetHeaderRect(infoPtr, colRange.upper - 1, &rcItem); if (rcItem.left + Origin.x < rcClip.right) break; } - iterator_rangeitems(&j, colRange); if ((hPen = CreatePen( PS_SOLID, 1, comctl32_color.clr3dFace ))) {

1 0

Nikolay Sivov : comctl32/listview: Fix horizontal grid line drawing.
by Alexandre Julliard April 27, 2009

April 27, 2009

Module: wine Branch: master Commit: d1d7dfab646502c319b5ba302be910eeea29f9b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1d7dfab646502c319b5ba302… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Apr 26 12:38:51 2009 +0400 comctl32/listview: Fix horizontal grid line drawing. --- dlls/comctl32/listview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 8808165..6301c8a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4206,8 +4206,8 @@ static void LISTVIEW_RefreshReportGrid(LISTVIEW_INFO *infoPtr, HDC hdc) /* draw the horizontial lines for the rows */ itemheight = LISTVIEW_CalculateItemHeight(infoPtr); - rcItem.left = infoPtr->rcList.left + Origin.x; - rcItem.right = infoPtr->rcList.right + Origin.x; + rcItem.left = infoPtr->rcList.left; + rcItem.right = infoPtr->rcList.right; rcItem.bottom = rcItem.top = Origin.y - 1; MoveToEx(hdc, rcItem.left, rcItem.top, NULL); LineTo(hdc, rcItem.right, rcItem.top);

1 0

Nikolay Sivov : comctl32/listview: Draw rightmost vertical grid line when needed.
by Alexandre Julliard April 27, 2009

April 27, 2009

Module: wine Branch: master Commit: 2796763ee3ef87904fd92f4f753c138a1be295bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2796763ee3ef87904fd92f4f7… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Apr 26 12:38:01 2009 +0400 comctl32/listview: Draw rightmost vertical grid line when needed. --- dlls/comctl32/listview.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 38c5133..8808165 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4152,6 +4152,7 @@ static void LISTVIEW_RefreshReportGrid(LISTVIEW_INFO *infoPtr, HDC hdc) POINT Origin; RANGE colRange; ITERATOR j; + BOOL rmost; TRACE("()\n"); @@ -4173,6 +4174,9 @@ static void LISTVIEW_RefreshReportGrid(LISTVIEW_INFO *infoPtr, HDC hdc) LISTVIEW_GetHeaderRect(infoPtr, colRange.upper - 1, &rcItem); if (rcItem.left + Origin.x < rcClip.right) break; } + /* is right most vertical line visible? */ + LISTVIEW_GetHeaderRect(infoPtr, DPA_GetPtrCount(infoPtr->hdpaColumns) - 1, &rcItem); + rmost = (rcItem.right + Origin.x < rcClip.right); if ((hPen = CreatePen( PS_SOLID, 1, comctl32_color.clr3dFace ))) { @@ -4193,6 +4197,12 @@ static void LISTVIEW_RefreshReportGrid(LISTVIEW_INFO *infoPtr, HDC hdc) LineTo (hdc, rcItem.left, rcItem.bottom); } iterator_destroy(&j); + /* draw rightmost grid line if visible */ + if (rmost) + { + MoveToEx (hdc, rcItem.right, rcItem.top, NULL); + LineTo (hdc, rcItem.right, rcItem.bottom); + } /* draw the horizontial lines for the rows */ itemheight = LISTVIEW_CalculateItemHeight(infoPtr);

1 0

Nikolay Sivov : comctl32/listview: Reuse existing variable instead of duplicated expression.
by Alexandre Julliard April 27, 2009

April 27, 2009

Module: wine Branch: master Commit: bf61677998a6c721b661b3fa6da4963cbaa7128f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf61677998a6c721b661b3fa6… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Apr 26 12:33:14 2009 +0400 comctl32/listview: Reuse existing variable instead of duplicated expression. --- dlls/comctl32/listview.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2aed87e..f6c09d0 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4365,8 +4365,7 @@ static void LISTVIEW_Refresh(LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *prcEra enddraw: /* For LVS_EX_GRIDLINES go and draw lines */ /* This includes the case where there were *no* items */ - if ((infoPtr->dwStyle & LVS_TYPEMASK) == LVS_REPORT && - infoPtr->dwLvExStyle & LVS_EX_GRIDLINES) + if ((uView == LVS_REPORT) && infoPtr->dwLvExStyle & LVS_EX_GRIDLINES) LISTVIEW_RefreshReportGrid(infoPtr, hdc); if (cdmode & CDRF_NOTIFYPOSTPAINT)

1 0

Henri Verbeet : wined3d: Add a function to read a source parameter from SM1-3 bytecode.
by Alexandre Julliard April 27, 2009

April 27, 2009

Module: wine Branch: master Commit: 4e97e430d95950098dba3b34bb9c318c4068b09e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e97e430d95950098dba3b34b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 27 09:37:14 2009 +0200 wined3d: Add a function to read a source parameter from SM1-3 bytecode. --- dlls/wined3d/baseshader.c | 51 +++++++++++++++++++++++++------------------- 1 files changed, 29 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 3ea65e7..e52b91c 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -180,6 +180,17 @@ static int shader_skip_unrecognized(const DWORD *ptr, DWORD shader_version) return tokens_read; } +static void shader_parse_src_param(DWORD param, const struct wined3d_shader_src_param *rel_addr, + struct wined3d_shader_src_param *src) +{ + src->register_type = ((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) + | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); + src->register_idx = param & WINED3DSP_REGNUM_MASK; + src->swizzle = (param & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; + src->modifiers = (param & WINED3DSP_SRCMOD_MASK) >> WINED3DSP_SRCMOD_SHIFT; + src->rel_addr = rel_addr; +} + static void shader_sm1_read_opcode(const DWORD **ptr, struct wined3d_shader_instruction *ins, UINT *param_size, const SHADER_OPCODE *opcode_table, DWORD shader_version) { @@ -205,6 +216,23 @@ static void shader_sm1_read_opcode(const DWORD **ptr, struct wined3d_shader_inst *param_size = shader_skip_opcode(opcode_info, opcode_token, shader_version); } +static void shader_sm1_read_src_param(const DWORD **ptr, struct wined3d_shader_src_param *src_param, + struct wined3d_shader_src_param *src_rel_addr, DWORD shader_version) +{ + DWORD token, addr_token; + + *ptr += shader_get_param(*ptr, shader_version, &token, &addr_token); + if (token & WINED3DSHADER_ADDRMODE_RELATIVE) + { + shader_parse_src_param(addr_token, NULL, src_rel_addr); + shader_parse_src_param(token, src_rel_addr, src_param); + } + else + { + shader_parse_src_param(token, NULL, src_param); + } +} + static const char *shader_opcode_names[] = { /* WINED3DSIH_ABS */ "abs", @@ -423,17 +451,6 @@ static void shader_parse_dst_param(DWORD param, const struct wined3d_shader_src_ dst->rel_addr = rel_addr; } -static void shader_parse_src_param(DWORD param, const struct wined3d_shader_src_param *rel_addr, - struct wined3d_shader_src_param *src) -{ - src->register_type = ((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) - | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); - src->register_idx = param & WINED3DSP_REGNUM_MASK; - src->swizzle = (param & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; - src->modifiers = (param & WINED3DSP_SRCMOD_MASK) >> WINED3DSP_SRCMOD_SHIFT; - src->rel_addr = rel_addr; -} - /* Note that this does not count the loop register * as an address register. */ @@ -1120,17 +1137,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, /* Other source tokens */ for (i = 0; i < ins.src_count; ++i) { - DWORD param, addr_param; - pToken += shader_get_param(pToken, shader_version, &param, &addr_param); - if (param & WINED3DSHADER_ADDRMODE_RELATIVE) - { - shader_parse_src_param(addr_param, NULL, &src_rel_addr[i]); - shader_parse_src_param(param, &src_rel_addr[i], &src_param[i]); - } - else - { - shader_parse_src_param(param, NULL, &src_param[i]); - } + shader_sm1_read_src_param(&pToken, &src_param[i], &src_rel_addr[i], shader_version); } /* Call appropriate function for output target */

1 0