March 2006 - Wine-commits - list.winehq.org

Huw Davies : user32: Only adjust the margins if the edit control is above a certain size.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: c4b44245fbb188218fedba2ad3e33ee2f4086338 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c4b44245fbb188218fedba2… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 22 12:16:44 2006 +0000 user32: Only adjust the margins if the edit control is above a certain size. --- dlls/user/edit.c | 35 ++++++++++++++-- dlls/user/tests/edit.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 130 insertions(+), 8 deletions(-) diff --git a/dlls/user/edit.c b/dlls/user/edit.c index 98cf736..ed013af 100644 --- a/dlls/user/edit.c +++ b/dlls/user/edit.c @@ -246,7 +246,7 @@ static void EDIT_EM_ScrollCaret(EDITSTAT static void EDIT_EM_SetHandle(EDITSTATE *es, HLOCAL hloc); static void EDIT_EM_SetHandle16(EDITSTATE *es, HLOCAL16 hloc); static void EDIT_EM_SetLimitText(EDITSTATE *es, INT limit); -static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, INT left, INT right, BOOL repaint); +static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, WORD left, WORD right, BOOL repaint); static void EDIT_EM_SetPasswordChar(EDITSTATE *es, WCHAR c); static void EDIT_EM_SetSel(EDITSTATE *es, UINT start, UINT end, BOOL after_wrap); static BOOL EDIT_EM_SetTabStops(EDITSTATE *es, INT count, LPINT tabs); @@ -747,7 +747,7 @@ static LRESULT WINAPI EditWndProc_common /* The following EM_xxx are new to win95 and don't exist for 16 bit */ case EM_SETMARGINS: - EDIT_EM_SetMargins(es, (INT)wParam, (short)LOWORD(lParam), (short)HIWORD(lParam), TRUE); + EDIT_EM_SetMargins(es, (INT)wParam, LOWORD(lParam), HIWORD(lParam), TRUE); break; case EM_GETMARGINS: @@ -2326,7 +2326,7 @@ static void EDIT_SetCaretPos(EDITSTATE * static void EDIT_AdjustFormatRect(EDITSTATE *es) { RECT ClientRect; - + es->format_rect.right = max(es->format_rect.right, es->format_rect.left + es->char_width); if (es->style & ES_MULTILINE) { @@ -3660,9 +3660,24 @@ static void EDIT_EM_SetLimitText(EDITSTA * of the char's width as the margin, but this is not how Windows handles this. * For all other fonts Windows sets the margins to zero. * + * FIXME - When EC_USEFONTINFO is used the margins only change if the + * edit control is equal to or larger than a certain size. + * Interestingly if one subtracts both the left and right margins from + * this size one always seems to get an even number. The extents of + * the (four character) string "'**'" match this quite closely, so + * we'll use this until we come up with a better idea. */ +static int calc_min_set_margin_size(HDC dc, INT left, INT right) +{ + WCHAR magic_string[] = {'\'','*','*','\'', 0}; + SIZE sz; + + GetTextExtentPointW(dc, magic_string, sizeof(magic_string)/sizeof(WCHAR) - 1, &sz); + return sz.cx + left + right; +} + static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, - INT left, INT right, BOOL repaint) + WORD left, WORD right, BOOL repaint) { TEXTMETRICW tm; INT default_left_margin = 0; /* in pixels */ @@ -3675,9 +3690,17 @@ static void EDIT_EM_SetMargins(EDITSTATE GetTextMetricsW(dc, &tm); /* The default margins are only non zero for TrueType or Vector fonts */ if (tm.tmPitchAndFamily & ( TMPF_VECTOR | TMPF_TRUETYPE )) { + int min_size; + RECT rc; /* This must be calculated more exactly! But how? */ - default_left_margin = tm.tmAveCharWidth / 3; - default_right_margin = tm.tmAveCharWidth / 3; + default_left_margin = tm.tmAveCharWidth / 2; + default_right_margin = tm.tmAveCharWidth / 2; + min_size = calc_min_set_margin_size(dc, default_left_margin, default_right_margin); + GetClientRect(es->hwndSelf, &rc); + if(rc.right - rc.left < min_size) { + default_left_margin = es->left_margin; + default_right_margin = es->right_margin; + } } SelectObject(dc, old_font); ReleaseDC(es->hwndSelf, dc); diff --git a/dlls/user/tests/edit.c b/dlls/user/tests/edit.c index 1a830c2..e880ea2 100644 --- a/dlls/user/tests/edit.c +++ b/dlls/user/tests/edit.c @@ -760,10 +760,108 @@ static void test_margins(void) ok(new_rect.right == old_rect.right, "The right border of the rectangle has changed\n"); ok(new_rect.top == old_rect.top, "The top border of the rectangle has changed\n"); ok(new_rect.bottom == old_rect.bottom, "The bottom border of the rectangle has changed\n"); - + DestroyWindow (hwEdit); } +static INT CALLBACK find_font_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +{ + return 0; +} + +static void test_margins_font_change(void) +{ + HWND hwEdit; + DWORD margins, font_margins; + LOGFONT lf; + HFONT hfont, hfont2; + HDC hdc = GetDC(0); + + if(EnumFontFamiliesA(hdc, "Arial", find_font_proc, 0)) + { + trace("Arial not found - skipping font change margin tests\n"); + ReleaseDC(0, hdc); + return; + } + ReleaseDC(0, hdc); + + hwEdit = create_child_editcontrol(0, 0); + + SetWindowPos(hwEdit, NULL, 10, 10, 1000, 100, SWP_NOZORDER | SWP_NOACTIVATE); + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Arial"); + lf.lfHeight = 16; + lf.lfCharSet = DEFAULT_CHARSET; + hfont = CreateFontIndirectA(&lf); + lf.lfHeight = 30; + hfont2 = CreateFontIndirectA(&lf); + + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + font_margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(font_margins) != 0, "got %d\n", LOWORD(font_margins)); + ok(HIWORD(font_margins) != 0, "got %d\n", HIWORD(font_margins)); + + /* With 'small' edit controls, test that the margin doesn't get set */ + SetWindowPos(hwEdit, NULL, 10, 10, 16, 100, SWP_NOZORDER | SWP_NOACTIVATE); + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(0,0)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == 0, "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 0, "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,0)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 0, "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,1)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 1, "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO,EC_USEFONTINFO)); + margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 1, "got %d\n", HIWORD(margins)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont2, 0); + margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 1, "got %d\n", HIWORD(margins)); + + /* Above a certain size threshold then the margin is updated */ + SetWindowPos(hwEdit, NULL, 10, 10, 1000, 100, SWP_NOZORDER | SWP_NOACTIVATE); + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,0)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == LOWORD(font_margins), "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == HIWORD(font_margins), "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,1)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == LOWORD(font_margins), "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == HIWORD(font_margins), "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO,EC_USEFONTINFO)); + margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == LOWORD(font_margins), "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == HIWORD(font_margins), "got %d\n", HIWORD(margins)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont2, 0); + margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) != LOWORD(font_margins), "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) != HIWORD(font_margins), "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, WM_SETFONT, 0, 0); + + DeleteObject(hfont2); + DeleteObject(hfont); + destroy_child_editcontrol(hwEdit); + +} + #define edit_pos_ok(exp, got, txt) \ ok(exp == got, "wrong " #txt " expected %d got %ld\n", exp, got); @@ -968,7 +1066,8 @@ START_TEST(edit) test_edit_control_4(); test_edit_control_5(); test_margins(); + test_margins_font_change(); test_text_position(); - + UnregisterWindowClasses(); }

1 0

Jacek Caban : mshtml: Clean up get_all and tags (also fixes a typo).
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: b88b981dcbb0b220ef1686a3acde2658c995c7fd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b88b981dcbb0b220ef1686a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 22 17:14:42 2006 +0100 mshtml: Clean up get_all and tags (also fixes a typo). --- dlls/mshtml/htmlelem.c | 80 +++++++++++++++++++++++++----------------------- 1 files changed, 41 insertions(+), 39 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 41dec13..40d1d36 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -38,6 +38,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static HRESULT HTMLElementCollection_Create(IUnknown*,HTMLElement**,DWORD,IDispatch**); +typedef struct { + HTMLElement **buf; + DWORD len; + DWORD size; +} elem_vector; + +static void elem_vector_add(elem_vector *buf, HTMLElement *elem) +{ + if(buf->len == buf->size) { + buf->size <<= 1; + buf->buf = HeapReAlloc(GetProcessHeap(), 0, buf->buf, buf->size*sizeof(HTMLElement**)); + } + + buf->buf[buf->len++] = elem; +} + #define HTMLELEM_THIS(iface) DEFINE_THIS(HTMLElement, HTMLElement, iface) static HRESULT WINAPI HTMLElement_QueryInterface(IHTMLElement *iface, @@ -747,8 +763,7 @@ static HRESULT WINAPI HTMLElement_get_ch return E_NOTIMPL; } -static void create_all_list(HTMLDocument *doc, HTMLElement *elem, HTMLElement ***list, DWORD *size, - DWORD *len) +static void create_all_list(HTMLDocument *doc, HTMLElement *elem, elem_vector *buf) { nsIDOMNodeList *nsnode_list; nsIDOMNode *iter; @@ -777,37 +792,30 @@ static void create_all_list(HTMLDocument if(node->node_type != NT_HTMLELEM) continue; - if(*len == *size) { - *size <<= 1; - *list = HeapReAlloc(GetProcessHeap(), 0, *list, *size * sizeof(HTMLElement**)); - } - - (*list)[(*len)++] = (HTMLElement*)node->impl.elem; - - create_all_list(doc, (HTMLElement*)node->impl.elem, list, size, len); + elem_vector_add(buf, (HTMLElement*)node->impl.elem); + create_all_list(doc, (HTMLElement*)node->impl.elem, buf); } } static HRESULT WINAPI HTMLElement_get_all(IHTMLElement *iface, IDispatch **p) { HTMLElement *This = HTMLELEM_THIS(iface); - HTMLElement **elem_list; - DWORD list_size = 8, len = 0; + elem_vector buf = {NULL, 0, 8}; TRACE("(%p)->(%p)\n", This, p); - elem_list = HeapAlloc(GetProcessHeap(), 0, list_size*sizeof(HTMLElement**)); + buf.buf = HeapAlloc(GetProcessHeap(), 0, buf.size*sizeof(HTMLElement**)); - create_all_list(This->node->doc, This, &elem_list, &list_size, &len); + create_all_list(This->node->doc, This, &buf); - if(!len) { - HeapFree(GetProcessHeap(), 0, elem_list); - elem_list = NULL; - }else if(list_size > len) { - elem_list = HeapReAlloc(GetProcessHeap(), 0, elem_list, len*sizeof(HTMLElement**)); + if(!buf.len) { + HeapFree(GetProcessHeap(), 0, buf.buf); + buf.buf = NULL; + }else if(buf.size > buf.len) { + buf.buf = HeapReAlloc(GetProcessHeap(), 0, buf.buf, buf.len*sizeof(HTMLElement**)); } - return HTMLElementCollection_Create((IUnknown*)HTMLELEM(This), elem_list, len, p); + return HTMLElementCollection_Create((IUnknown*)HTMLELEM(This), buf.buf, buf.len, p); } static void HTMLElement_destructor(IUnknown *iface) @@ -1152,19 +1160,19 @@ static HRESULT WINAPI HTMLElementCollect VARIANT tagName, IDispatch **pdisp) { HTMLElementCollection *This = ELEMCOL_THIS(iface); - DWORD size = 8, len = 0, i; - HTMLElement **elem_list; + DWORD i; nsAString tag_str; const PRUnichar *tag; + elem_vector buf = {NULL, 0, 8}; if(V_VT(&tagName) != VT_BSTR) { WARN("Invalid arg\n"); - return E_INVALIDARG; + return DISP_E_MEMBERNOTFOUND; } TRACE("(%p)->(%s %p)\n", This, debugstr_w(V_BSTR(&tagName)), pdisp); - elem_list = HeapAlloc(GetProcessHeap(), 0, size*sizeof(HTMLElement*)); + buf.buf = HeapAlloc(GetProcessHeap(), 0, buf.size*sizeof(HTMLElement*)); nsAString_Init(&tag_str, NULL); @@ -1176,28 +1184,22 @@ static HRESULT WINAPI HTMLElementCollect nsAString_GetData(&tag_str, &tag, NULL); if(CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, tag, -1, - V_BSTR(&tagName), -1) == CSTR_EQUAL) { - if(len == size) { - size <<= 2; - elem_list = HeapReAlloc(GetProcessHeap(), 0, elem_list, size); - } - - elem_list[len++] = This->elems[i]; - } + V_BSTR(&tagName), -1) == CSTR_EQUAL) + elem_vector_add(&buf, This->elems[i]); } nsAString_Finish(&tag_str); - TRACE("fount %ld tags\n", len); + TRACE("fount %ld tags\n", buf.len); - if(!len) { - HeapFree(GetProcessHeap(), 0, elem_list); - elem_list = NULL; - }else if(size > len) { - HeapReAlloc(GetProcessHeap(), 0, elem_list, len); + if(!buf.len) { + HeapFree(GetProcessHeap(), 0, buf.buf); + buf.buf = NULL; + }else if(buf.size > buf.len) { + buf.buf = HeapReAlloc(GetProcessHeap(), 0, buf.buf, buf.len); } - return HTMLElementCollection_Create(This->ref_unk, elem_list, len, pdisp); + return HTMLElementCollection_Create(This->ref_unk, buf.buf, buf.len, pdisp); } #undef ELEMCOL_THIS

1 0

James Hawkins : advpack: Forward RebootCheckOnInstallA to its Unicode counterpart.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: 15a2169ec0f0bbac515a2ff47db4bbf6681a96b7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=15a2169ec0f0bbac515a2ff… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Mar 22 14:08:37 2006 -0600 advpack: Forward RebootCheckOnInstallA to its Unicode counterpart. --- dlls/advpack/advpack.c | 35 ++++++++++++++++++++++++++++++++--- dlls/advpack/advpack.spec | 2 +- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 460f72d..b4f3caf 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -324,6 +324,34 @@ HRESULT WINAPI OpenINFEngineW(LPCWSTR ps /*********************************************************************** * RebootCheckOnInstallA (ADVPACK.@) * + * See RebootCheckOnInstallW. + */ +HRESULT WINAPI RebootCheckOnInstallA(HWND hWnd, LPCSTR pszINF, + LPSTR pszSec, DWORD dwReserved) +{ + UNICODE_STRING infW, secW; + HRESULT res; + + TRACE("(%p, %s, %s, %ld)\n", hWnd, debugstr_a(pszINF), + debugstr_a(pszSec), dwReserved); + + if (!pszINF || !pszSec) + return E_INVALIDARG; + + RtlCreateUnicodeStringFromAsciiz(&infW, pszINF); + RtlCreateUnicodeStringFromAsciiz(&secW, pszSec); + + res = RebootCheckOnInstallW(hWnd, infW.Buffer, secW.Buffer, dwReserved); + + RtlFreeUnicodeString(&infW); + RtlFreeUnicodeString(&secW); + + return res; +} + +/*********************************************************************** + * RebootCheckOnInstallW (ADVPACK.@) + * * Checks if a reboot is required for an installed INF section. * * PARAMS @@ -344,10 +372,11 @@ HRESULT WINAPI OpenINFEngineW(LPCWSTR ps * BUGS * Unimplemented. */ -HRESULT WINAPI RebootCheckOnInstallA(HWND hWnd, LPCSTR pszINF, - LPSTR pszSec, DWORD dwReserved) +HRESULT WINAPI RebootCheckOnInstallW(HWND hWnd, LPCWSTR pszINF, + LPWSTR pszSec, DWORD dwReserved) { - FIXME("(%p, %p, %p, %ld) stub\n", hWnd, pszINF, pszSec, dwReserved); + FIXME("(%p, %s, %s, %ld) stub\n", hWnd, debugstr_w(pszINF), + debugstr_w(pszSec), dwReserved); return E_FAIL; } diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 7ddd412..ae1d5b2 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -47,7 +47,7 @@ @ stdcall OpenINFEngineW(wstr wstr long ptr ptr) @ stdcall OpenINFEngine(str str long ptr ptr) OpenINFEngineA @ stdcall RebootCheckOnInstallA(long str str long) -# stdcall RebootCheckOnInstallW(long wstr wstr long) +@ stdcall RebootCheckOnInstallW(long wstr wstr long) @ stdcall RebootCheckOnInstall(long str str long) RebootCheckOnInstallA @ stdcall RegInstallA(ptr str ptr) # stdcall RegInstallW(ptr wstr ptr)

1 0

Alexandre Julliard : server: New scheme for cleaning up objects on server exit.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: b00fb174f6b8ae8940f37c1229040a3cca84de74 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b00fb174f6b8ae8940f37c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 22 20:32:04 2006 +0100 server: New scheme for cleaning up objects on server exit. Objects stored in static variables can now be marked when they are created and are automatically cleaned up on exit. This avoids having to export a bunch of close_* functions. --- server/directory.c | 35 +++++++++++------------------------ server/handle.c | 11 +---------- server/handle.h | 2 -- server/mailslot.c | 4 ++-- server/named_pipe.c | 5 ++--- server/object.c | 36 +++++++++++++++++++++++++++++++++++- server/object.h | 11 ++++------- server/registry.c | 19 ++++--------------- server/request.c | 15 +++------------ server/signal.c | 14 ++------------ 10 files changed, 64 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b00fb174f6b8ae8940f…

1 0

Mike McCormack : msi: Don't crash when logging a record with only one field .
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: e1fdf3e24c977f71b83a43650bcc57d6c7be089d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e1fdf3e24c977f71b83a436… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 22 21:39:36 2006 +0900 msi: Don't crash when logging a record with only one field. --- dlls/msi/package.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index eb486ac..24a23d6 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -615,26 +615,27 @@ INT MSI_ProcessMessage( MSIPACKAGE *pack if ((eMessageType & 0xff000000) == INSTALLMESSAGE_ACTIONSTART) { static const WCHAR template_s[]= - {'A','c','t','i','o','n',' ','%','s',':',' ','%','s','.',' ', '%','s', - '.',0}; + {'A','c','t','i','o','n',' ','%','s',':',' ','%','s','.',' ',0}; static const WCHAR format[] = {'H','H','\'',':','\'','m','m','\'',':','\'','s','s',0}; WCHAR timet[0x100]; - LPCWSTR action_text; - LPCWSTR action; - LPWSTR deformated; + LPCWSTR action_text, action; + LPWSTR deformatted = NULL; GetTimeFormatW(LOCALE_USER_DEFAULT, 0, NULL, format, timet, 0x100); action = MSI_RecordGetString(record, 1); action_text = MSI_RecordGetString(record, 2); - deformat_string(package, action_text, &deformated); + deformat_string(package, action_text, &deformatted); - len = strlenW(timet) + strlenW(action) + strlenW(deformated) + - strlenW(template_s) - 6 /* 6 characters of format specifier */; - message = msi_alloc((len + 1)*sizeof(WCHAR)); - sprintfW(message,template_s,timet,action,deformated); - msi_free(deformated); + len = strlenW(timet) + strlenW(action) + strlenW(template_s); + if (deformatted) + len += strlenW(deformatted); + message = msi_alloc(len*sizeof(WCHAR)); + sprintfW(message, template_s, timet, action); + if (deformatted) + strcatW(message, deformatted); + msi_free(deformatted); } else {

1 0

Mike McCormack : msi: Add stub for the RegisterComPlus and UnregisterComPlus actions.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: 886036696afbed3167e2dda32f6ca98b63fb1c23 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=886036696afbed3167e2dda… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 22 23:01:56 2006 +0900 msi: Add stub for the RegisterComPlus and UnregisterComPlus actions. --- dlls/msi/action.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 6501031..66d75f9 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4276,6 +4276,18 @@ static UINT ACTION_RMCCPSearch( MSIPACKA return msi_unimplemented_action_stub( package, "RMCCPSearch", table ); } +static UINT ACTION_RegisterComPlus( MSIPACKAGE *package ) +{ + static const WCHAR table[] = { 'C','o','m','p','l','u','s',0 }; + return msi_unimplemented_action_stub( package, "RegisterComPlus", table ); +} + +static UINT ACTION_UnregisterComPlus( MSIPACKAGE *package ) +{ + static const WCHAR table[] = { 'C','o','m','p','l','u','s',0 }; + return msi_unimplemented_action_stub( package, "UnregisterComPlus", table ); +} + static struct _actions StandardActions[] = { { szAllocateRegistrySpace, ACTION_AllocateRegistrySpace }, { szAppSearch, ACTION_AppSearch }, @@ -4314,7 +4326,7 @@ static struct _actions StandardActions[] { szPublishFeatures, ACTION_PublishFeatures }, { szPublishProduct, ACTION_PublishProduct }, { szRegisterClassInfo, ACTION_RegisterClassInfo }, - { szRegisterComPlus, NULL}, + { szRegisterComPlus, ACTION_RegisterComPlus}, { szRegisterExtensionInfo, ACTION_RegisterExtensionInfo }, { szRegisterFonts, ACTION_RegisterFonts }, { szRegisterMIMEInfo, ACTION_RegisterMIMEInfo }, @@ -4342,7 +4354,7 @@ static struct _actions StandardActions[] { szUnpublishComponents, NULL}, { szUnpublishFeatures, NULL}, { szUnregisterClassInfo, NULL}, - { szUnregisterComPlus, NULL}, + { szUnregisterComPlus, ACTION_UnregisterComPlus}, { szUnregisterExtensionInfo, NULL}, { szUnregisterFonts, ACTION_UnregisterFonts }, { szUnregisterMIMEInfo, NULL},

1 0

Mike McCormack : wine.inf: Add a shdocvw. dll stub dll to the system directory.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: c3c112de231fae2f28d3f685c341a204ddef26a9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c3c112de231fae2f28d3f68… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 22 23:46:31 2006 +0900 wine.inf: Add a shdocvw.dll stub dll to the system directory. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 747eb83..17d9144 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2114,6 +2114,7 @@ HKLM,%CurrentVersion%\Telephony\Country 11,,help.exe,winhelp.exe 11,,msiexec.exe 11,,notepad.exe +11,,shdocvw.dll 11,,progman.exe 11,,regsvr32.exe 11,,wcmd.exe

1 0

James Hawkins : advpack: Forward TranslateInfStringExA to its unicode counterpart.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: b877d84af0dd2e0b444294f0f1fd2403660a6961 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b877d84af0dd2e0b444294f… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Mar 21 13:32:37 2006 -0600 advpack: Forward TranslateInfStringExA to its unicode counterpart. --- dlls/advpack/advpack.c | 77 ++++++++++++++++++++++++++++++++++++++++----- dlls/advpack/advpack.spec | 2 + 2 files changed, 70 insertions(+), 9 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index b863bce..460f72d 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -541,6 +541,67 @@ HRESULT WINAPI TranslateInfStringW(LPCWS /*********************************************************************** * TranslateInfStringExA (ADVPACK.@) * + * See TranslateInfStringExW. + */ +HRESULT WINAPI TranslateInfStringExA(HINF hInf, LPCSTR pszInfFilename, + LPCSTR pszTranslateSection, LPCSTR pszTranslateKey, + LPSTR pszBuffer, DWORD dwBufferSize, + PDWORD pdwRequiredSize, PVOID pvReserved) +{ + UNICODE_STRING filenameW, sectionW, keyW; + LPWSTR bufferW; + HRESULT res; + DWORD len = 0; + + TRACE("(%p, %p, %p, %p, %p, %ld, %p, %p)\n", hInf, debugstr_a(pszInfFilename), + debugstr_a(pszTranslateSection), debugstr_a(pszTranslateKey), + debugstr_a(pszBuffer), dwBufferSize, pdwRequiredSize, pvReserved); + + if (!pszInfFilename || !pszTranslateSection || + !pszTranslateKey || !pdwRequiredSize) + return E_INVALIDARG; + + RtlCreateUnicodeStringFromAsciiz(&filenameW, pszInfFilename); + RtlCreateUnicodeStringFromAsciiz(&sectionW, pszTranslateSection); + RtlCreateUnicodeStringFromAsciiz(&keyW, pszTranslateKey); + + res = TranslateInfStringExW(hInf, filenameW.Buffer, sectionW.Buffer, + keyW.Buffer, NULL, 0, &len, NULL); + + if (res == S_OK) + { + bufferW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + + res = TranslateInfStringExW(hInf, filenameW.Buffer, sectionW.Buffer, + keyW.Buffer, bufferW, len, &len, NULL); + + if (res == S_OK) + { + *pdwRequiredSize = WideCharToMultiByte(CP_ACP, 0, bufferW, -1, + NULL, 0, NULL, NULL); + + if (dwBufferSize >= *pdwRequiredSize) + { + WideCharToMultiByte(CP_ACP, 0, bufferW, -1, pszBuffer, + dwBufferSize, NULL, NULL); + } + else + res = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } + + HeapFree(GetProcessHeap(), 0, bufferW); + } + + RtlFreeUnicodeString(&filenameW); + RtlFreeUnicodeString(&sectionW); + RtlFreeUnicodeString(&keyW); + + return res; +} + +/*********************************************************************** + * TranslateInfStringExW (ADVPACK.@) + * * Using a handle to an INF file opened with OpenINFEngine, translates * the value of a specified key in an inf file into the current locale * by expanding string macros. @@ -567,19 +628,19 @@ HRESULT WINAPI TranslateInfStringW(LPCWS * than calling TranslateInfString, because the INF file is only * opened once. */ -HRESULT WINAPI TranslateInfStringExA(HINF hInf, LPCSTR pszInfFilename, - LPCSTR pszTranslateSection, LPCSTR pszTranslateKey, - LPSTR pszBuffer, DWORD dwBufferSize, - PDWORD pdwRequiredSize, PVOID pvReserved) +HRESULT WINAPI TranslateInfStringExW(HINF hInf, LPCWSTR pszInfFilename, + LPCWSTR pszTranslateSection, LPCWSTR pszTranslateKey, + LPWSTR pszBuffer, DWORD dwBufferSize, + PDWORD pdwRequiredSize, PVOID pvReserved) { - TRACE("(%p, %p, %p, %p, %p, %ld, %p, %p)\n", hInf, pszInfFilename, - pszTranslateSection, pszTranslateKey, pszBuffer, dwBufferSize, - pdwRequiredSize, pvReserved); + TRACE("(%p, %p, %p, %p, %p, %ld, %p, %p)\n", hInf, debugstr_w(pszInfFilename), + debugstr_w(pszTranslateSection), debugstr_w(pszTranslateKey), + debugstr_w(pszBuffer), dwBufferSize, pdwRequiredSize, pvReserved); if (!hInf || !pszInfFilename || !pszTranslateSection || !pszTranslateKey) return E_INVALIDARG; - if (!SetupGetLineTextA(NULL, hInf, pszTranslateSection, pszTranslateKey, + if (!SetupGetLineTextW(NULL, hInf, pszTranslateSection, pszTranslateKey, pszBuffer, dwBufferSize, pdwRequiredSize)) { if (dwBufferSize < *pdwRequiredSize) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index ae939b5..7ddd412 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -72,7 +72,7 @@ @ stdcall TranslateInfStringW(wstr wstr wstr wstr ptr long ptr ptr) @ stdcall TranslateInfString(str str str str ptr long ptr ptr) TranslateInfStringA @ stdcall TranslateInfStringExA(long str str str str long ptr ptr) -# stdcall TranslateInfStringExW(long wstr wstr wstr wstr long ptr ptr) +@ stdcall TranslateInfStringExW(long wstr wstr wstr wstr long ptr ptr) @ stdcall TranslateInfStringEx(long str str str str long ptr ptr) TranslateInfStringExA @ stdcall UserInstStubWrapperA(long long str long) # stdcall UserInstStubWrapperW(long long wstr long)

1 0

James Hawkins : advpack: Add second null for double null terminated lists.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: 396242faa75358be27e372251a0ed6e1a596dc6b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=396242faa75358be27e3722… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Mar 21 14:05:41 2006 -0600 advpack: Add second null for double null terminated lists. --- dlls/advpack/tests/files.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/advpack/tests/files.c b/dlls/advpack/tests/files.c index 8a62b4c..f492911 100644 --- a/dlls/advpack/tests/files.c +++ b/dlls/advpack/tests/files.c @@ -146,7 +146,7 @@ static void test_AddDelBackupEntry() lstrcatA(path, "\\backup\\.INI"); /* try an empty base name */ - res = pAddDelBackupEntry("one\0two\0three", "backup", "", AADBE_ADD_ENTRY); + res = pAddDelBackupEntry("one\0two\0three\0", "backup", "", AADBE_ADD_ENTRY); ok(res == S_OK, "Expected S_OK, got %ld\n", res); ok(!DeleteFileA(path), "Expected path to not exist\n"); @@ -154,14 +154,14 @@ static void test_AddDelBackupEntry() lstrcatA(path, "\\basename.INI"); /* try an invalid flag */ - res = pAddDelBackupEntry("one\0two\0three", NULL, "basename", 0); + res = pAddDelBackupEntry("one\0two\0three\0", NULL, "basename", 0); ok(res == S_OK, "Expected S_OK, got %ld\n", res); ok(!DeleteFileA(path), "Expected path to not exist\n"); lstrcpyA(path, "c:\\basename.INI"); /* create the INF file */ - res = pAddDelBackupEntry("one\0two\0three", "c:\\", "basename", AADBE_ADD_ENTRY); + res = pAddDelBackupEntry("one\0two\0three\0", "c:\\", "basename", AADBE_ADD_ENTRY); ok(res == S_OK, "Expected S_OK, got %ld\n", res); ok(check_ini_file_attr(path), "Expected ini file to be hidden\n"); ok(check_ini_contents(path, TRUE), "Expected ini contents to match\n"); @@ -172,7 +172,7 @@ static void test_AddDelBackupEntry() /* try to create the INI file in a nonexistent directory */ RemoveDirectoryA("backup"); - res = pAddDelBackupEntry("one\0two\0three", "backup", "basename", AADBE_ADD_ENTRY); + res = pAddDelBackupEntry("one\0two\0three\0", "backup", "basename", AADBE_ADD_ENTRY); ok(res == S_OK, "Expected S_OK, got %ld\n", res); ok(!check_ini_file_attr(path), "Expected ini file to not be hidden\n"); ok(!check_ini_contents(path, TRUE), "Expected ini contents to not match\n"); @@ -180,7 +180,7 @@ static void test_AddDelBackupEntry() /* try an existent, relative backup directory */ CreateDirectoryA("backup", NULL); - res = pAddDelBackupEntry("one\0two\0three", "backup", "basename", AADBE_ADD_ENTRY); + res = pAddDelBackupEntry("one\0two\0three\0", "backup", "basename", AADBE_ADD_ENTRY); ok(res == S_OK, "Expected S_OK, got %ld\n", res); ok(check_ini_file_attr(path), "Expected ini file to be hidden\n"); ok(check_ini_contents(path, TRUE), "Expected ini contents to match\n"); @@ -190,13 +190,13 @@ static void test_AddDelBackupEntry() lstrcpyA(path, "c:\\windows\\basename.INI"); /* try a NULL backup dir, INI is created in c:\windows */ - res = pAddDelBackupEntry("one\0two\0three", NULL, "basename", AADBE_ADD_ENTRY); + res = pAddDelBackupEntry("one\0two\0three\0", NULL, "basename", AADBE_ADD_ENTRY); ok(res == S_OK, "Expected S_OK, got %ld\n", res); ok(check_ini_contents(path, TRUE), "Expected ini contents to match\n"); /* remove the entries with AADBE_DEL_ENTRY */ SetFileAttributesA(path, FILE_ATTRIBUTE_NORMAL); - res = pAddDelBackupEntry("one\0three", NULL, "basename", AADBE_DEL_ENTRY); + res = pAddDelBackupEntry("one\0three\0", NULL, "basename", AADBE_DEL_ENTRY); SetFileAttributesA(path, FILE_ATTRIBUTE_NORMAL); ok(res == S_OK, "Expected S_OK, got %ld\n", res); ok(check_ini_contents(path, FALSE), "Expected ini contents to match\n");

1 0

Mike McCormack : msi: Show "hidden dialogs" but hide them initially.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: 06c84c4a42092a009dbab444e19ec94aa67d5536 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=06c84c4a42092a009dbab44… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 22 14:06:30 2006 +0900 msi: Show "hidden dialogs" but hide them initially. --- dlls/msi/dialog.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 69909a7..ffbd6b8 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1931,7 +1931,6 @@ static LRESULT msi_dialog_oncreate( HWND SetWindowPos( hwnd, 0, 0, 0, size.cx, size.cy, SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOREDRAW ); - msi_dialog_build_font_list( dialog ); msi_dialog_fill_controls( dialog ); msi_dialog_evaluate_control_conditions( dialog ); @@ -2351,16 +2350,18 @@ void msi_dialog_check_messages( HANDLE h UINT msi_dialog_run_message_loop( msi_dialog *dialog ) { + DWORD style; HWND hwnd; - if( !(dialog->attributes & msidbDialogAttributesVisible) ) - return ERROR_SUCCESS; - if( uiThreadId != GetCurrentThreadId() ) return SendMessageW( hMsiHiddenWindow, WM_MSI_DIALOG_CREATE, 0, (LPARAM) dialog ); /* create the dialog window, don't show it yet */ - hwnd = CreateWindowW( szMsiDialogClass, dialog->name, WS_OVERLAPPEDWINDOW, + style = WS_OVERLAPPED; + if( dialog->attributes & msidbDialogAttributesVisible ) + style |= WS_VISIBLE; + + hwnd = CreateWindowW( szMsiDialogClass, dialog->name, style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, dialog ); if( !hwnd )

1 0