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

Dylan Smith : wordpad: Reduce unnecessary flicker from extra background erasing.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: 6c9edce1a877ce67dd6c0a2e9aba1f94b8791b70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c9edce1a877ce67dd6c0a2e9… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jul 19 18:20:48 2010 -0400 wordpad: Reduce unnecessary flicker from extra background erasing. --- programs/wordpad/print.c | 2 +- programs/wordpad/wordpad.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index 231c90e..475d833 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -781,7 +781,7 @@ static void update_scaled_preview(HWND hMainWnd) !is_last_preview_page(preview.page)); } - InvalidateRect(hwndPreview, NULL, TRUE); + InvalidateRect(hwndPreview, NULL, FALSE); DeleteDC(fr.hdcTarget); } diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 845b9ae..80fe19d 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2701,7 +2701,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar hAccel = LoadAcceleratorsW(hInstance, wszAccelTable); wc.cbSize = sizeof(wc); - wc.style = CS_HREDRAW | CS_VREDRAW; + wc.style = 0; wc.lpfnWndProc = WndProc; wc.cbClsExtra = 0; wc.cbWndExtra = 4; @@ -2715,7 +2715,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar wc.lpszClassName = wszMainWndClass; RegisterClassExW(&wc); - wc.style = CS_HREDRAW | CS_VREDRAW; + wc.style = 0; wc.lpfnWndProc = preview_proc; wc.cbClsExtra = 0; wc.cbWndExtra = 0; @@ -2723,7 +2723,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar wc.hIcon = NULL; wc.hIconSm = NULL; wc.hCursor = LoadCursor(NULL, IDC_IBEAM); - wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); + wc.hbrBackground = NULL; wc.lpszMenuName = NULL; wc.lpszClassName = wszPreviewWndClass; RegisterClassExW(&wc);

1 0

André Hentschel : winecfg: Improve German view.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: 117a436bbf562f37ddf7293ce857864f148a820a URL: http://source.winehq.org/git/wine.git/?a=commit;h=117a436bbf562f37ddf7293ce… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 19 21:09:08 2010 +0200 winecfg: Improve German view. --- programs/winecfg/De.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index fb9ceef..84ed05a 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -74,13 +74,13 @@ BEGIN GROUPBOX " Fenstereinstellungen ",IDC_STATIC,8,4,244,84 CONTROL "DirectX-Anwendungen können Maus einfangen",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Erlaube dem Fenstermanager die Fenster zu &dekorieren",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 - CONTROL "Erlaube dem Fenstermanager die Fenster zu kontrollieren.",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 + CONTROL "Erlaube dem Fenstermanager die Fenster zu kontrollieren",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "Emuliere einen virtuellen Bildschirm",IDC_ENABLE_DESKTOP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,56,230,8 - LTEXT "Desktop-Größe:",IDC_DESKTOP_SIZE,15,70,44,8,WS_DISABLED - LTEXT "X",IDC_DESKTOP_BY,109,70,8,8,WS_DISABLED - EDITTEXT IDC_DESKTOP_WIDTH,64,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - EDITTEXT IDC_DESKTOP_HEIGHT,117,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + LTEXT "Desktop-Größe:",IDC_DESKTOP_SIZE,15,70,54,8,WS_DISABLED + LTEXT "X",IDC_DESKTOP_BY,119,70,8,8,WS_DISABLED + EDITTEXT IDC_DESKTOP_WIDTH,74,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_HEIGHT,127,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED GROUPBOX " Direct3D ",IDC_STATIC,8,95,244,49 LTEXT "Unterstützung für Vertex Shader: ",IDC_STATIC,15,106,80,32

1 0

Dylan Smith : wordpad: Fix behaviour of find/replace dialog.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: 72f735b25e883b2568b4060813b93246df0b8c12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72f735b25e883b2568b406081… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jul 19 18:17:57 2010 -0400 wordpad: Fix behaviour of find/replace dialog. Pressing replace should only replace a selected match, and afterwards it should find the next match. Searches should always start from the start of the selection, even if the selection is moved in between searches. Searches wrap at the end of text, and should keep track of whether it has wrapped from previous searches to determine if it reached the end position. --- programs/wordpad/wordpad.c | 117 +++++++++++++++++++++---------------------- 1 files changed, 57 insertions(+), 60 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 0e6566d..df1b254 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -89,6 +89,12 @@ typedef enum UNIT_PT } UNIT; +typedef struct +{ + int endPos; + BOOL wrapped; +} FINDREPLACE_custom; + /* Load string resources */ static void DoLoadStrings(void) { @@ -1215,13 +1221,11 @@ static LRESULT handle_findmsg(LPFINDREPLACEW pFr) if(pFr->Flags & FR_FINDNEXT || pFr->Flags & FR_REPLACE || pFr->Flags & FR_REPLACEALL) { - DWORD flags = FR_DOWN; - FINDTEXTW ft; - static CHARRANGE cr; - LRESULT end, ret; - GETTEXTLENGTHEX gt; - LRESULT length; - int startPos; + FINDREPLACE_custom *custom_data = (FINDREPLACE_custom*)pFr->lCustData; + DWORD flags; + FINDTEXTEXW ft; + CHARRANGE sel; + LRESULT ret = -1; HMENU hMenu = GetMenu(hMainWnd); MENUITEMINFOW mi; @@ -1230,69 +1234,59 @@ static LRESULT handle_findmsg(LPFINDREPLACEW pFr) mi.dwItemData = 1; SetMenuItemInfoW(hMenu, ID_FIND_NEXT, FALSE, &mi); - gt.flags = GTL_NUMCHARS; - gt.codepage = 1200; - - length = SendMessageW(hEditorWnd, EM_GETTEXTLENGTHEX, (WPARAM)&gt, 0); - - if(pFr->lCustData == -1) - { - SendMessageW(hEditorWnd, EM_GETSEL, (WPARAM)&startPos, (LPARAM)&end); - cr.cpMin = startPos; - pFr->lCustData = startPos; - cr.cpMax = length; - if(cr.cpMin == length) - cr.cpMin = 0; - } else - { - startPos = pFr->lCustData; - } - - if(cr.cpMax > length) - { - startPos = 0; - cr.cpMin = 0; - cr.cpMax = length; + SendMessageW(hEditorWnd, EM_GETSEL, (WPARAM)&sel.cpMin, (LPARAM)&sel.cpMax); + if(custom_data->endPos == -1) { + custom_data->endPos = sel.cpMin; + custom_data->wrapped = FALSE; } - ft.chrg = cr; + flags = FR_DOWN | (pFr->Flags & (FR_MATCHCASE | FR_WHOLEWORD)); ft.lpstrText = pFr->lpstrFindWhat; - if(pFr->Flags & FR_MATCHCASE) - flags |= FR_MATCHCASE; - if(pFr->Flags & FR_WHOLEWORD) - flags |= FR_WHOLEWORD; - - ret = SendMessageW(hEditorWnd, EM_FINDTEXTW, flags, (LPARAM)&ft); - - if(ret == -1) + /* Only replace existing selectino if it is an exact match. */ + if (sel.cpMin != sel.cpMax && + (pFr->Flags & FR_REPLACE || pFr->Flags & FR_REPLACEALL)) { - if(cr.cpMax == length && cr.cpMax != startPos) - { - ft.chrg.cpMin = cr.cpMin = 0; - ft.chrg.cpMax = cr.cpMax = startPos; + ft.chrg = sel; + SendMessageW(hEditorWnd, EM_FINDTEXTEXW, flags, (LPARAM)&ft); + if (ft.chrgText.cpMin == sel.cpMin && ft.chrgText.cpMax == sel.cpMax) { + SendMessageW(hEditorWnd, EM_REPLACESEL, TRUE, (LPARAM)pFr->lpstrReplaceWith); + SendMessageW(hEditorWnd, EM_GETSEL, (WPARAM)&sel.cpMin, (LPARAM)&sel.cpMax); + } + } - ret = SendMessageW(hEditorWnd, EM_FINDTEXTW, flags, (LPARAM)&ft); + /* Search from the start of the selection, but exclude the first character + * from search if there is a selection. */ + ft.chrg.cpMin = sel.cpMin; + if (sel.cpMin != sel.cpMax) + ft.chrg.cpMin++; + + /* Search to the end, then wrap around and search from the start. */ + if (!custom_data->wrapped) { + ft.chrg.cpMax = -1; + ret = SendMessageW(hEditorWnd, EM_FINDTEXTEXW, flags, (LPARAM)&ft); + if (ret == -1) { + custom_data->wrapped = TRUE; + ft.chrg.cpMin = 0; } } - if(ret == -1) - { - pFr->lCustData = -1; - MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_SEARCH_FINISHED), wszAppTitle, - MB_OK | MB_ICONASTERISK); - } else - { - end = ret + lstrlenW(pFr->lpstrFindWhat); - cr.cpMin = end; - SendMessageW(hEditorWnd, EM_SETSEL, ret, end); - SendMessageW(hEditorWnd, EM_SCROLLCARET, 0, 0); + if (ret == -1) { + ft.chrg.cpMax = custom_data->endPos + lstrlenW(pFr->lpstrFindWhat) - 1; + if (ft.chrg.cpMax > ft.chrg.cpMin) + ret = SendMessageW(hEditorWnd, EM_FINDTEXTEXW, flags, (LPARAM)&ft); + } - if(pFr->Flags & FR_REPLACE || pFr->Flags & FR_REPLACEALL) - SendMessageW(hEditorWnd, EM_REPLACESEL, TRUE, (LPARAM)pFr->lpstrReplaceWith); + if (ret == -1) { + custom_data->endPos = -1; + MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_SEARCH_FINISHED), + wszAppTitle, MB_OK | MB_ICONASTERISK); + } else { + SendMessageW(hEditorWnd, EM_SETSEL, ft.chrgText.cpMin, ft.chrgText.cpMax); + SendMessageW(hEditorWnd, EM_SCROLLCARET, 0, 0); - if(pFr->Flags & FR_REPLACEALL) - handle_findmsg(pFr); + if (pFr->Flags & FR_REPLACEALL) + return handle_findmsg(pFr); } } @@ -1303,6 +1297,7 @@ static void dialog_find(LPFINDREPLACEW fr, BOOL replace) { static WCHAR findBuffer[MAX_STRING_LEN]; static WCHAR replaceBuffer[MAX_STRING_LEN]; + static FINDREPLACE_custom custom_data; /* Allow only one search/replace dialog to open */ if(hFindWnd != NULL) @@ -1317,7 +1312,9 @@ static void dialog_find(LPFINDREPLACEW fr, BOOL replace) fr->Flags = FR_HIDEUPDOWN; fr->lpstrFindWhat = findBuffer; fr->lpstrReplaceWith = replaceBuffer; - fr->lCustData = -1; + custom_data.endPos = -1; + custom_data.wrapped = FALSE; + fr->lCustData = (LPARAM)&custom_data; fr->wFindWhatLen = sizeof(findBuffer); fr->wReplaceWithLen = sizeof(replaceBuffer);

1 0

Henri Verbeet : wined3d: Remove restoring the read buffer from read_from_framebuffer_texture().
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: 4b850ed121ea6ec317bfd0e8b389c93498e2e196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b850ed121ea6ec317bfd0e8b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 19 18:36:22 2010 +0200 wined3d: Remove restoring the read buffer from read_from_framebuffer_texture(). The few functions that care about the read buffer should explicitly set it themselves, instead of assuming any particular state. --- dlls/wined3d/surface.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e21086f..94066ed 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1493,7 +1493,6 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) IWineD3DDeviceImpl *device = This->resource.device; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; - GLint prevRead; if (!surface_is_offscreen(This)) { @@ -1518,7 +1517,6 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) ENTER_GL(); - glGetIntegerv(GL_READ_BUFFER, &prevRead); glReadBuffer(device->offscreenBuffer); checkGLcall("glReadBuffer"); @@ -1526,9 +1524,6 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) 0, 0, 0, 0, This->currentDesc.Width, This->currentDesc.Height); checkGLcall("glCopyTexSubImage2D"); - glReadBuffer(prevRead); - checkGLcall("glReadBuffer"); - LEAVE_GL(); context_release(context);

1 0

Dylan Smith : wordpad: Avoid filling overlapping rectangles in print preview.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: 9de8357965e68a04290763db0d528cd3c21ffac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9de8357965e68a04290763db0… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jul 19 18:21:07 2010 -0400 wordpad: Avoid filling overlapping rectangles in print preview. This reduces the amount of flicker seen from redrawing the window. --- programs/wordpad/print.c | 48 +++++++++++++++++++++++++++++++++------------ 1 files changed, 35 insertions(+), 13 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index e77a596..7761c32 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -845,33 +845,46 @@ static void update_preview_buttons(HWND hMainWnd) static LRESULT print_preview(HWND hwndPreview) { + HPEN hPen, oldPen; HDC hdc; + HRGN back_rgn, excl_rgn; RECT window, background; PAINTSTRUCT ps; int x, y; hdc = BeginPaint(hwndPreview, &ps); GetClientRect(hwndPreview, &window); - - FillRect(hdc, &window, GetStockObject(GRAY_BRUSH)); + back_rgn = CreateRectRgnIndirect(&window); x = preview.spacing.cx - GetScrollPos(hwndPreview, SB_HORZ); y = preview.spacing.cy - GetScrollPos(hwndPreview, SB_VERT); + /* draw page outlines */ + hPen = CreatePen(PS_SOLID|PS_INSIDEFRAME, 2, RGB(0,0,0)); + oldPen = SelectObject(hdc, hPen); background.left = x - 2; - background.right = background.left + preview.bmScaledSize.cx + 4; + background.right = x + preview.bmScaledSize.cx + 2; background.top = y - 2; - background.bottom = background.top + preview.bmScaledSize.cy + 4; - - FillRect(hdc, &background, GetStockObject(BLACK_BRUSH)); - + background.bottom = y + preview.bmScaledSize.cy + 2; + Rectangle(hdc, background.left, background.top, + background.right, background.bottom); + excl_rgn = CreateRectRgnIndirect(&background); + CombineRgn(back_rgn, back_rgn, excl_rgn, RGN_DIFF); if(preview.pages_shown > 1) { background.left += preview.bmScaledSize.cx + preview.spacing.cx; background.right += preview.bmScaledSize.cx + preview.spacing.cx; - - FillRect(hdc, &background, GetStockObject(BLACK_BRUSH)); + Rectangle(hdc, background.left, background.top, + background.right, background.bottom); + SetRectRgn(excl_rgn, background.left, background.top, + background.right, background.bottom); + CombineRgn(back_rgn, back_rgn, excl_rgn, RGN_DIFF); } + SelectObject(hdc, oldPen); + DeleteObject(hPen); + FillRgn(hdc, back_rgn, GetStockObject(GRAY_BRUSH)); + DeleteObject(excl_rgn); + DeleteObject(back_rgn); StretchBlt(hdc, x, y, preview.bmScaledSize.cx, preview.bmScaledSize.cy, preview.hdc, 0, 0, preview.bmSize.cx, preview.bmSize.cy, SRCCOPY); @@ -880,12 +893,21 @@ static LRESULT print_preview(HWND hwndPreview) if(preview.pages_shown > 1) { - x += preview.spacing.cx + preview.bmScaledSize.cx; - StretchBlt(hdc, x, y, preview.bmScaledSize.cx, preview.bmScaledSize.cy, - preview.hdc2, 0, 0, preview.bmSize.cx, preview.bmSize.cy, SRCCOPY); + if (!is_last_preview_page(preview.page)) { + x += preview.spacing.cx + preview.bmScaledSize.cx; + StretchBlt(hdc, x, y, + preview.bmScaledSize.cx, preview.bmScaledSize.cy, + preview.hdc2, 0, 0, + preview.bmSize.cx, preview.bmSize.cy, SRCCOPY); - if (!is_last_preview_page(preview.page)) draw_margin_lines(hdc, x, y, preview.zoomratio); + } else { + background.left += 2; + background.right -= 2; + background.top += 2; + background.bottom -= 2; + FillRect(hdc, &background, GetStockObject(WHITE_BRUSH)); + } } preview.window = window;

1 0

Igor Paliychuk : cryptui: Add Ukrainian translation.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: 35b65ca550c04c51c640afc50e1fb35b8dc97091 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35b65ca550c04c51c640afc50… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Mon Jul 19 19:44:17 2010 +0300 cryptui: Add Ukrainian translation. --- dlls/cryptui/Makefile.in | 3 +- dlls/cryptui/cryptui_Uk.rc | 468 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 470 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35b65ca550c04c51c640a…

1 0

Dylan Smith : wordpad: Find dialogs intialize find field with selection.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: fbd30765f0659551367d78e4fbee1c0ed9c15055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbd30765f0659551367d78e4f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jul 19 18:18:08 2010 -0400 wordpad: Find dialogs intialize find field with selection. If there is a selection that doesn't span multiple paragraphs, then the selection text initializes the find field in native wordpad, otherwise the last search is used to initialize the field. I added an extra buffer, since closing the find dialog before doing a search will preserve the last search state. --- programs/wordpad/wordpad.c | 35 +++++++++++++++++++++++++++++++---- 1 files changed, 31 insertions(+), 4 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index df1b254..edee1f8 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -93,6 +93,7 @@ typedef struct { int endPos; BOOL wrapped; + WCHAR findBuffer[128]; } FINDREPLACE_custom; /* Load string resources */ @@ -1234,6 +1235,14 @@ static LRESULT handle_findmsg(LPFINDREPLACEW pFr) mi.dwItemData = 1; SetMenuItemInfoW(hMenu, ID_FIND_NEXT, FALSE, &mi); + /* Make sure find field is saved. */ + if (pFr->lpstrFindWhat != custom_data->findBuffer) + { + lstrcpynW(custom_data->findBuffer, pFr->lpstrFindWhat, + sizeof(custom_data->findBuffer)); + pFr->lpstrFindWhat = custom_data->findBuffer; + } + SendMessageW(hEditorWnd, EM_GETSEL, (WPARAM)&sel.cpMin, (LPARAM)&sel.cpMax); if(custom_data->endPos == -1) { custom_data->endPos = sel.cpMin; @@ -1295,9 +1304,11 @@ static LRESULT handle_findmsg(LPFINDREPLACEW pFr) static void dialog_find(LPFINDREPLACEW fr, BOOL replace) { - static WCHAR findBuffer[MAX_STRING_LEN]; - static WCHAR replaceBuffer[MAX_STRING_LEN]; + static WCHAR selBuffer[128]; + static WCHAR replaceBuffer[128]; static FINDREPLACE_custom custom_data; + static const WCHAR endl = '\r'; + FINDTEXTW ft; /* Allow only one search/replace dialog to open */ if(hFindWnd != NULL) @@ -1310,12 +1321,28 @@ static void dialog_find(LPFINDREPLACEW fr, BOOL replace) fr->lStructSize = sizeof(FINDREPLACEW); fr->hwndOwner = hMainWnd; fr->Flags = FR_HIDEUPDOWN; - fr->lpstrFindWhat = findBuffer; + /* Find field is filled with the selected text if it is non-empty + * and stays within the same paragraph, otherwise the previous + * find field is used. */ + SendMessageW(hEditorWnd, EM_GETSEL, (WPARAM)&ft.chrg.cpMin, + (LPARAM)&ft.chrg.cpMax); + ft.lpstrText = &endl; + if (ft.chrg.cpMin != ft.chrg.cpMax && + SendMessageW(hEditorWnd, EM_FINDTEXTW, FR_DOWN, (LPARAM)&ft) == -1) + { + /* Use a temporary buffer for the selected text so that the saved + * find field is only overwritten when a find/replace is clicked. */ + GETTEXTEX gt = {sizeof(selBuffer), GT_SELECTION, 1200, NULL, NULL}; + SendMessageW(hEditorWnd, EM_GETTEXTEX, (WPARAM)&gt, (LPARAM)selBuffer); + fr->lpstrFindWhat = selBuffer; + } else { + fr->lpstrFindWhat = custom_data.findBuffer; + } fr->lpstrReplaceWith = replaceBuffer; custom_data.endPos = -1; custom_data.wrapped = FALSE; fr->lCustData = (LPARAM)&custom_data; - fr->wFindWhatLen = sizeof(findBuffer); + fr->wFindWhatLen = sizeof(custom_data.findBuffer); fr->wReplaceWithLen = sizeof(replaceBuffer); if(replace)

1 0

Henri Verbeet : wined3d: Consolidate surface related prototypes in wined3d_private.h.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: d6e08f8074a40f2243e9e8b830d99d8da449ba1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6e08f8074a40f2243e9e8b83… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 19 18:36:21 2010 +0200 wined3d: Consolidate surface related prototypes in wined3d_private.h. --- dlls/wined3d/wined3d_private.h | 30 ++++++++++++++---------------- 1 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index de60cf6..c46810b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1833,12 +1833,6 @@ typedef struct IWineD3DBaseTextureClass void (*internal_preload)(IWineD3DBaseTexture *iface, enum WINED3DSRGB srgb); } IWineD3DBaseTextureClass; -void surface_internal_preload(IWineD3DSurfaceImpl *surface, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; -BOOL surface_init_sysmem(IWineD3DSurfaceImpl *surface) DECLSPEC_HIDDEN; -BOOL surface_is_offscreen(IWineD3DSurfaceImpl *iface) DECLSPEC_HIDDEN; -void surface_prepare_texture(IWineD3DSurfaceImpl *surface, - const struct wined3d_gl_info *gl_info, BOOL srgb) DECLSPEC_HIDDEN; - typedef struct IWineD3DBaseTextureImpl { /* IUnknown & WineD3DResource Information */ @@ -2067,13 +2061,27 @@ struct IWineD3DSurfaceImpl extern const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl DECLSPEC_HIDDEN; extern const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl DECLSPEC_HIDDEN; +void surface_add_dirty_rect(IWineD3DSurfaceImpl *surface, const RECT *dirty_rect) DECLSPEC_HIDDEN; UINT surface_calculate_size(const struct wined3d_format_desc *format_desc, UINT alignment, UINT width, UINT height) DECLSPEC_HIDDEN; void surface_gdi_cleanup(IWineD3DSurfaceImpl *This) DECLSPEC_HIDDEN; +GLenum surface_get_gl_buffer(IWineD3DSurfaceImpl *surface) DECLSPEC_HIDDEN; HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, UINT alignment, UINT width, UINT height, UINT level, BOOL lockable, BOOL discard, WINED3DMULTISAMPLE_TYPE multisample_type, UINT multisample_quality, IWineD3DDeviceImpl *device, DWORD usage, WINED3DFORMAT format, WINED3DPOOL pool, IUnknown *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +BOOL surface_init_sysmem(IWineD3DSurfaceImpl *surface) DECLSPEC_HIDDEN; +void surface_internal_preload(IWineD3DSurfaceImpl *surface, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; +BOOL surface_is_offscreen(IWineD3DSurfaceImpl *iface) DECLSPEC_HIDDEN; +void surface_load_ds_location(IWineD3DSurfaceImpl *surface, + struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; +void surface_modify_ds_location(IWineD3DSurfaceImpl *surface, DWORD location, UINT w, UINT h) DECLSPEC_HIDDEN; +void surface_prepare_texture(IWineD3DSurfaceImpl *surface, + const struct wined3d_gl_info *gl_info, BOOL srgb) DECLSPEC_HIDDEN; +void surface_set_compatible_renderbuffer(IWineD3DSurfaceImpl *surface, + unsigned int width, unsigned int height) DECLSPEC_HIDDEN; +void surface_set_texture_name(IWineD3DSurfaceImpl *surface, GLuint name, BOOL srgb_name) DECLSPEC_HIDDEN; +void surface_set_texture_target(IWineD3DSurfaceImpl *surface, GLenum target) DECLSPEC_HIDDEN; void surface_translate_frontbuffer_coords(IWineD3DSurfaceImpl *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; /* Predeclare the shared Surface functions */ @@ -2619,16 +2627,6 @@ void state_fogstartend(DWORD state, IWineD3DStateBlockImpl *stateblock, void state_fog_fragpart(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) DECLSPEC_HIDDEN; -void surface_add_dirty_rect(IWineD3DSurfaceImpl *surface, const RECT *dirty_rect) DECLSPEC_HIDDEN; -GLenum surface_get_gl_buffer(IWineD3DSurfaceImpl *surface) DECLSPEC_HIDDEN; -void surface_load_ds_location(IWineD3DSurfaceImpl *surface, - struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; -void surface_modify_ds_location(IWineD3DSurfaceImpl *surface, DWORD location, UINT w, UINT h) DECLSPEC_HIDDEN; -void surface_set_compatible_renderbuffer(IWineD3DSurfaceImpl *surface, - unsigned int width, unsigned int height) DECLSPEC_HIDDEN; -void surface_set_texture_name(IWineD3DSurfaceImpl *surface, GLuint name, BOOL srgb_name) DECLSPEC_HIDDEN; -void surface_set_texture_target(IWineD3DSurfaceImpl *surface, GLenum target) DECLSPEC_HIDDEN; - BOOL getColorBits(const struct wined3d_format_desc *format_desc, short *redSize, short *greenSize, short *blueSize, short *alphaSize, short *totalSize) DECLSPEC_HIDDEN; BOOL getDepthStencilBits(const struct wined3d_format_desc *format_desc,

1 0

Michael Stefaniuc : cmd: Remove stray ';' from the resource files.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: dbdedefe71908d7a8618301f0bb0f8f7f607f637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbdedefe71908d7a8618301f0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 20 10:07:24 2010 +0200 cmd: Remove stray ';' from the resource files. --- programs/cmd/Cs.rc | 2 +- programs/cmd/Da.rc | 2 +- programs/cmd/De.rc | 2 +- programs/cmd/En.rc | 2 +- programs/cmd/Es.rc | 2 +- programs/cmd/Fr.rc | 2 +- programs/cmd/It.rc | 2 +- programs/cmd/Ja.rc | 2 +- programs/cmd/Ko.rc | 2 +- programs/cmd/Lt.rc | 2 +- programs/cmd/Nl.rc | 2 +- programs/cmd/No.rc | 2 +- programs/cmd/Pl.rc | 2 +- programs/cmd/Pt.rc | 4 ++-- programs/cmd/Ru.rc | 2 +- programs/cmd/Si.rc | 2 +- programs/cmd/Tr.rc | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dbdedefe71908d7a86183…

1 0

Alexandre Goujon : oleaut32/typelib: Fix ITypeInfo_Invoke with restricted keyword.
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: 14db6a802c20fa162acc54505f28cc0ea7eb33b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14db6a802c20fa162acc54505… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Sun Jul 18 12:16:16 2010 +0200 oleaut32/typelib: Fix ITypeInfo_Invoke with restricted keyword. --- dlls/oleaut32/tests/typelib.c | 88 ++++++++++++++++++++++++++++++++++++----- dlls/oleaut32/typelib.c | 7 ++- 2 files changed, 83 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 5487632..8a1fccb 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -488,32 +488,70 @@ static void test_TypeInfo(void) "ITypeInfo_GetIDsOfNames should have returned DISP_E_UNKNOWNNAME instead of 0x%08x\n", hr); - /* test invalid memberid */ - dispparams.cNamedArgs = 0; dispparams.cArgs = 0; dispparams.rgdispidNamedArgs = NULL; dispparams.rgvarg = NULL; + + /* test dispparams not NULL */ + + /* invalid member id -- wrong flags -- cNamedArgs not bigger than cArgs */ + dispparams.cNamedArgs = 0; + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, 0xdeadbeef, DISPATCH_PROPERTYGET, &dispparams, NULL, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08x\n", hr); + /* invalid member id -- correct flags -- cNamedArgs not bigger than cArgs */ hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, 0xdeadbeef, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08x\n", hr); + /* invalid member id -- wrong flags -- cNamedArgs bigger than cArgs */ + dispparams.cNamedArgs = 1; + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, 0xdeadbeef, DISPATCH_PROPERTYGET, &dispparams, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "ITypeInfo_Invoke should have returned E_INVALIDARG instead of 0x%08x\n", hr); + /* invalid member id -- correct flags -- cNamedArgs bigger than cArgs */ + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, 0xdeadbeef, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "ITypeInfo_Invoke should have returned E_INVALIDARG instead of 0x%08x\n", hr); + + hr = ITypeInfo_GetIDsOfNames(pTypeInfo, &pwszClone, 1, &dispidMember); ok_ole_success(hr, ITypeInfo_GetIDsOfNames); - /* test correct memberid, but wrong flags */ + /* correct member id -- wrong flags -- cNamedArgs not bigger than cArgs */ + dispparams.cNamedArgs = 0; hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_PROPERTYGET, &dispparams, NULL, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08x\n", hr); + /* correct member id -- correct flags -- cNamedArgs not bigger than cArgs + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok(hr == 0x8002000e, "ITypeInfo_Invoke should have returned 0x8002000e instead of 0x%08x\n", hr); */ - /* test NULL dispparams */ + /* correct member id -- wrong flags -- cNamedArgs bigger than cArgs */ + dispparams.cNamedArgs = 1; + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_PROPERTYGET, &dispparams, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "ITypeInfo_Invoke should have returned E_INVALIDARG instead of 0x%08x\n", hr); + /* correct member id -- correct flags -- cNamedArgs bigger than cArgs */ + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "ITypeInfo_Invoke should have returned E_INVALIDARG instead of 0x%08x\n", hr); + + /* test NULL dispparams */ + + /* correct member id -- wrong flags -- cNamedArgs not bigger than cArgs */ + dispparams.cNamedArgs = 0; + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_PROPERTYGET, NULL, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "ITypeInfo_Invoke should have returned E_INVALIDARG instead of 0x%08x\n", hr); + /* correct member id -- correct flags -- cNamedArgs not bigger than cArgs */ hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_METHOD, NULL, NULL, NULL, NULL); ok(hr == E_INVALIDARG, "ITypeInfo_Invoke should have returned E_INVALIDARG instead of 0x%08x\n", hr); - /* test dispparams->cNamedArgs being bigger than dispparams->cArgs */ + /* correct member id -- wrong flags -- cNamedArgs bigger than cArgs */ dispparams.cNamedArgs = 1; - hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_PROPERTYGET, NULL, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "ITypeInfo_Invoke should have returned E_INVALIDARG instead of 0x%08x\n", hr); + /* correct member id -- correct flags -- cNamedArgs bigger than cArgs */ + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_METHOD, NULL, NULL, NULL, NULL); ok(hr == E_INVALIDARG, "ITypeInfo_Invoke should have returned E_INVALIDARG instead of 0x%08x\n", hr); ITypeInfo_Release(pTypeInfo); + + hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, &IID_IDispatch, &pTypeInfo); ok_ole_success(hr, ITypeLib_GetTypeInfoOfGuid); @@ -539,11 +577,41 @@ static void test_TypeInfo(void) VariantClear(&var); } - /* test invoking a method with a [restricted] keyword */ - hr = ITypeInfo_Invoke(pTypeInfo, NULL, dispidMember, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); - todo_wine { + /* test invoking a method with a [restricted] keyword */ + + /* correct member id -- wrong flags -- cNamedArgs not bigger than cArgs */ + dispparams.cNamedArgs = 0; + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_PROPERTYGET, &dispparams, NULL, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08x\n", hr); + /* correct member id -- correct flags -- cNamedArgs not bigger than cArgs */ + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08x\n", hr); + + /* correct member id -- wrong flags -- cNamedArgs bigger than cArgs */ + dispparams.cNamedArgs = 1; + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_PROPERTYGET, &dispparams, NULL, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08x\n", hr); + /* correct member id -- correct flags -- cNamedArgs bigger than cArgs */ + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08x\n", hr); + + /* test NULL dispparams */ + + /* correct member id -- wrong flags -- cNamedArgs not bigger than cArgs */ + dispparams.cNamedArgs = 0; + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_PROPERTYGET, NULL, NULL, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08x\n", hr); + /* correct member id -- correct flags -- cNamedArgs not bigger than cArgs */ + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_METHOD, NULL, NULL, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08x\n", hr); + + /* correct member id -- wrong flags -- cNamedArgs bigger than cArgs */ + dispparams.cNamedArgs = 1; + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_PROPERTYGET, NULL, NULL, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08x\n", hr); + /* correct member id -- correct flags -- cNamedArgs bigger than cArgs */ + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_METHOD, NULL, NULL, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08x\n", hr); - } ITypeInfo_Release(pTypeInfo); ITypeLib_Release(pTypeLib); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b310a4b..7fac039 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6017,12 +6017,15 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( unsigned int var_index; TYPEKIND type_kind; HRESULT hres; - const TLBFuncDesc *pFuncInfo; + const TLBFuncDesc *pFuncInfo = This->funclist; TRACE("(%p)(%p,id=%d,flags=0x%08x,%p,%p,%p,%p)\n", This,pIUnk,memid,wFlags,pDispParams,pVarResult,pExcepInfo,pArgErr ); + if( pFuncInfo->funcdesc.wFuncFlags == FUNCFLAG_FRESTRICTED ) + return DISP_E_MEMBERNOTFOUND; + if (!pDispParams) { ERR("NULL pDispParams not allowed\n"); @@ -6491,7 +6494,7 @@ func_fail: WARN("Could not search inherited interface!\n"); } } - ERR("did not find member id %d, flags 0x%x!\n", memid, wFlags); + WARN("did not find member id %d, flags 0x%x!\n", memid, wFlags); return DISP_E_MEMBERNOTFOUND; }

1 0