August 2008 - Wine-Commits - list.winehq.org

Hongbo Ni : winefile: Convert simplified Chinese resource to utf8.
by Alexandre Julliard Aug. 27, 2008

Aug. 27, 2008

Module: wine Branch: master Commit: 252243e932474d43e267ef4f82e24f3f0c3953c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=252243e932474d43e267ef4f8… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Wed Aug 27 16:14:34 2008 +1000 winefile: Convert simplified Chinese resource to utf8. --- programs/winefile/Zh.rc | 171 ++++++++++++++++++++++++----------------------- 1 files changed, 88 insertions(+), 83 deletions(-) diff --git a/programs/winefile/Zh.rc b/programs/winefile/Zh.rc index 76fa360..66a90d8 100644 --- a/programs/winefile/Zh.rc +++ b/programs/winefile/Zh.rc @@ -19,140 +19,145 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* Chinese text is encoded in UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED /* Menu */ IDM_WINEFILE MENU FIXED IMPURE { - POPUP "�ļ��&F��" { - MENUITEM "�򿪣�&O��\tEnter", ID_ACTIVATE - MENUITEM "�ƶ��&M��...\tF7", ID_FILE_MOVE - MENUITEM "��ƣ�&C��...\tF8", ID_FILE_COPY - MENUITEM "λ�ڼ��壨&I��...\tF9", 118 - MENUITEM "ɾ��&D��\tDel", ID_FILE_DELETE - MENUITEM "��&N��...", 109 - MENUITEM "��ԣ�&I��...\tAlt+Enter", ID_EDIT_PROPERTIES - MENUITEM SEPARATOR - MENUITEM "ѹ��&O��...", 119 - MENUITEM "��ѹ��&O��...", 120 - MENUITEM SEPARATOR - MENUITEM "��У�&R��...", ID_EXECUTE - MENUITEM "��ӡ��&P��...", 102 - MENUITEM "��ļ��...", 103 - MENUITEM SEPARATOR - MENUITEM "��Ŀ¼��&E��...", 111 - MENUITEM "��ң�&H��...", 104 - MENUITEM "ѡ��ļ��&S��...", 116 + POPUP "文件(&F)" { + MENUITEM "打开(&O)\tEnter", ID_ACTIVATE + MENUITEM "移动(&M)...\tF7", ID_FILE_MOVE + MENUITEM "复制(&C)...\tF8", ID_FILE_COPY + MENUITEM "位于剪贴板(&I)...\tF9", 118 + MENUITEM "删除(&D)\tDel", ID_FILE_DELETE + MENUITEM "改名(&N)...", 109 + MENUITEM "属性(&I)...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "压缩(&O)...", 119 + MENUITEM "解压缩(&O)...", 120 + MENUITEM SEPARATOR + MENUITEM "运行(&R)...", ID_EXECUTE + MENUITEM "打印(&P)...", 102 + MENUITEM "配置文件相关...", 103 + MENUITEM SEPARATOR + MENUITEM "建立目录(&E)...", 111 + MENUITEM "查找(&H)...", 104 + MENUITEM "选择文件(&S)...", 116 MENUITEM SEPARATOR #ifndef _NO_EXTENSIONS - MENUITEM "�˳��&X��\tAlt+X", ID_FILE_EXIT + MENUITEM "退出(&X)\tAlt+X", ID_FILE_EXIT #else - MENUITEM "�˳��&X��", ID_FILE_EXIT + MENUITEM "退出(&X)", ID_FILE_EXIT #endif } - POPUP "��̣�&D��" { - MENUITEM "��ƣ�&C��...", 201 - MENUITEM "��&L��...", 202 + POPUP "磁盘(&D)" { + MENUITEM "复制(&C)...", 201 + MENUITEM "命名(&L)...", 202 MENUITEM SEPARATOR - MENUITEM "��ʽ��&��...", ID_FORMAT_DISK + MENUITEM "格式化(&)...", ID_FORMAT_DISK #ifdef _WIN95 - MENUITEM "��ϵͳ�̣�&M��...", -1 /*TODO*/ + MENUITEM "建立系统盘(&M)...", -1 /*TODO*/ #endif MENUITEM SEPARATOR - MENUITEM "��&N��", ID_CONNECT_NETWORK_DRIVE - MENUITEM "�Ͽ��ӣ�&D��", ID_DISCONNECT_NETWORK_DRIVE + MENUITEM "连接网络驱动器(&N)", ID_CONNECT_NETWORK_DRIVE + MENUITEM "断开网络驱动器连接(&D)", ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR - MENUITEM "��Ϊ...", 254 - MENUITEM "ɾ��&R��...", 255 + MENUITEM "共享为...", 254 + MENUITEM "删除共享(&R)...", 255 MENUITEM SEPARATOR - MENUITEM "ѡ��&S��...", 251 + MENUITEM "选择驱动器(&S)...", 251 } - POPUP "Ŀ¼��&D��" { - MENUITEM "��һ�㣨&N��\t+", 301 - MENUITEM "չ��&T��\t*", 302 - MENUITEM "ȫ��չ��&A��\tStrg+*", 303 - MENUITEM "�۵��&R��\t-", 304 + POPUP "目录(&D)" { + MENUITEM "下一层(&N)\t+", 301 + MENUITEM "展开(&T)\t*", 302 + MENUITEM "全部展开(&A)\tStrg+*", 303 + MENUITEM "折叠(&R)\t-", 304 MENUITEM SEPARATOR - MENUITEM "��Ŀ¼��&M��", 505 + MENUITEM "标记子目录(&M)", 505 } - POPUP "��ͼ��&V��" { - MENUITEM "Ŀ¼��ݣ�&R��", 413 - MENUITEM "��ʾĿ¼��&E��", 411 - MENUITEM "��ʾĿ¼��ݣ�&O��", 412 + POPUP "视图(&V)" { + MENUITEM "目录树机器内容(&R)", 413 + MENUITEM "仅显示目录树(&E)", 411 + MENUITEM "仅显示目录内容(&O)", 412 MENUITEM SEPARATOR - MENUITEM "�ָ&L��", ID_VIEW_SPLIT + MENUITEM "分割(&L)", ID_VIEW_SPLIT MENUITEM SEPARATOR - MENUITEM "�ļ��&N��", ID_VIEW_NAME - MENUITEM "�ļ��Ϥ�б��&A��", ID_VIEW_ALL_ATTRIBUTES, CHECKED - MENUITEM "��ԣ�&P��...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM "文件名称(&N)", ID_VIEW_NAME + MENUITEM "文件详情列表(&A)", ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "部分属性(&P)...", ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR - MENUITEM "��ļ��&S��", ID_VIEW_SORT_NAME - MENUITEM "��&B��", ID_VIEW_SORT_TYPE - MENUITEM "��С��&Z��", ID_VIEW_SORT_SIZE - MENUITEM "��&D��", ID_VIEW_SORT_DATE + MENUITEM "按文件名排序(&S)", ID_VIEW_SORT_NAME + MENUITEM "按类型排序(&B)", ID_VIEW_SORT_TYPE + MENUITEM "按大小排序(&Z)", ID_VIEW_SORT_SIZE + MENUITEM "按日期排序(&D)", ID_VIEW_SORT_DATE MENUITEM SEPARATOR - MENUITEM "��...", ID_VIEW_FILTER + MENUITEM "定制排序...", ID_VIEW_FILTER } - POPUP "ѡ�&O��" { - MENUITEM "ȷ��ʽ��&C��...", 501 - MENUITEM "��壨&F��...", ID_SELECT_FONT - MENUITEM "��ƹ��&B��...", 512 - MENUITEM SEPARATOR - MENUITEM "��&T��", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "��б��&D��", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "״̬��&S��", ID_VIEW_STATUSBAR, CHECKED + POPUP "选项(&O)" { + MENUITEM "确定方式(&C)...", 501 + MENUITEM "字体(&F)...", ID_SELECT_FONT + MENUITEM "定制工具条(&B)...", 512 + MENUITEM SEPARATOR + MENUITEM "工具条(&T)", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "驱动器列表(&D)", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "状态栏(&S)", ID_VIEW_STATUSBAR, CHECKED #ifndef _NO_EXTENSIONS - MENUITEM "ȫ��&U��\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "全屏(&U)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR - MENUITEM "��С��&M��", 504 - MENUITEM "�˳�ʱ��ã�&S��", 511 + MENUITEM "启动后最小化(&M)", 504 + MENUITEM "退出时保存设置(&S)", 511 } - POPUP "��ȫ��&S��" { - MENUITEM "��ʣ�&A��...", 605 - MENUITEM "��¼��&L��...", 606 - MENUITEM "��ߣ�&O��...", 607 + POPUP "安全(&S)" { + MENUITEM "访问(&A)...", 605 + MENUITEM "登录(&L)...", 606 + MENUITEM "所有者(&O)...", 607 } - POPUP "��ڣ�&W��" { - MENUITEM "�½��&W)", ID_WINDOW_NEW - MENUITEM "��\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "ˮƽƽ�̣�&H��", ID_WINDOW_TILE_HORZ - MENUITEM "��ֱƽ�̣�&��\tCtrl+F4", ID_WINDOW_TILE_VERT + POPUP "窗口(&W)" { + MENUITEM "新建(&W)", ID_WINDOW_NEW + MENUITEM "层叠\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "水平平铺(&H)", ID_WINDOW_TILE_HORZ + MENUITEM "垂直平铺(&)\tCtrl+F4", ID_WINDOW_TILE_VERT #ifndef _NO_EXTENSIONS - MENUITEM "�Զ��", ID_WINDOW_AUTOSORT + MENUITEM "自动排列", ID_WINDOW_AUTOSORT #endif - MENUITEM "�Զ��ͼ�꣨&S��", ID_WINDOW_ARRANGE - MENUITEM "ˢ�£�&R��\tF5", ID_REFRESH + MENUITEM "自动排列图标(&S)", ID_WINDOW_ARRANGE + MENUITEM "刷新(&R)\tF5", ID_REFRESH } POPUP "&?" { - MENUITEM "��⣨&H��\tF1", ID_HELP - MENUITEM "��&S��...\tF1", ID_HELP - MENUITEM "ʹ�ð��&U��\tF1", ID_HELP_USING + MENUITEM "帮助主题(&H)\tF1", ID_HELP + MENUITEM "搜索帮助(&S)...\tF1", ID_HELP + MENUITEM "使用帮助(&U)\tF1", ID_HELP_USING MENUITEM SEPARATOR - MENUITEM "&�� Winefile...", ID_ABOUT + MENUITEM "&关于 Winefile...", ID_ABOUT } } IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "��" +CAPTION "运行" FONT 8, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "��&C��", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + CONTROL "命令(&C):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "��Ϊ��ӣ�&S��", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "ȷ��", 1, 158, 6, 47, 14 - PUSHBUTTON "ȡ��", 2, 158, 23, 47, 14 - PUSHBUTTON "��&H��", 254, 158, 43, 47, 14 + CONTROL "作为连接(&S)", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 + DEFPUSHBUTTON "确定", 1, 158, 6, 47, 14 + PUSHBUTTON "取消", 2, 158, 23, 47, 14 + PUSHBUTTON "帮助(&H)", 254, 158, 43, 47, 14 } + +#pragma code_page(default)

1 0

Hongbo Ni : notepad: Convert simplified Chinese resource to utf8.
by Alexandre Julliard Aug. 27, 2008

Aug. 27, 2008

Module: wine Branch: master Commit: e3712879719faed51116bef658d7aafd81057b9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3712879719faed51116bef65… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Tue Aug 26 22:46:49 2008 +1000 notepad: Convert simplified Chinese resource to utf8. --- programs/notepad/Zh.rc | 119 +++++++++++++++++++++++++----------------------- 1 files changed, 62 insertions(+), 57 deletions(-) diff --git a/programs/notepad/Zh.rc b/programs/notepad/Zh.rc index 57dea33..93e23b7 100644 --- a/programs/notepad/Zh.rc +++ b/programs/notepad/Zh.rc @@ -18,44 +18,47 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* Chinese text is encoded in UTF-8 */ +#pragma code_page(65001) + MAIN_MENU MENU LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED { - POPUP "�ļ��&F��" { - MENUITEM "�½��&N��\tCtrl+N", CMD_NEW - MENUITEM "�򿪣�&O��...\tCtrl+O", CMD_OPEN - MENUITEM "��棨&S��\tCtrl+S", CMD_SAVE - MENUITEM "��Ϊ(&A)...", CMD_SAVE_AS + POPUP "文件(&F)" { + MENUITEM "新建(&N)\tCtrl+N", CMD_NEW + MENUITEM "打开(&O)...\tCtrl+O", CMD_OPEN + MENUITEM "保存(&S)\tCtrl+S", CMD_SAVE + MENUITEM "另存为(&A)...", CMD_SAVE_AS MENUITEM SEPARATOR - MENUITEM "��ӡ��&P��...\tCtrl+P", CMD_PRINT - MENUITEM "ҳ��ã�&T��...", CMD_PAGE_SETUP - MENUITEM "��ӡ��ã�&R��...", CMD_PRINTER_SETUP + MENUITEM "打印(&P)...\tCtrl+P", CMD_PRINT + MENUITEM "页面设置(&T)...", CMD_PAGE_SETUP + MENUITEM "打印设置(&R)...", CMD_PRINTER_SETUP MENUITEM SEPARATOR - MENUITEM "�˳��&E��", CMD_EXIT + MENUITEM "退出(&E)", CMD_EXIT } -POPUP "�༭��&E��" { - MENUITEM "��&U��\tCtrl+Z", CMD_UNDO +POPUP "编辑(&E)" { + MENUITEM "撤消(&U)\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR - MENUITEM "��У�&T��\tCtrl+X", CMD_CUT - MENUITEM "��ƣ�&C��\tCtrl+C", CMD_COPY - MENUITEM "ճ��&P��\tCtrl+V", CMD_PASTE - MENUITEM "ɾ��&D��\tDel", CMD_DELETE + MENUITEM "剪切(&T)\tCtrl+X", CMD_CUT + MENUITEM "复制(&C)\tCtrl+C", CMD_COPY + MENUITEM "粘贴(&P)\tCtrl+V", CMD_PASTE + MENUITEM "删除(&D)\tDel", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "ȫѡ��&A��", CMD_SELECT_ALL - MENUITEM "��ڡ�ʱ�䣨&T��\tF5", CMD_TIME_DATE + MENUITEM "全选(&A)", CMD_SELECT_ALL + MENUITEM "插入日期、时间(&T)\tF5", CMD_TIME_DATE MENUITEM SEPARATOR - MENUITEM "�Զ��У�&W��", CMD_WRAP - MENUITEM "��壨&F��...", CMD_FONT /* FIXME */ + MENUITEM "自动换行(&W)", CMD_WRAP + MENUITEM "字体(&F)...", CMD_FONT } -POPUP "��&S��" { - MENUITEM "��&S��...", CMD_SEARCH - MENUITEM "��һ��&S��\tF3", CMD_SEARCH_NEXT +POPUP "搜索(&S)" { + MENUITEM "搜索(&S)...", CMD_SEARCH + MENUITEM "搜索下一个(&S)\tF3", CMD_SEARCH_NEXT } -POPUP "��&H��" { - MENUITEM "��ݣ�&C��", CMD_HELP_CONTENTS - MENUITEM "��&S��...", CMD_HELP_SEARCH - MENUITEM "��ʹ�ð��&H��", CMD_HELP_ON_HELP +POPUP "帮助(&H)" { + MENUITEM "内容(&C)", CMD_HELP_CONTENTS + MENUITEM "搜索(&S)...", CMD_HELP_SEARCH + MENUITEM "如何使用帮助(&H)", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "��ڼ��±��&A��", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "关于记事本(&A)", CMD_HELP_ABOUT_NOTEPAD } } @@ -65,53 +68,55 @@ DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 10, "MS Shell Dlg" -CAPTION "ҳ��" +CAPTION "页面设置" { -LTEXT "ҳü��&H��:", 0x140, 10, 07, 40, 15 +LTEXT "页眉(&H):", 0x140, 10, 07, 40, 15 EDITTEXT IDC_PAGESETUP_HEADERVALUE, 60, 05,110, 12, WS_BORDER | WS_TABSTOP -LTEXT "��ע��&F��:", 0x142, 10, 24, 40, 15 +LTEXT "脚注(&F):", 0x142, 10, 24, 40, 15 EDITTEXT IDC_PAGESETUP_FOOTERVALUE, 60, 22,110, 12, WS_BORDER | WS_TABSTOP -GROUPBOX "��Ե�հף�&M��", 0x144, 10, 43,160, 45 -LTEXT "��&L��", 0x145, 20, 55, 30, 10, WS_CHILD +GROUPBOX "边缘空白(&M):", 0x144, 10, 43,160, 45 +LTEXT "左(&L):", 0x145, 20, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_LEFTVALUE, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "�ϣ�&T��", 0x148, 20, 73, 30, 10, WS_CHILD +LTEXT "上(&T):", 0x148, 20, 73, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_TOPVALUE, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "�ң�&R��", 0x14B, 100, 55, 30, 10, WS_CHILD +LTEXT "右(&R):", 0x14B, 100, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_RIGHTVALUE, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "�£�&B��", 0x14E,100, 73, 30, 10, WS_CHILD +LTEXT "下(&B):", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_BOTTOMVALUE, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "ȷ��", IDOK, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "ȡ��", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "��&H��", IDHELP, 180, 39, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "确定", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "取消", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "帮助(&H)", IDHELP, 180, 39, 40, 15, WS_TABSTOP } STRINGTABLE DISCARDABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED { STRING_PAGESETUP_HEADERVALUE, "&f" -STRING_PAGESETUP_FOOTERVALUE, "&p ҳ" +STRING_PAGESETUP_FOOTERVALUE, "&p 页" -STRING_NOTEPAD, "��±�" -STRING_ERROR, "��" -STRING_WARNING, "��" -STRING_INFO, "��Ϣ" +STRING_NOTEPAD, "记事本" +STRING_ERROR, "错误" +STRING_WARNING, "警告" +STRING_INFO, "信息" -STRING_UNTITLED, "��δ��" +STRING_UNTITLED, "(未命名)" -STRING_ALL_FILES, "��ļ� (*.*)" -STRING_TEXT_FILES_TXT, "�ı��ļ� (*.txt)" +STRING_ALL_FILES, "所有文件 (*.*)" +STRING_TEXT_FILES_TXT, "文本文件 (*.txt)" -STRING_TOOLARGE, "��±��ܴ� '%s' ��ô��ļ��\n \ -��ʹ�ñ�ı༭��" -STRING_NOTEXT, "��û��κ��ı�� \ -\n��һЩ��" -STRING_DOESNOTEXIST, "�ļ� '%s'\n��\n\n \ -��½�һ��ļ��" -STRING_NOTSAVED, "�ļ� '%s'\n��Ѹ��\n\n \ -�Ƿ񱣴��ģ�" -STRING_NOTFOUND, "�Ҳ��ļ� '%s'" -STRING_OUT_OF_MEMORY, "û��㹻��ڴ��ɴ�� \ -\n��ر�һЩ��ʩ��ڴ��ԡ�" +STRING_TOOLARGE, "记事本不能打开 '%s' 这么大的文件。\n \ +请使用别的编辑器。" +STRING_NOTEXT, "您没有输入任何文本。 \ +\n请输入一些再试" +STRING_DOESNOTEXIST, "文件 '%s'\n不存在\n\n \ +您想新建一个文件吗？" +STRING_NOTSAVED, "文件 '%s'\n正文已更改\n\n \ +是否保存更改？" +STRING_NOTFOUND, "找不到文件 '%s'" +STRING_OUT_OF_MEMORY, "没有足够的内存可以用来完成此项任务。 \ +\n请关闭一些程序后再试。" } + +#pragma code_page(default)

1 0

Nikolay Sivov : gdiplus: Implemented GdipGetClip.
by Alexandre Julliard Aug. 27, 2008

Aug. 27, 2008

Module: wine Branch: master Commit: ef50aa330ef66d429c84a6a81a21c3d72f426175 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef50aa330ef66d429c84a6a81… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Aug 27 02:03:27 2008 +0400 gdiplus: Implemented GdipGetClip. --- dlls/gdiplus/gdiplus.c | 22 ++++++++++++++++++++++ dlls/gdiplus/gdiplus_private.h | 17 +++++++++++++++-- dlls/gdiplus/graphics.c | 22 ++++++++++++++++++++-- dlls/gdiplus/region.c | 29 ----------------------------- dlls/gdiplus/tests/graphics.c | 4 ++-- 5 files changed, 59 insertions(+), 35 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 5e449e2..17e4d33 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -344,3 +344,25 @@ BOOL lengthen_path(GpPath *path, INT len) return TRUE; } + +/* recursive deletion of GpRegion nodes */ +inline void delete_element(region_element* element) +{ + switch(element->type) + { + case RegionDataRect: + break; + case RegionDataPath: + GdipDeletePath(element->elementdata.pathdata.path); + break; + case RegionDataEmptyRect: + case RegionDataInfiniteRect: + break; + default: + delete_element(element->elementdata.combine.left); + delete_element(element->elementdata.combine.right); + GdipFree(element->elementdata.combine.left); + GdipFree(element->elementdata.combine.right); + break; + } +} diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 8df1c74..4eb847c 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -54,6 +54,9 @@ extern void calc_curve_bezier_endp(REAL xend, REAL yend, REAL xadj, REAL yadj, extern BOOL lengthen_path(GpPath *path, INT len); +typedef struct region_element region_element; +extern inline void delete_element(region_element *element); + static inline INT roundr(REAL x) { return (INT) floorf(x + 0.5); @@ -96,6 +99,7 @@ struct GpGraphics{ REAL scale; /* page scale */ GpMatrix * worldtrans; /* world transform */ BOOL busy; /* hdc handle obtained by GdipGetDC */ + GpRegion *clip; }; struct GpBrush{ @@ -218,7 +222,16 @@ struct GpFontFamily{ WCHAR FamilyName[LF_FACESIZE]; }; -typedef struct region_element +/* internal use */ +typedef enum RegionType +{ + RegionDataRect = 0x10000000, + RegionDataPath = 0x10000001, + RegionDataEmptyRect = 0x10000002, + RegionDataInfiniteRect = 0x10000003, +} RegionType; + +struct region_element { DWORD type; /* Rectangle, Path, SpecialRectangle, or CombineMode */ union @@ -241,7 +254,7 @@ typedef struct region_element struct region_element *right; /* what *left was combined with */ } combine; } elementdata; -} region_element; +}; struct GpRegion{ struct diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index bf3a638..d5b562c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -743,6 +743,12 @@ GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **gra return retval; } + if((retval = GdipCreateRegion(&(*graphics)->clip)) != Ok){ + GdipFree((*graphics)->worldtrans); + GdipFree(*graphics); + return retval; + } + (*graphics)->hdc = hdc; (*graphics)->hwnd = NULL; (*graphics)->smoothing = SmoothingModeDefault; @@ -894,6 +900,7 @@ GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) if(graphics->hwnd) ReleaseDC(graphics->hwnd, graphics->hdc); + GdipDeleteRegion(graphics->clip); GdipDeleteMatrix(graphics->worldtrans); GdipFree(graphics); @@ -2874,14 +2881,25 @@ GpStatus WINGDIPAPI GdipReleaseDC(GpGraphics *graphics, HDC hdc) GpStatus WINGDIPAPI GdipGetClip(GpGraphics *graphics, GpRegion *region) { + GpRegion *clip; + GpStatus status; + + TRACE("(%p, %p)\n", graphics, region); + if(!graphics || !region) return InvalidParameter; if(graphics->busy) return ObjectBusy; - FIXME("(%p, %p): stub\n", graphics, region); - return NotImplemented; + if((status = GdipCloneRegion(graphics->clip, &clip)) != Ok) + return status; + + /* free everything except root node and header */ + delete_element(&region->node); + memcpy(region, clip, sizeof(GpRegion)); + + return Ok; } GpStatus WINGDIPAPI GdipTransformPoints(GpGraphics *graphics, GpCoordinateSpace dst_space, diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index b814450..addc2d2 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -73,14 +73,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); * */ -typedef enum RegionType -{ - RegionDataRect = 0x10000000, - RegionDataPath = 0x10000001, - RegionDataEmptyRect = 0x10000002, - RegionDataInfiniteRect = 0x10000003, -} RegionType; - #define FLAGS_NOFLAGS 0x0 #define FLAGS_INTPATH 0x4000 @@ -141,27 +133,6 @@ static inline GpStatus init_region(GpRegion* region, const RegionType type) return Ok; } -static inline void delete_element(region_element* element) -{ - switch(element->type) - { - case RegionDataRect: - break; - case RegionDataPath: - GdipDeletePath(element->elementdata.pathdata.path); - break; - case RegionDataEmptyRect: - case RegionDataInfiniteRect: - break; - default: - delete_element(element->elementdata.combine.left); - delete_element(element->elementdata.combine.right); - GdipFree(element->elementdata.combine.left); - GdipFree(element->elementdata.combine.right); - break; - } -} - static inline GpStatus clone_element(const region_element* element, region_element** element2) { diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 082ffe8..a468de9 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -791,10 +791,10 @@ static void test_getclip(void) res = FALSE; status = GdipGetClip(graphics, clip); - todo_wine expect(Ok, status); + expect(Ok, status); status = GdipIsInfiniteRegion(clip, graphics, &res); expect(Ok, status); - todo_wine expect(TRUE, res); + expect(TRUE, res); GdipDeleteRegion(clip);

1 0

Nikolay Sivov : gdiplus: Fix for GpRegion clone helper.
by Alexandre Julliard Aug. 27, 2008

Aug. 27, 2008

Module: wine Branch: master Commit: 740bc043cb2cb23410864517eb7128b8d5b18ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=740bc043cb2cb23410864517e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Aug 27 02:03:23 2008 +0400 gdiplus: Fix for GpRegion clone helper. --- dlls/gdiplus/region.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 45d0e51..b814450 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -167,9 +167,12 @@ static inline GpStatus clone_element(const region_element* element, { GpStatus stat; - *element2 = GdipAlloc(sizeof(region_element)); - if (!*element2) - return OutOfMemory; + /* root node is allocated with GpRegion */ + if(!*element2){ + *element2 = GdipAlloc(sizeof(region_element)); + if (!*element2) + return OutOfMemory; + } (*element2)->type = element->type; @@ -188,6 +191,9 @@ static inline GpStatus clone_element(const region_element* element, if (stat != Ok) goto clone_out; break; default: + (*element2)->elementdata.combine.left = NULL; + (*element2)->elementdata.combine.right = NULL; + stat = clone_element(element->elementdata.combine.left, &(*element2)->elementdata.combine.left); if (stat != Ok) goto clone_out; @@ -344,7 +350,7 @@ GpStatus WINGDIPAPI GdipCombineRegionRectI(GpRegion *region, GpStatus WINGDIPAPI GdipCombineRegionRegion(GpRegion *region1, GpRegion *region2, CombineMode mode) { - region_element *left, *right; + region_element *left, *right = NULL; GpStatus stat; TRACE("%p %p %d\n", region1, region2, mode);

1 0

Nikolay Sivov : gdiplus: Add gdiplus debug channel to matrix.c.
by Alexandre Julliard Aug. 27, 2008

Aug. 27, 2008

Module: wine Branch: master Commit: 0940154bd0a82f8b77af62e812ea79a079a25e42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0940154bd0a82f8b77af62e81… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Aug 27 02:03:19 2008 +0400 gdiplus: Add gdiplus debug channel to matrix.c. --- dlls/gdiplus/matrix.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index a29508d..008dcae 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -27,6 +27,9 @@ #include "gdiplus.h" #include "gdiplus_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); /* Multiplies two matrices of the form *

1 0

Nikolay Sivov : gdiplus: GdipPathIterNextPathType stub added with test.
by Alexandre Julliard Aug. 27, 2008

Aug. 27, 2008

Module: wine Branch: master Commit: 59a9c1cf96b452ec20c419fc26ac88324396a654 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59a9c1cf96b452ec20c419fc2… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Aug 27 02:03:09 2008 +0400 gdiplus: GdipPathIterNextPathType stub added with test. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pathiterator.c | 13 +++++++++++++ dlls/gdiplus/tests/pathiterator.c | 29 +++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 44 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index c5b7c2f..b45f917 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -458,7 +458,7 @@ @ stdcall GdipPathIterIsValid(ptr ptr) @ stdcall GdipPathIterNextMarker(ptr ptr ptr ptr) @ stdcall GdipPathIterNextMarkerPath(ptr ptr ptr) -@ stub GdipPathIterNextPathType +@ stdcall GdipPathIterNextPathType(ptr ptr ptr ptr ptr) @ stdcall GdipPathIterNextSubpath(ptr ptr ptr ptr ptr) @ stdcall GdipPathIterNextSubpathPath(ptr ptr ptr ptr) @ stdcall GdipPathIterRewind(ptr) diff --git a/dlls/gdiplus/pathiterator.c b/dlls/gdiplus/pathiterator.c index d6a6850..b60e5f6 100644 --- a/dlls/gdiplus/pathiterator.c +++ b/dlls/gdiplus/pathiterator.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2007 Google (Evan Stade) + * Copyright (C) 2008 Nikolay Sivov <bunglehead at gmail dot com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,6 +27,9 @@ #include "gdiplus.h" #include "gdiplus_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); GpStatus WINGDIPAPI GdipCreatePathIter(GpPathIterator **iterator, GpPath* path) { @@ -262,6 +266,15 @@ GpStatus WINGDIPAPI GdipPathIterIsValid(GpPathIterator* iterator, BOOL* valid) return Ok; } +GpStatus WINGDIPAPI GdipPathIterNextPathType(GpPathIterator* iter, INT* result, + BYTE* type, INT* start, INT* end) +{ + if(!iter || !result || !type || !start || !end) + return InvalidParameter; + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipPathIterNextSubpathPath(GpPathIterator* iter, INT* result, GpPath* path, BOOL* closed) { diff --git a/dlls/gdiplus/tests/pathiterator.c b/dlls/gdiplus/tests/pathiterator.c index 6995b18..79ce879 100644 --- a/dlls/gdiplus/tests/pathiterator.c +++ b/dlls/gdiplus/tests/pathiterator.c @@ -476,6 +476,34 @@ static void test_nextsubpath(void) GdipDeletePath(path); } +static void test_nextpathtype(void) +{ + GpPath *path; + GpPathIterator *iter; + GpStatus stat; + INT start, end, result; + BYTE type; + + GdipCreatePath(FillModeAlternate, &path); + GdipCreatePathIter(&iter, path); + + /* NULL arguments */ + stat = GdipPathIterNextPathType(NULL, NULL, NULL, NULL, NULL); + expect(InvalidParameter, stat); + stat = GdipPathIterNextPathType(iter, NULL, NULL, NULL, NULL); + expect(InvalidParameter, stat); + stat = GdipPathIterNextPathType(iter, &result, NULL, NULL, NULL); + expect(InvalidParameter, stat); + stat = GdipPathIterNextPathType(iter, NULL, &type, NULL, NULL); + expect(InvalidParameter, stat); + stat = GdipPathIterNextPathType(iter, NULL, NULL, &start, &end); + expect(InvalidParameter, stat); + stat = GdipPathIterNextPathType(iter, NULL, &type, &start, &end); + expect(InvalidParameter, stat); + + GdipDeletePath(path); +} + START_TEST(pathiterator) { struct GdiplusStartupInput gdiplusStartupInput; @@ -496,6 +524,7 @@ START_TEST(pathiterator) test_isvalid(); test_nextsubpathpath(); test_nextsubpath(); + test_nextpathtype(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 251d81d..3af0692 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -336,6 +336,7 @@ GpStatus WINGDIPAPI GdipPathIterCopyData(GpPathIterator*,INT*,GpPointF*,BYTE*, INT,INT); GpStatus WINGDIPAPI GdipPathIterNextMarker(GpPathIterator*,INT*,INT*,INT*); GpStatus WINGDIPAPI GdipPathIterNextMarkerPath(GpPathIterator*,INT*,GpPath*); +GpStatus WINGDIPAPI GdipPathIterNextPathType(GpPathIterator*,INT*,BYTE*,INT*,INT*); GpStatus WINGDIPAPI GdipPathIterNextSubpath(GpPathIterator*,INT*,INT*,INT*,BOOL*); GpStatus WINGDIPAPI GdipPathIterNextSubpathPath(GpPathIterator*,INT*,GpPath*,BOOL*); GpStatus WINGDIPAPI GdipPathIterRewind(GpPathIterator*);

1 0

Alexander Nicolaysen Sørnes : regedit: Convert menu & statusbar handling to unicode.
by Alexandre Julliard Aug. 27, 2008

Aug. 27, 2008

Module: wine Branch: master Commit: 46ea43e677b091f677ebdea41846b1ee2723943c URL: http://source.winehq.org/git/wine.git/?a=commit;h=46ea43e677b091f677ebdea41… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Aug 26 19:55:35 2008 +0200 regedit: Convert menu & statusbar handling to unicode. --- programs/regedit/framewnd.c | 32 ++++++++++++++++++-------------- programs/regedit/main.c | 9 +++++---- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 1a91826..eb248c9 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -31,6 +31,7 @@ #include "main.h" #include "regproc.h" +#include "wine/unicode.h" /******************************************************************************** * Global and Local Variables: @@ -82,12 +83,13 @@ static void resize_frame_client(HWND hWnd) static void OnEnterMenuLoop(HWND hWnd) { int nParts; + WCHAR empty = 0; /* Update the status bar pane sizes */ nParts = -1; - SendMessage(hStatusBar, SB_SETPARTS, 1, (long)&nParts); + SendMessageW(hStatusBar, SB_SETPARTS, 1, (long)&nParts); bInMenuLoop = TRUE; - SendMessage(hStatusBar, SB_SETTEXT, (WPARAM)0, (LPARAM)_T("")); + SendMessageW(hStatusBar, SB_SETTEXTW, (WPARAM)0, (LPARAM)&empty); } static void OnExitMenuLoop(HWND hWnd) @@ -102,8 +104,8 @@ static void UpdateMenuItems(HMENU hMenu) { HWND hwndTV = g_pChildWnd->hTreeWnd; BOOL bAllowEdit = FALSE; HKEY hRootKey = NULL; - LPCTSTR keyName; - keyName = GetItemPath(hwndTV, TreeView_GetSelection(hwndTV), &hRootKey); + LPWSTR keyName; + keyName = GetItemPathW(hwndTV, TreeView_GetSelection(hwndTV), &hRootKey); if (GetFocus() != hwndTV || (keyName && *keyName)) { /* can't modify root keys, but allow for their values */ bAllowEdit = TRUE; } @@ -115,6 +117,8 @@ static void UpdateMenuItems(HMENU hMenu) { EnableMenuItem(hMenu, ID_FAVORITES_ADDTOFAVORITES, (hRootKey ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); EnableMenuItem(hMenu, ID_FAVORITES_REMOVEFAVORITE, (GetMenuItemCount(hMenu)>2 ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); + + HeapFree(GetProcessHeap(), 0, keyName); } static void OnInitMenuPopup(HWND hWnd, HMENU hMenu, short wItem) @@ -154,23 +158,23 @@ static void OnInitMenuPopup(HWND hWnd, HMENU hMenu, short wItem) static void OnMenuSelect(HWND hWnd, UINT nItemID, UINT nFlags, HMENU hSysMenu) { - TCHAR str[100]; + WCHAR str[100]; - _tcscpy(str, _T("")); + str[0] = 0; if (nFlags & MF_POPUP) { if (hSysMenu != GetMenu(hWnd)) { if (nItemID == 2) nItemID = 5; } } - if (LoadString(hInst, nItemID, str, 100)) { + if (LoadStringW(hInst, nItemID, str, 100)) { /* load appropriate string*/ - LPTSTR lpsz = str; + LPWSTR lpsz = str; /* first newline terminates actual string*/ - lpsz = _tcschr(lpsz, '\n'); + lpsz = strchrW(lpsz, '\n'); if (lpsz != NULL) *lpsz = '\0'; } - SendMessage(hStatusBar, SB_SETTEXT, 0, (LPARAM)str); + SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)str); } void SetupStatusBar(HWND hWnd, BOOL bResize) @@ -181,15 +185,15 @@ void SetupStatusBar(HWND hWnd, BOOL bResize) nParts = rc.right; /* nParts = -1;*/ if (bResize) - SendMessage(hStatusBar, WM_SIZE, 0, 0); - SendMessage(hStatusBar, SB_SETPARTS, 1, (LPARAM)&nParts); + SendMessageW(hStatusBar, WM_SIZE, 0, 0); + SendMessageW(hStatusBar, SB_SETPARTS, 1, (LPARAM)&nParts); UpdateStatusBar(); } void UpdateStatusBar(void) { - LPTSTR fullPath = GetItemFullPath(g_pChildWnd->hTreeWnd, NULL, TRUE); - SendMessage(hStatusBar, SB_SETTEXT, 0, (LPARAM)fullPath); + LPWSTR fullPath = GetItemFullPathW(g_pChildWnd->hTreeWnd, NULL, TRUE); + SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)fullPath); HeapFree(GetProcessHeap(), 0, fullPath); } diff --git a/programs/regedit/main.c b/programs/regedit/main.c index 5661b26..3033d7d 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -80,6 +80,7 @@ const TCHAR szChildClass[] = {'R','E','G','E','D','I','T',0}; static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) { + WCHAR empty = 0; WNDCLASSEX wcFrame = { sizeof(WNDCLASSEX), CS_HREDRAW | CS_VREDRAW/*style*/, @@ -116,8 +117,8 @@ static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) ATOM hChildWndClass = RegisterClassEx(&wcChild); /* register child windows class */ hChildWndClass = hChildWndClass; /* warning eater */ - hMenuFrame = LoadMenu(hInstance, MAKEINTRESOURCE(IDR_REGEDIT_MENU)); - hPopupMenus = LoadMenu(hInstance, MAKEINTRESOURCE(IDR_POPUP_MENUS)); + hMenuFrame = LoadMenuW(hInstance, MAKEINTRESOURCEW(IDR_REGEDIT_MENU)); + hPopupMenus = LoadMenuW(hInstance, MAKEINTRESOURCEW(IDR_POPUP_MENUS)); /* Initialize the Windows Common Controls DLL */ InitCommonControls(); @@ -140,8 +141,8 @@ static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) } /* Create the status bar */ - hStatusBar = CreateStatusWindow(WS_VISIBLE|WS_CHILD|WS_CLIPSIBLINGS|SBT_NOBORDERS, - _T(""), hFrameWnd, STATUS_WINDOW); + hStatusBar = CreateStatusWindowW(WS_VISIBLE|WS_CHILD|WS_CLIPSIBLINGS|SBT_NOBORDERS, + &empty, hFrameWnd, STATUS_WINDOW); if (hStatusBar) { /* Create the status bar panes */ SetupStatusBar(hFrameWnd, FALSE);

1 0

Alexander Nicolaysen Sørnes : regedit: Add listview entries as unicode.
by Alexandre Julliard Aug. 27, 2008

Aug. 27, 2008

Module: wine Branch: master Commit: c6d01ac847edc2ad02ef02c7a0ead7a833539c3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6d01ac847edc2ad02ef02c7a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Aug 26 20:57:23 2008 +0200 regedit: Add listview entries as unicode. --- programs/regedit/listview.c | 92 +++++++++++++++++++++++++------------------ 1 files changed, 54 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c6d01ac847edc2ad02ef0…

1 0

Alexander Nicolaysen Sørnes : regedit: Ignore case when sorting values.
by Alexandre Julliard Aug. 27, 2008

Aug. 27, 2008

Module: wine Branch: master Commit: 1def017ecd5587409725d48b6107aa33aa0a0c47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1def017ecd5587409725d48b6… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Aug 26 22:52:09 2008 +0200 regedit: Ignore case when sorting values. --- programs/regedit/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 0831306..1091d8d 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -343,7 +343,7 @@ static int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSor if (g_columnToSort == 2) { /* FIXME: Sort on value */ } - return g_invertSort ? lstrcmpW(r->name, l->name) : lstrcmpW(l->name, r->name); + return g_invertSort ? lstrcmpiW(r->name, l->name) : lstrcmpiW(l->name, r->name); } HWND StartValueRename(HWND hwndLV)

1 0

Alexander Nicolaysen Sørnes : regedit: Fix leak in GetItemFullPathW.
by Alexandre Julliard Aug. 27, 2008

Aug. 27, 2008

Module: wine Branch: master Commit: b0a8b667893688061bfb4b90a25428c370dc6848 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0a8b667893688061bfb4b90a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Aug 26 20:02:59 2008 +0200 regedit: Fix leak in GetItemFullPathW. --- programs/regedit/childwnd.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 76f354d..842d183 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -215,6 +215,7 @@ LPWSTR GetItemFullPathW(HWND hwndTV, HTREEITEM hItem, BOOL bFull) { parts[1] = GetItemPathW(hwndTV, hItem, &hRootKey); ret = CombinePathsW((LPCWSTR *)parts, 2); HeapFree(GetProcessHeap(), 0, parts[0]); + HeapFree(GetProcessHeap(), 0, parts[1]); return ret; }

1 0