November 2006 - Wine-commits

Mike McCormack : msi: Use MSI_QueryGetRecord in ACTION_AppSearchDr.
by Alexandre Julliard 28 Nov '06

28 Nov '06

Module: wine Branch: master Commit: a0d0453501d8ebba5e6b8a7caba374accd8dcc1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0d0453501d8ebba5e6b8a7ca… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Nov 28 17:46:05 2006 +0900 msi: Use MSI_QueryGetRecord in ACTION_AppSearchDr. --- dlls/msi/appsearch.c | 123 +++++++++++++++++++++---------------------------- 1 files changed, 53 insertions(+), 70 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 8f1e388..5c83fcc 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -775,87 +775,70 @@ static UINT ACTION_SearchDirectory(MSIPA static UINT ACTION_AppSearchSigName(MSIPACKAGE *package, LPCWSTR sigName, MSISIGNATURE *sig, LPWSTR *appValue); -static UINT ACTION_AppSearchDr(MSIPACKAGE *package, LPWSTR *appValue, - MSISIGNATURE *sig) +static UINT ACTION_AppSearchDr(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATURE *sig) { - MSIQUERY *view; + static const WCHAR query[] = { + 's','e','l','e','c','t',' ','*',' ', + 'f','r','o','m',' ', + 'D','r','L','o','c','a','t','o','r',' ', + 'w','h','e','r','e',' ', + 'S','i','g','n','a','t','u','r','e','_',' ','=',' ', '\'','%','s','\'',0}; + LPWSTR parentName = NULL, path = NULL, parent = NULL; + WCHAR expanded[MAX_PATH]; + MSIRECORD *row; + int depth; UINT rc; - static const WCHAR ExecSeqQuery[] = { - 's','e','l','e','c','t',' ','*',' ', - 'f','r','o','m',' ', - 'D','r','L','o','c','a','t','o','r',' ', - 'w','h','e','r','e',' ','S','i','g','n','a','t','u','r','e','_',' ','=',' ', - '\'','%','s','\'',0}; - TRACE("(package %p, sig %p)\n", package, sig); - rc = MSI_OpenQuery(package->db, &view, ExecSeqQuery, sig->Name); - if (rc == ERROR_SUCCESS) - { - MSIRECORD *row = 0; - WCHAR expanded[MAX_PATH]; - LPWSTR parentName = NULL, path = NULL, parent = NULL; - int depth; + TRACE("%s\n", debugstr_w(sig->Name)); - rc = MSI_ViewExecute(view, 0); - if (rc != ERROR_SUCCESS) - { - TRACE("MSI_ViewExecute returned %d\n", rc); - goto end; - } - rc = MSI_ViewFetch(view,&row); - if (rc != ERROR_SUCCESS) - { - TRACE("MSI_ViewFetch returned %d\n", rc); - rc = ERROR_SUCCESS; - goto end; - } + *appValue = NULL; - /* check whether parent is set */ - parentName = msi_dup_record_field(row,2); - if (parentName) - { - MSISIGNATURE parentSig; + row = MSI_QueryGetRecord( package->db, query, sig->Name ); + if (!row) + { + TRACE("failed to query DrLocator for %s\n", debugstr_w(sig->Name)); + return ERROR_SUCCESS; + } - rc = ACTION_AppSearchSigName(package, parentName, &parentSig, - &parent); - ACTION_FreeSignature(&parentSig); - msi_free(parentName); - } - /* now look for path */ - path = msi_dup_record_field(row,3); - if (MSI_RecordIsNull(row,4)) - depth = 0; - else - depth = MSI_RecordGetInteger(row,4); - ACTION_ExpandAnyPath(package, path, expanded, - sizeof(expanded) / sizeof(expanded[0])); - msi_free(path); - if (parent) - { - path = msi_alloc((strlenW(parent) + strlenW(expanded) + 1) * sizeof(WCHAR)); - if (!path) - goto end; - strcpyW(path, parent); - strcatW(path, expanded); - } - else - path = expanded; - rc = ACTION_SearchDirectory(package, sig, path, depth, appValue); + /* check whether parent is set */ + parentName = msi_dup_record_field(row,2); + if (parentName) + { + MSISIGNATURE parentSig; -end: - if (path != expanded) - msi_free(path); - msi_free(parent); - if (row) - msiobj_release(&row->hdr); - MSI_ViewClose(view); - msiobj_release(&view->hdr); + rc = ACTION_AppSearchSigName(package, parentName, &parentSig, &parent); + ACTION_FreeSignature(&parentSig); + msi_free(parentName); } + /* now look for path */ + path = msi_dup_record_field(row,3); + if (MSI_RecordIsNull(row,4)) + depth = 0; else + depth = MSI_RecordGetInteger(row,4); + ACTION_ExpandAnyPath(package, path, expanded, MAX_PATH); + msi_free(path); + if (parent) { - TRACE("MSI_OpenQuery returned %d\n", rc); - rc = ERROR_SUCCESS; + path = msi_alloc((strlenW(parent) + strlenW(expanded) + 1) * sizeof(WCHAR)); + if (!path) + { + rc = ERROR_OUTOFMEMORY; + goto end; + } + strcpyW(path, parent); + strcatW(path, expanded); } + else + path = expanded; + + rc = ACTION_SearchDirectory(package, sig, path, depth, appValue); + +end: + if (path != expanded) + msi_free(path); + msi_free(parent); + msiobj_release(&row->hdr); TRACE("returning %d\n", rc); return rc;

1 0

Matt Finnicum : riched20: Make EM_SETCHARFORMAT call ME_RewrapRepaint instead of ME_UpdateRepaint.
by Alexandre Julliard 28 Nov '06

28 Nov '06

Module: wine Branch: master Commit: d7aa81bdfb04f670498c5b87be9950bebe434cde URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7aa81bdfb04f670498c5b87b… Author: Matt Finnicum <mattfinn(a)gmail.com> Date: Tue Nov 28 02:50:25 2006 -0600 riched20: Make EM_SETCHARFORMAT call ME_RewrapRepaint instead of ME_UpdateRepaint. --- dlls/riched20/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 7afcb38..70da285 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1747,7 +1747,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND } ME_CommitUndo(editor); if (bRepaint) - ME_UpdateRepaint(editor); + ME_RewrapRepaint(editor); return 0; } case EM_GETCHARFORMAT:

1 0

Matt Finnicum : riched20: Make EM_SETPARAFORMAT use ME_RewrapRepaint instead of ME_UpdateRepaint.
by Alexandre Julliard 28 Nov '06

28 Nov '06

Module: wine Branch: master Commit: e864f2f2c30d0c5a09bc9e6c20003a0ed4199e8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e864f2f2c30d0c5a09bc9e6c2… Author: Matt Finnicum <mattfinn(a)gmail.com> Date: Tue Nov 28 02:51:56 2006 -0600 riched20: Make EM_SETPARAFORMAT use ME_RewrapRepaint instead of ME_UpdateRepaint. --- dlls/riched20/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 70da285..a8fadc1 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1768,7 +1768,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND } case EM_SETPARAFORMAT: ME_SetSelectionParaFormat(editor, (PARAFORMAT2 *)lParam); - ME_UpdateRepaint(editor); + ME_RewrapRepaint(editor); ME_CommitUndo(editor); return 0; case EM_GETPARAFORMAT:

1 0

Matt Finnicum : riched20: Make WM_SETFONT call RewrapRepaint instead of UpdateRepaint.
by Alexandre Julliard 28 Nov '06

28 Nov '06

Module: wine Branch: master Commit: 26ba1559b027a88623c53de58935ec5002fde49b URL: http://source.winehq.org/git/wine.git/?a=commit;h=26ba1559b027a88623c53de58… Author: Matt Finnicum <mattfinn(a)gmail.com> Date: Tue Nov 28 01:35:58 2006 -0600 riched20: Make WM_SETFONT call RewrapRepaint instead of UpdateRepaint. --- dlls/riched20/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 0b89b99..7afcb38 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1881,7 +1881,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND ME_CommitUndo(editor); if (bRepaint) - ME_UpdateRepaint(editor); + ME_RewrapRepaint(editor); return 0; } case WM_SETTEXT:

1 0

Matt Finnicum : riched20: EM_EXLIMITTEXT: ignore wParam and properly cast lParam.
by Alexandre Julliard 28 Nov '06

28 Nov '06

Module: wine Branch: master Commit: 3e2743600356e08682f74df4fa67495b0a6eb29a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e2743600356e08682f74df4f… Author: Matt Finnicum <mattfinn(a)gmail.com> Date: Mon Nov 27 23:56:25 2006 -0600 riched20: EM_EXLIMITTEXT: ignore wParam and properly cast lParam. --- dlls/riched20/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index bb690b0..0b89b99 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2196,7 +2196,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND } case EM_EXLIMITTEXT: { - if (wParam != 0 || lParam < 0) + if ((int)lParam < 0) return 0; if (lParam == 0) editor->nTextLimit = 65536;

1 0

Matt Finnicum : riched20: Make ME_StreamIn create undos properly.
by Alexandre Julliard 28 Nov '06

28 Nov '06

Module: wine Branch: master Commit: 807546ee59512f91f03b88486a841b0c3ac3eb29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=807546ee59512f91f03b88486… Author: Matt Finnicum <mattfinn(a)gmail.com> Date: Mon Nov 27 23:35:50 2006 -0600 riched20: Make ME_StreamIn create undos properly. --- dlls/riched20/editor.c | 20 ++++++++++---------- dlls/riched20/tests/editor.c | 2 -- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 779a6bc..bb690b0 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -597,7 +597,7 @@ static LRESULT ME_StreamIn(ME_TextEditor { RTF_Info parser; ME_Style *style; - int from, to, to2, nUndoMode; + int from, to, to2; ME_UndoItem *pUI; int nEventMask = editor->nEventMask; ME_InStream inStream; @@ -621,9 +621,6 @@ static LRESULT ME_StreamIn(ME_TextEditor /* FIXME restore default paragraph formatting ! */ } - nUndoMode = editor->nUndoMode; - editor->nUndoMode = umIgnore; - inStream.editstream = stream; inStream.editstream->dwError = 0; inStream.dwSize = 0; @@ -675,16 +672,19 @@ static LRESULT ME_StreamIn(ME_TextEditor SendMessageA(editor->hWnd, EM_SETSEL, 0, 0); } - editor->nUndoMode = nUndoMode; if (format & SFF_SELECTION) { - pUI = ME_AddUndoItem(editor, diUndoDeleteRun, NULL); - TRACE("from %d to %d\n", from, to); - if (pUI && from < to) + if(from < to) /* selection overwritten is non-empty */ { - pUI->nStart = from; - pUI->nLen = to-from; + pUI = ME_AddUndoItem(editor, diUndoDeleteRun, NULL); + TRACE("from %d to %d\n", from, to); + if (pUI) + { + pUI->nStart = from; + pUI->nLen = to-from; + } } + /* even if we didn't add an undo, we need to commit the ones added earlier */ ME_CommitUndo(editor); } else diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 1625481..da6390f 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1308,10 +1308,8 @@ static void test_EM_GETMODIFY(void) SendMessage(hwndRichEdit, EM_STREAMIN, (WPARAM)(SF_TEXT), (LPARAM)&es); result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); - todo_wine { ok (result != 0, "EM_GETMODIFY returned zero, instead of non-zero for EM_STREAM\n"); - } DestroyWindow(hwndRichEdit); }

1 0

Frank Richter : winecfg: Update German translation.
by Alexandre Julliard 28 Nov '06

28 Nov '06

Module: wine Branch: master Commit: 7c8fdd67e4087afe3f2b131d9e763ed9da1cf70c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c8fdd67e4087afe3f2b131d9… Author: Frank Richter <frank.richter(a)gmail.com> Date: Mon Nov 27 20:14:39 2006 +0100 winecfg: Update German translation. --- programs/winecfg/De.rc | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 deletions(-) diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index 2bcf915..8fc55ca 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -185,14 +185,14 @@ BEGIN COMBOBOX IDC_THEME_COLORCOMBO,15,48,112,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Gr��e:",IDC_THEME_SIZETEXT,135,40,110,8 COMBOBOX IDC_THEME_SIZECOMBO,135,48,110,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Item:",IDC_STATIC,15,64,112,8 + LTEXT "Element:",IDC_STATIC,15,64,112,8 COMBOBOX IDC_SYSPARAM_COMBO,15,74,112,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Color:",IDC_SYSPARAM_COLOR_TEXT,135,64,25,8,WS_DISABLED + LTEXT "Farbe:",IDC_SYSPARAM_COLOR_TEXT,135,64,25,8,WS_DISABLED PUSHBUTTON "",IDC_SYSPARAM_COLOR,135,74,25,13,WS_DISABLED | BS_OWNERDRAW - LTEXT "Size:",IDC_SYSPARAM_SIZE_TEXT,166,64,30,8,WS_DISABLED + LTEXT "Gr��e:",IDC_SYSPARAM_SIZE_TEXT,166,64,30,8,WS_DISABLED EDITTEXT IDC_SYSPARAM_SIZE,166,74,23,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED CONTROL "",IDC_SYSPARAM_SIZE_UD,UPDOWN_CLASS,UDS_SETBUDDYINT | WS_DISABLED,187,74,15,13 - PUSHBUTTON "Font",IDC_SYSPARAM_FONT,208,74,37,13,WS_DISABLED + PUSHBUTTON "Schrift",IDC_SYSPARAM_FONT,208,74,37,13,WS_DISABLED GROUPBOX " Shell-Ordner ",IDC_STATIC,8,114,244,100 CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 @@ -286,3 +286,23 @@ BEGIN IDS_UNAVAILABLE_DRIVER "In der Registry wurde ein Treiber gefunden, der nicht verf�gbar ist!\n\nSoll �%s� aus der Registry entfernt werden?" IDS_WARNING "Warnung" END + +STRINGTABLE DISCARDABLE +BEGIN + IDC_SYSPARAMS_BUTTON "Steuerelementhintergrund" + IDC_SYSPARAMS_BUTTON_TEXT "Steuerelementtext" + IDC_SYSPARAMS_DESKTOP "Desktop" + IDC_SYSPARAMS_MENU "Men�hintergrund" + IDC_SYSPARAMS_MENU_TEXT "Men�text" + IDC_SYSPARAMS_SCROLLBAR "Bildlaufleiste" + IDC_SYSPARAMS_SELECTION "Auswahlhintergrund" + IDC_SYSPARAMS_SELECTION_TEXT "Auswahltext" + IDC_SYSPARAMS_TOOLTIP "ToolTip-Hintergrund" + IDC_SYSPARAMS_TOOLTIP_TEXT "ToolTip-Text" + IDC_SYSPARAMS_WINDOW "Fensterhintergrund" + IDC_SYSPARAMS_WINDOW_TEXT "Fenstertext" + IDC_SYSPARAMS_ACTIVE_TITLE "Aktive Titelleiste" + IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "Aktiver Titelleistentext" + IDC_SYSPARAMS_INACTIVE_TITLE "Inaktive Titelleiste" + IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Inaktiver Titelleistentext" +END

1 0

Kai Blin : ws2_32: Add WS_SIO_ADDRESS_LIST_QUERY stub to make native dplay error output more readable .
by Alexandre Julliard 28 Nov '06

28 Nov '06

Module: wine Branch: master Commit: 453414588964ba3fb5a1682741cb5c98d5eab3b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=453414588964ba3fb5a168274… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Nov 27 20:09:46 2006 +0100 ws2_32: Add WS_SIO_ADDRESS_LIST_QUERY stub to make native dplay error output more readable. --- dlls/ws2_32/socket.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 8113ab7..e5aeed5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2212,6 +2212,10 @@ INT WINAPI WSAIoctl(SOCKET s, * with WSA_FLAG_OVERLAPPED, but there is no easy way to get this */ break; + case WS_SIO_ADDRESS_LIST_QUERY: + FIXME("-> SIO_ADDRESS_LIST_QUERY request: stub\n"); + break; + case WS_SIO_FLUSH: FIXME("SIO_FLUSH: stub.\n"); break;

1 0

Francois Gouget : mshtml: Add missing '\n' in Wine trace.
by Alexandre Julliard 28 Nov '06

28 Nov '06

Module: wine Branch: master Commit: 6af5ae8027fa81be88f37649c804e7da4fb9daf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6af5ae8027fa81be88f37649c… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 27 19:20:14 2006 +0100 mshtml: Add missing '\n' in Wine trace. --- dlls/mshtml/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 64c5daf..011fe4d 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -140,7 +140,7 @@ void get_font_size(HTMLDocument *This, W nsAString size_str, val_str; LPCWSTR val; - TRACE("found font tag %p", elem); + TRACE("found font tag %p\n", elem); nsAString_Init(&size_str, wszSize); nsAString_Init(&val_str, NULL);

1 0

Francois Gouget : cmdlgtst: Add a Portuguese translation ( contributed by Americo Jose Melo).
by Alexandre Julliard 28 Nov '06

28 Nov '06

Module: wine Branch: master Commit: 024e8040444bbc4af60be7862240cac79cb7af16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=024e8040444bbc4af60be7862… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 27 19:21:20 2006 +0100 cmdlgtst: Add a Portuguese translation (contributed by Americo Jose Melo). --- programs/cmdlgtst/Pt.rc | 121 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 114 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=024e8040444bbc4af60be…

1 0