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

Rob Shearman : widl: Move type_basic_get_fc to typegen. c and rename it to get_basic_fc.
by Alexandre Julliard 09 Mar '09

09 Mar '09

Module: wine Branch: master Commit: 728a738a824f19fa72e098e1034d9698d28dd190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=728a738a824f19fa72e098e10… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Mar 7 23:24:00 2009 +0000 widl: Move type_basic_get_fc to typegen.c and rename it to get_basic_fc. Move to using type_basic_get_type in other files where appropriate. --- tools/widl/expr.c | 28 ++++++++++------------ tools/widl/header.c | 6 ++-- tools/widl/parser.y | 28 +++++++++++----------- tools/widl/typegen.c | 60 +++++++++++++++++++++++++++++++++--------------- tools/widl/typegen.h | 1 + tools/widl/typelib.c | 6 ++-- tools/widl/typetree.h | 25 -------------------- 7 files changed, 75 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=728a738a824f19fa72e09…

1 0

Dylan Smith : richedit: Respect manually added links when autourldetect is disabled.
by Alexandre Julliard 09 Mar '09

09 Mar '09

Module: wine Branch: master Commit: fdb37491386dc2a21717e38ec60309437da9e2e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdb37491386dc2a21717e38ec… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Mar 9 03:01:00 2009 -0400 richedit: Respect manually added links when autourldetect is disabled. EM_SETCHARFORMAT can be used to make text links. Automatic URL detection being enable would cause these links to be removed if the text is not a URL, so this must be prevented. Previously checks were made for AutoURLDetect_bEnable before calling ME_UpdateSelectionLinkAttribute, or ME_UpdateLinkAttribute. This is more error prone than checking for this within the function, so one call was missing this check. ME_SetCursor also didn't respect this behaviour, since it wouldn't set the cursor to the hand when hovering over a link without automatic URL detection disabled. --- dlls/riched20/editor.c | 50 +++++++++++++++++++++-------------------------- 1 files changed, 22 insertions(+), 28 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 93d0c34..c9cb244 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2040,6 +2040,8 @@ static void ME_UpdateSelectionLinkAttribute(ME_TextEditor *editor) ME_DisplayItem *prev_para; int from, to; + if (!editor->AutoURLDetect_bEnable) return; + ME_GetSelection(editor, &from, &to); /* Find paragraph previous to the one that contains start cursor */ @@ -2235,9 +2237,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) ME_CommitCoalescingUndo(editor); SetCursor(NULL); - if (editor->AutoURLDetect_bEnable) - ME_UpdateSelectionLinkAttribute(editor); - + ME_UpdateSelectionLinkAttribute(editor); ME_UpdateRepaint(editor); } return TRUE; @@ -2396,8 +2396,7 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, ITextHost_TxSetCursor(editor->texthost, NULL, FALSE); } - if (editor->AutoURLDetect_bEnable) ME_UpdateSelectionLinkAttribute(editor); - + ME_UpdateSelectionLinkAttribute(editor); ME_UpdateRepaint(editor); } return 0; @@ -2518,22 +2517,20 @@ static BOOL ME_SetCursor(ME_TextEditor *editor) offset = ME_CharFromPos(editor, pt.x, pt.y, &isExact); if (isExact) { - if (editor->AutoURLDetect_bEnable) + ME_Cursor cursor; + ME_Run *run; + + ME_CursorFromCharOfs(editor, offset, &cursor); + run = &cursor.pRun->member.run; + if (run->style->fmt.dwMask & CFM_LINK && + run->style->fmt.dwEffects & CFE_LINK) { - ME_Cursor cursor; - ME_Run *run; - ME_CursorFromCharOfs(editor, offset, &cursor); - run = &cursor.pRun->member.run; - if (editor->AutoURLDetect_bEnable && - run->style->fmt.dwMask & CFM_LINK && - run->style->fmt.dwEffects & CFE_LINK) - { - ITextHost_TxSetCursor(editor->texthost, - LoadCursorW(NULL, (WCHAR*)IDC_HAND), - FALSE); - return TRUE; - } + ITextHost_TxSetCursor(editor->texthost, + LoadCursorW(NULL, (WCHAR*)IDC_HAND), + FALSE); + return TRUE; } + if (ME_IsSelection(editor)) { int selStart, selEnd; @@ -3234,12 +3231,10 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if (bSelection) { ME_ReleaseStyle(style); - if (editor->AutoURLDetect_bEnable) - ME_UpdateSelectionLinkAttribute(editor); + ME_UpdateSelectionLinkAttribute(editor); } else { len = 1; - if (editor->AutoURLDetect_bEnable) - ME_UpdateLinkAttribute(editor, 0, -1); + ME_UpdateLinkAttribute(editor, 0, -1); } ME_CommitUndo(editor); if (!(pStruct->flags & ST_KEEPUNDO)) @@ -3433,7 +3428,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_ClearTempStyle(editor); ME_EndToUnicode(unicode, wszText); ME_CommitUndo(editor); - if (editor->AutoURLDetect_bEnable) ME_UpdateSelectionLinkAttribute(editor); + ME_UpdateSelectionLinkAttribute(editor); if (!wParam) ME_EmptyUndoStack(editor); ME_UpdateRepaint(editor); @@ -3501,10 +3496,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } else TRACE("WM_SETTEXT - NULL\n"); - if (editor->AutoURLDetect_bEnable) - { - ME_UpdateLinkAttribute(editor, 0, -1); - } + ME_UpdateLinkAttribute(editor, 0, -1); ME_SetSelection(editor, 0, 0); editor->nModifyStep = 0; ME_CommitUndo(editor); @@ -4850,6 +4842,8 @@ static BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, int sel_min, int sel_m BOOL modified = FALSE; int cMin, cMax; + if (!editor->AutoURLDetect_bEnable) return FALSE; + if (sel_max == -1) sel_max = ME_GetTextLength(editor); do {

1 0

Jeremy White : sane.ds: Add support for ICAP_SUPPORTEDSIZES, enabling rational sizing for scans.
by Alexandre Julliard 09 Mar '09

09 Mar '09

Module: wine Branch: master Commit: 81b288870eb8c87d17e95d16048094ed3adb87ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=81b288870eb8c87d17e95d160… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Fri Mar 6 11:52:33 2009 -0600 sane.ds: Add support for ICAP_SUPPORTEDSIZES, enabling rational sizing for scans. --- dlls/sane.ds/capability.c | 237 ++++++++++++++++++++++++++++++++++++++++++++- dlls/sane.ds/options.c | 13 +++ dlls/sane.ds/sane_i.h | 1 + dlls/twain_32/tests/dsm.c | 113 +++++++++++++++++++++ 4 files changed, 363 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=81b288870eb8c87d17e95…

1 0

Rob Shearman : widl: Determine pointer fc at generation time instead of at parse time.
by Alexandre Julliard 09 Mar '09

09 Mar '09

Module: wine Branch: master Commit: 23673ca37382b106d3575b98d571cd7c6a30e6cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=23673ca37382b106d3575b98d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Mar 7 23:23:44 2009 +0000 widl: Determine pointer fc at generation time instead of at parse time. Avoid changing the details of a pointer once created. Properly determine the pointer type for arrays. --- tools/widl/expr.c | 6 +- tools/widl/parser.y | 38 +++++------- tools/widl/proxy.c | 6 +- tools/widl/typegen.c | 155 +++++++++++++++++++++++++---------------------- tools/widl/typegen.h | 2 +- tools/widl/typetree.c | 8 ++- tools/widl/typetree.h | 19 +++++- tools/widl/widltypes.h | 7 +- 8 files changed, 130 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=23673ca37382b106d3575…

1 0

Rob Shearman : widl: Output server code for freeing returned types.
by Alexandre Julliard 09 Mar '09

09 Mar '09

Module: wine Branch: master Commit: f170f9b5d517f7c4da1949e7c5f230f10bb931f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f170f9b5d517f7c4da1949e7c… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Mar 7 23:23:48 2009 +0000 widl: Output server code for freeing returned types. --- tools/widl/server.c | 3 +++ tools/widl/typegen.c | 18 +++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index bfec342..fd64899 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -80,6 +80,9 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) indent++; write_remoting_arguments(server, indent, func, "__frame->", PASS_OUT, PHASE_FREE); + if (!is_void(type_function_get_rettype(func->type))) + write_remoting_arguments(server, indent, func, "__frame->", PASS_RETURN, PHASE_FREE); + if (has_full_pointer) write_full_pointer_free(server, indent, func); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 5a53fb4..ca22825 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3349,9 +3349,14 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const if (phase == PHASE_FREE || pass == PASS_RETURN || pointer_type != RPC_FC_RP) { - unsigned int ptr_start_offset = (start_offset - (is_conformant_array(type) ? 4 : 2)); - print_phase_function(file, indent, "Pointer", local_var_prefix, - phase, var, ptr_start_offset); + /* strings returned are assumed to be global and hence don't + * need freeing */ + if (phase != PHASE_FREE || pass != PASS_RETURN) + { + unsigned int ptr_start_offset = (start_offset - (is_conformant_array(type) ? 4 : 2)); + print_phase_function(file, indent, "Pointer", local_var_prefix, + phase, var, ptr_start_offset); + } } else { @@ -3493,6 +3498,13 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const * need a freeing pass */ if (phase == PHASE_MARSHAL || phase == PHASE_UNMARSHAL) struct_type = "SimpleStruct"; + else if (phase == PHASE_FREE && pass == PASS_RETURN) + { + print_file(file, indent, "if (%s%s)\n", local_var_prefix, var->name); + indent++; + print_file(file, indent, "__frame->_StubMsg.pfnFree(%s%s);\n", local_var_prefix, var->name); + indent--; + } break; case RPC_FC_PSTRUCT: struct_type = "SimpleStruct";

1 0

Rob Shearman : widl: Fix a memory leak in the server/ stub code when unmarshalling pointers to strings at the top level.
by Alexandre Julliard 09 Mar '09

09 Mar '09

Module: wine Branch: master Commit: 630b48941f1b8e1be2f4c96acc39232786d71892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=630b48941f1b8e1be2f4c96ac… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Mar 7 23:23:54 2009 +0000 widl: Fix a memory leak in the server/stub code when unmarshalling pointers to strings at the top level. It is necessary for the first pointer to have an offset to a second pointer instead of directly to the string type, since the second pointer frees the memory for the string. --- tools/widl/typegen.c | 53 ++++++++++++++++++++++++++++++------------------- 1 files changed, 32 insertions(+), 21 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index ca22825..4c5a96f 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1546,7 +1546,12 @@ static int write_no_repeat_pointer_descriptions( } else { - write_nonsimple_pointer(file, attrs, type, FALSE, type->typestring_offset, typestring_offset); + unsigned int offset = type->typestring_offset; + /* skip over the pointer that is written for strings, since a + * pointer has to be written in-place here */ + if (is_string_type(attrs, type)) + offset += 4; + write_nonsimple_pointer(file, attrs, type, FALSE, offset, typestring_offset); } align = 0; @@ -1941,6 +1946,9 @@ static unsigned int write_string_tfs(FILE *file, const attr_list_t *attrs, unsigned char rtype; type_t *elem_type; + start_offset = *typestring_offset; + update_tfsoff(type, start_offset, file); + if (is_declptr(type)) { unsigned char flag = is_conformant_array(type) ? 0 : RPC_FC_P_SIMPLEPOINTER; @@ -1959,9 +1967,6 @@ static unsigned int write_string_tfs(FILE *file, const attr_list_t *attrs, } } - start_offset = *typestring_offset; - update_tfsoff(type, start_offset, file); - if (is_array(type)) elem_type = type_array_get_element(type); else @@ -2326,8 +2331,16 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, } else if (type_get_type(ft) == TYPE_ARRAY && type_array_is_decl_as_ptr(ft)) { + unsigned int offset; + print_file(file, 0, "/* %d */\n", *tfsoff); - write_nonsimple_pointer(file, f->attrs, ft, FALSE, ft->typestring_offset, tfsoff); + + offset = ft->typestring_offset; + /* skip over the pointer that is written for strings, since a + * pointer has to be written in-place here */ + if (is_string_type(f->attrs, ft)) + offset += 4; + write_nonsimple_pointer(file, f->attrs, ft, FALSE, offset, tfsoff); } } if (type_get_real_type(type)->ptrdesc == *tfsoff) @@ -2633,16 +2646,8 @@ static unsigned int write_typeformatstring_var(FILE *file, int indent, const var int ptr_type; unsigned int off; off = write_array_tfs(file, var->attrs, type, var->name, typeformat_offset); - ptr_type = get_attrv(var->attrs, ATTR_POINTERTYPE); - /* Top level pointers to conformant arrays may be handled specially - since we can bypass the pointer, but if the array is buried - beneath another pointer (e.g., "[size_is(,n)] int **p" then we - always need to write the pointer. */ - if (!ptr_type && var->type != type) - /* FIXME: This should use pointer_default, but the information - isn't kept around for arrays. */ - ptr_type = RPC_FC_UP; - if (ptr_type && ptr_type != RPC_FC_RP) + ptr_type = get_pointer_fc(type, var->attrs, toplevel_param); + if (ptr_type != RPC_FC_RP) { unsigned int absoff = type->typestring_offset; short reloff = absoff - (*typeformat_offset + 2); @@ -3352,21 +3357,27 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const /* strings returned are assumed to be global and hence don't * need freeing */ if (phase != PHASE_FREE || pass != PASS_RETURN) - { - unsigned int ptr_start_offset = (start_offset - (is_conformant_array(type) ? 4 : 2)); print_phase_function(file, indent, "Pointer", local_var_prefix, - phase, var, ptr_start_offset); - } + phase, var, start_offset); } else { + unsigned int real_start_offset = start_offset; + /* skip over pointer description straight to string description */ + if (is_declptr(type)) + { + if (is_conformant_array(type)) + real_start_offset += 4; + else + real_start_offset += 2; + } if (is_array(type) && !is_conformant_array(type)) print_phase_function(file, indent, "NonConformantString", local_var_prefix, phase, var, - start_offset); + real_start_offset); else print_phase_function(file, indent, "ConformantString", local_var_prefix, - phase, var, start_offset); + phase, var, real_start_offset); } break; case TGT_ARRAY:

1 0

Hwang YunSong(황윤성) : cmd: Updated Korean resource.
by Alexandre Julliard 09 Mar '09

09 Mar '09

Module: wine Branch: master Commit: b77d17738718bb0f032b40f27aba653bae790a26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b77d17738718bb0f032b40f27… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Mar 9 09:54:46 2009 +0900 cmd: Updated Korean resource. --- programs/cmd/Ko.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/Ko.rc b/programs/cmd/Ko.rc index ea29a0a..e2831f5 100644 --- a/programs/cmd/Ko.rc +++ b/programs/cmd/Ko.rc @@ -257,12 +257,12 @@ HELP < WCMD_VERIFYPROMPT, "��(Verify)�� %s\n" WCMD_VERIFYERR, "��(Verify)�� ݵ�� ON �̳� OFF�� Ǿ�� մϴ�.\n"; WCMD_ARGERR, "�Ű�� \n" - WCMD_VOLUMEDETAIL, "%c ��̺�� %s\n�� ø�� ȣ�� %04x-%04x\n\n" + WCMD_VOLUMEDETAIL, "%c ��̺�� %s\n �� ø�� ȣ�� %04x-%04x\n\n" WCMD_VOLUMEPROMPT, "�� (11 ��, ENTER�� )?" WCMD_NOPATH, "PATH�� ã�� ϴ�\n" WCMD_ANYKEY,"�� Ű�� : " WCMD_CONSTITLE,"Wine �� Է´��" WCMD_VERSION,"CMD �� %s\n\n" WCMD_MOREPROMPT, " ��? " - WCMD_LINETOOLONG, "The input line is too long.\n" + WCMD_LINETOOLONG, "�� ʹ� ��ϴ�.\n" }

1 0

Rob Shearman : widl: Consolidate non-simple pointer writing into one function.
by Alexandre Julliard 09 Mar '09

09 Mar '09

Module: wine Branch: master Commit: f8e36ab4abe36c4506a763d42e77e2847b4579d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8e36ab4abe36c4506a763d42… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Mar 7 23:23:39 2009 +0000 widl: Consolidate non-simple pointer writing into one function. --- tools/widl/typegen.c | 145 +++++++++++++++++++++++--------------------------- 1 files changed, 67 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f8e36ab4abe36c4506a76…

1 0

Francois Gouget : Remove spaces before '\n's.
by Alexandre Julliard 09 Mar '09

09 Mar '09

Module: wine Branch: master Commit: 96848a06054ee18ba5e707f9c1a1d56d28f30cbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=96848a06054ee18ba5e707f9c… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Mar 8 23:48:03 2009 +0100 Remove spaces before '\n's. --- dlls/comcat/tests/comcat.c | 2 +- dlls/comctl32/tests/rebar.c | 2 +- dlls/comctl32/tests/toolbar.c | 2 +- dlls/dmloader/container.c | 2 +- dlls/dmloader/loader.c | 6 +++--- dlls/msvcrt/scanf.h | 2 +- dlls/ntdll/serial.c | 2 +- dlls/riched20/tests/editor.c | 6 +++--- dlls/rsaenh/tests/rsaenh.c | 2 +- dlls/setupapi/tests/parser.c | 8 ++++---- dlls/snmpapi/tests/util.c | 14 +++++++------- dlls/winedos/interrupts.c | 4 ++-- programs/expand/expand.c | 2 +- programs/winedbg/break.c | 2 +- programs/winedbg/types.c | 2 +- tools/winedump/output.c | 2 +- tools/winedump/pdb.c | 4 ++-- 17 files changed, 32 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96848a06054ee18ba5e70…

1 0

Jacek Caban : wininet: Release session after FTP_ReceiveResponse call in FTPFILE_Destroy.
by Alexandre Julliard 09 Mar '09

09 Mar '09

Module: wine Branch: master Commit: 0031b40454d81b48f43f6042a80a951a42a1cddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0031b40454d81b48f43f6042a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 9 01:49:20 2009 +0100 wininet: Release session after FTP_ReceiveResponse call in FTPFILE_Destroy. --- dlls/wininet/ftp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 01a8105..ef1eef1 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1092,8 +1092,6 @@ static void FTPFILE_Destroy(WININETHANDLEHEADER *hdr) TRACE("\n"); - WININET_Release(&lpwh->lpFtpSession->hdr); - if (!lpwh->session_deleted) lpwfs->download_in_progress = NULL; @@ -1103,6 +1101,8 @@ static void FTPFILE_Destroy(WININETHANDLEHEADER *hdr) nResCode = FTP_ReceiveResponse(lpwfs, lpwfs->hdr.dwContext); if (nResCode > 0 && nResCode != 226) WARN("server reports failed transfer\n"); + WININET_Release(&lpwh->lpFtpSession->hdr); + HeapFree(GetProcessHeap(), 0, lpwh); }

1 0