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

Michael Karcher : ntdll: Fix ProcessExecuteFlag logic.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: 137799cbfce5ce51d727ebd8b0194e275ca96e6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=137799cbfce5ce51d727ebd8b… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun Jul 26 19:58:46 2009 +0200 ntdll: Fix ProcessExecuteFlag logic. --- dlls/ntdll/process.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 6258569..265aa2e 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -416,10 +416,10 @@ NTSTATUS WINAPI NtSetInformationProcess( switch (*(ULONG *)ProcessInformation & (MEM_EXECUTE_OPTION_ENABLE|MEM_EXECUTE_OPTION_DISABLE)) { case MEM_EXECUTE_OPTION_ENABLE: - enable = FALSE; + enable = TRUE; break; case MEM_EXECUTE_OPTION_DISABLE: - enable = TRUE; + enable = FALSE; break; default: return STATUS_INVALID_PARAMETER;

1 0

Michael Karcher : ntdll: Fix get_server_context_flags.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: 89d4402cc524837c61f61594a364e3797adbfc86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89d4402cc524837c61f61594a… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sat Jul 25 14:23:31 2009 +0200 ntdll: Fix get_server_context_flags. --- dlls/ntdll/thread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 0c73ffd..c2d839c 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -794,7 +794,7 @@ static inline unsigned int get_server_context_flags( DWORD flags ) { unsigned int ret = 0; - flags &= ~0x3f; /* mask CPU id flags */ + flags &= 0x3f; /* mask CPU id flags */ if (flags & CONTEXT_CONTROL) ret |= SERVER_CTX_CONTROL; if (flags & CONTEXT_INTEGER) ret |= SERVER_CTX_INTEGER; #ifdef CONTEXT_SEGMENTS

1 0

Hwang YunSong : shdoclc: Updated Korean resource.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: dd4e9d34e1a420058434338ef665985abd30a151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd4e9d34e1a420058434338ef… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Jul 30 15:51:58 2009 +0900 shdoclc: Updated Korean resource. --- dlls/shdoclc/Ko.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shdoclc/Ko.rc b/dlls/shdoclc/Ko.rc index 6bf28d1..c30c21d 100644 --- a/dlls/shdoclc/Ko.rc +++ b/dlls/shdoclc/Ko.rc @@ -23,12 +23,12 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_MESSAGE_BOX_TITLE, "Wine ��ͳ� Explorer" + IDS_MESSAGE_BOX_TITLE, "Wine ��ͳ� �ͽ��ξ�r" } STRINGTABLE DISCARDABLE { - IDS_PRINT_HEADER_TEMPLATE "&w&bPage &p" /* FIXME: should be "&w&bPage &p of &P" */ + IDS_PRINT_HEADER_TEMPLATE "&w&b�� &p" /* FIXME: should be "&w&bPage &p of &P" */ IDS_PRINT_FOOTER_TEMPLATE "&u&b&d" }

1 0

Hwang YunSong : wordpad: Updated Korean resource.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: 15ff2246b8fd4e8f1f6f8f40ec697721fdcf724a URL: http://source.winehq.org/git/wine.git/?a=commit;h=15ff2246b8fd4e8f1f6f8f40e… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Jul 30 15:45:28 2009 +0900 wordpad: Updated Korean resource. --- programs/wordpad/Ko.rc | 29 +++++++++-------------------- 1 files changed, 9 insertions(+), 20 deletions(-) diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index 5823585..2e460af 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -180,12 +180,17 @@ END STRINGTABLE DISCARDABLE BEGIN - STRING_RICHTEXT_FILES_RTF, "��ġ �ؽ�Ʈ �� (*.rtf)" - STRING_TEXT_FILES_TXT, "�ؽ�Ʈ �� (*.txt)" - STRING_TEXT_FILES_UNICODE_TXT, "��ڵ� �ؽ�Ʈ ��(*.txt)" - STRING_ALL_FILES, "�� (*.*)" + STRING_ALL_FILES, "�� (*.*)" + STRING_TEXT_FILES_TXT, "�ؽ�Ʈ �� (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "��ڵ� �ؽ�Ʈ �� (*.txt)" + STRING_RICHTEXT_FILES_RTF, "��ġ �ؽ�Ʈ �� (*.rtf)" + STRING_NEWFILE_RICHTEXT, "��ġ �ؽ�Ʈ ��" + STRING_NEWFILE_TXT, "�ؽ�Ʈ ��" + STRING_NEWFILE_TXT_UNICODE, "��ڵ� �ؽ�Ʈ ��" + STRING_PRINTER_FILES_PRN, "�� (*.PRN)" END + STRINGTABLE DISCARDABLE BEGIN STRING_ALIGN_LEFT, "��" @@ -195,18 +200,6 @@ END STRINGTABLE DISCARDABLE BEGIN - STRING_NEWFILE_RICHTEXT, "��ġ �ؽ�Ʈ ��" - STRING_NEWFILE_TXT, "�ؽ�Ʈ ��" - STRING_NEWFILE_TXT_UNICODE, "��ڵ� �ؽ�Ʈ ��" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_PRINTER_FILES_PRN, "�� (*.PRN)" -END - -STRINGTABLE DISCARDABLE -BEGIN STRING_VIEWPROPS_TITLE, "�ɼ�" STRING_VIEWPROPS_TEXT, "�ؽ�Ʈ" STRING_VIEWPROPS_RICHTEXT, "��ġ �ؽ�Ʈ" @@ -220,10 +213,6 @@ BEGIN STRING_PREVIEW_TWOPAGES, "�� " STRING_PREVIEW_ONEPAGE, "�� " STRING_PREVIEW_CLOSE, "�ݱ�" -END - -STRINGTABLE DISCARDABLE -BEGIN STRING_UNITS_CM, "cm" END

1 0

Hwang YunSong : shell32: Updated Korean resource.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: eaf0d12d1dcd5c78c58c95a185164f3111711d71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf0d12d1dcd5c78c58c95a18… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Jul 30 09:08:33 2009 +0900 shell32: Updated Korean resource. --- dlls/shell32/shell32_Ko.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shell32_Ko.rc b/dlls/shell32/shell32_Ko.rc index 91a327e..808ae28 100644 --- a/dlls/shell32/shell32_Ko.rc +++ b/dlls/shell32/shell32_Ko.rc @@ -175,7 +175,7 @@ FONT 10, "MS Shell Dlg" LTEXT "", IDC_ABOUT_STATIC_TEXT1, 42, 10, 170, 10 LTEXT "", IDC_ABOUT_STATIC_TEXT2, 42, 22, 170, 10 LTEXT "%s ��", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 - LTEXT "Wine was brought to you by:", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 + LTEXT "Wine �� ֽ� ��:", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 } @@ -279,9 +279,9 @@ IDS_MYPICTURES " IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" IDS_COMMON_DOCUMENTS "��" IDS_ADMINTOOLS "��۸޴�\\��α׷�\\�� " -IDS_COMMON_MUSIC "��\\�� " -IDS_COMMON_PICTURES "��\\�� ׸�" -IDS_COMMON_VIDEO "��\\�� " +IDS_COMMON_MUSIC "�� " +IDS_COMMON_PICTURES "�� ׸�" +IDS_COMMON_VIDEO "�� " IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" IDS_NEWFOLDER "�� "

1 0

Hwang YunSong : cryptui: Updated Korean resource.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: 70da51371e9e36625b61ecea466fef66a8cc64b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70da51371e9e36625b61ecea4… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Jul 29 16:29:30 2009 +0900 cryptui: Updated Korean resource. --- dlls/cryptui/cryptui_Ko.rc | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/cryptui/cryptui_Ko.rc b/dlls/cryptui/cryptui_Ko.rc index 2533a4e..6606411 100644 --- a/dlls/cryptui/cryptui_Ko.rc +++ b/dlls/cryptui/cryptui_Ko.rc @@ -282,13 +282,13 @@ IDD_IMPORT_WELCOME DIALOG DISCARDABLE 0,0,317,143 CAPTION "�� " FONT 8, "MS Shell Dlg" BEGIN - LTEXT "�� 翡 �� ȯ��մϴ�", IDC_IMPORT_TITLE,115,1,195,40 - LTEXT "�� Ϸκ�� ,�� ı� ��,�� ŷ� �� ҿ� �� ݴϴ�.",-1, 115,33,195,16 + LTEXT "�� 翡 �� ȯ��մϴ�", IDC_IMPORT_TITLE,115,7,195,12 + LTEXT "�� Ϸκ�� ,�� ı� ��,�� ŷ� �� ҿ� �� ݴϴ�.",-1, 115,26,195,25 LTEXT "�� ̳� �� ſ� ��ϴ� ��ǻ�͸� �ſ��ϴ� �� ˴ϴ�. �� ޼�� ϰ� ��ϴ� �� ˴ϴ�. �� Ҵ� ��, �� ı� ��, �� ŷ� �� Դϴ�.",-1, 115,56,195,40 LTEXT "��Ϸ��, �� Ŭ��Ͻʽÿ�.",-1, 115,103,195,8 END -IDD_IMPORT_FILE DIALOG DISCARDABLE 0,0,317,143 +IDD_IMPORT_FILE DIALOG DISCARDABLE 0,0,317,178 CAPTION "�� " FONT 8, "MS Shell Dlg" BEGIN @@ -312,7 +312,7 @@ BEGIN PUSHBUTTON "ã��(&R)...", IDC_IMPORT_BROWSE_STORE, 236,49,60,14 END -IDD_IMPORT_FINISH DIALOG DISCARDABLE 0,0,317,143 +IDD_IMPORT_FINISH DIALOG DISCARDABLE 0,0,317,178 CAPTION "�� " FONT 8, "MS Shell Dlg" BEGIN @@ -366,9 +366,9 @@ CAPTION " FONT 8, "MS Shell Dlg" BEGIN LTEXT "�� 翡 �� ȯ��մϴ�", IDC_EXPORT_TITLE, - 115,1,195,40 + 115,7,195,12 LTEXT "�� ,�� ,�� ŷ� �� ҷκ�� Ϸ� �� ̴ٰϴ�.", - -1, 115,33,195,16 + -1, 115,26,195,25 LTEXT " �� ̳� �� ſ� ��ϴ� ��ǻ�͸� �ſ��ϴ� �� ˴ϴ�. �� ޼�� ϰ� ��ϴ� �� ˴ϴ�. �� Ҵ� ��, �� ı� ��, �� ŷ� �� Դϴ�..", -1, 115,56,195,40 LTEXT "�� ϽǷ��, <��>�� Ŭ��Ͻʽÿ�.", @@ -379,8 +379,8 @@ IDD_EXPORT_PRIVATE_KEY DIALOG DISCARDABLE 0,0,317,143 CAPTION "�� " FONT 8, "MS Shell Dlg" BEGIN - LTEXT "�� Ű�� ⸦ ��ϸ�, �� Ű�� ȣ�� ȣ�� Է��ϰ� �� Դϴ�.", -1, 21,1,195,23 - LTEXT "�� Ű�� ⸦ ��մϱ�?", -1, 21,24,195,15 + LTEXT "�� Ű�� ⸦ ��ϸ�, �� Ű�� ȣ�� ȣ�� Է��ϰ� �� Դϴ�.", -1, 21,1,195,25 + LTEXT "�� Ű�� ⸦ ��մϱ�?", -1, 21,27,195,10 AUTORADIOBUTTON "��(&Y), �� Ű ��", IDC_EXPORT_PRIVATE_KEY_YES, 31,36,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP AUTORADIOBUTTON "�ƴϿ�(&O), �� Ű �� ", @@ -432,7 +432,7 @@ BEGIN PUSHBUTTON "ã��(&R)...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14 END -IDD_EXPORT_FINISH DIALOG DISCARDABLE 0,0,317,143 +IDD_EXPORT_FINISH DIALOG DISCARDABLE 0,0,317,178 CAPTION "�� " FONT 8, "MS Shell Dlg" BEGIN

1 0

Aric Stewart : gdi32: Ensure child fonts have names.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: 7214f650efee93e00b76a41cb674ce1c7fb71316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7214f650efee93e00b76a41cb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jul 31 10:44:20 2009 -0500 gdi32: Ensure child fonts have names. --- dlls/gdi32/freetype.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b5ab51a..4723be9 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5804,6 +5804,7 @@ static BOOL load_child_font(GdiFont *font, CHILD_FONT *child) child->font->scale_y = font->scale_y; hfontlist = HeapAlloc(GetProcessHeap(), 0, sizeof(*hfontlist)); hfontlist->hfont = CreateFontIndirectW(&font->font_desc.lf); + child->font->name = strdupW(child->face->family->FamilyName); list_add_head(&child->font->hfontlist, &hfontlist->entry); child->font->base_font = font; list_add_head(&child_font_list, &child->font->entry);

1 0

Dylan Smith : richedit: Prevent using uninitialized nAvailWidth in initialization.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: 05c730fd4c0b80a9cb1b5bc3a955ef5a53a01ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05c730fd4c0b80a9cb1b5bc3a… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Jul 31 11:37:13 2009 -0400 richedit: Prevent using uninitialized nAvailWidth in initialization. --- 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 302ee11..ff26265 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2602,6 +2602,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ES_AUTOHSCROLL|ES_DISABLENOSCROLL); ed->pBuffer = ME_MakeText(); ed->nZoomNumerator = ed->nZoomDenominator = 0; + ed->nAvailWidth = 0; /* wrap to client area */ ME_MakeFirstParagraph(ed); /* The four cursors are for: * 0 - The position where the caret is shown @@ -2634,7 +2635,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->nParagraphs = 1; ed->nLastSelStart = ed->nLastSelEnd = 0; ed->pLastSelStartPara = ed->pLastSelEndPara = ME_FindItemFwd(ed->pBuffer->pFirst, diParagraph); - ed->nAvailWidth = 0; /* wrap to client area */ ed->bHideSelection = FALSE; ed->pfnWordBreak = NULL; ed->lpOleCallback = NULL;

1 0

Dylan Smith : richedit: Prevent buffer overflows in WM_GETTEXT.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: c4b023b1b6d13552e3432f754b1dd3a70b5e5edb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4b023b1b6d13552e3432f754… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jul 30 00:54:21 2009 -0400 richedit: Prevent buffer overflows in WM_GETTEXT. The application AutoGK was getting the length of the text with WM_GETTEXTLENGTH to allocate an appropriate buffer size, but then claimed the buffer was twice the size when sending WM_GETTEXTEX. This caused the memcpy call to overflow the actual buffer since the count is based on the size of the buffer alone, regardless of the amount of text retrieved. --- dlls/riched20/editor.c | 28 ++-------------------------- 1 files changed, 2 insertions(+), 26 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2a6f908..302ee11 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3544,36 +3544,12 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_GETTEXT: { GETTEXTEX ex; - LRESULT rc; - LPSTR bufferA = NULL; - LPWSTR bufferW = NULL; - - if (unicode) - bufferW = heap_alloc((wParam + 2) * sizeof(WCHAR)); - else - bufferA = heap_alloc(wParam + 2); - - ex.cb = (wParam + 2) * (unicode ? sizeof(WCHAR) : sizeof(CHAR)); + ex.cb = wParam * (unicode ? sizeof(WCHAR) : sizeof(CHAR)); ex.flags = GT_USECRLF; ex.codepage = unicode ? 1200 : CP_ACP; ex.lpDefaultChar = NULL; ex.lpUsedDefChar = NULL; - - rc = ME_GetTextEx(editor, &ex, unicode ? (LPARAM)bufferW : (LPARAM)bufferA); - - if (unicode) - { - memcpy((LPWSTR)lParam, bufferW, wParam * sizeof(WCHAR)); - if (strlenW(bufferW) >= wParam) rc = 0; - } - else - { - memcpy((LPSTR)lParam, bufferA, wParam); - if (strlen(bufferA) >= wParam) rc = 0; - } - heap_free(bufferA); - heap_free(bufferW); - return rc; + return ME_GetTextEx(editor, &ex, lParam); } case EM_GETTEXTEX: return ME_GetTextEx(editor, (GETTEXTEX*)wParam, lParam);

1 0

Dylan Smith : richedit: Handle NULL buffer or 0 buffer length in ME_GetTextEx.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: 3d89e29155dc3a359026caed50840d5a57ab2510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d89e29155dc3a359026caed5… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jul 30 00:54:13 2009 -0400 richedit: Handle NULL buffer or 0 buffer length in ME_GetTextEx. ME_GetTextEx directly handles EM_GETTEXTEX, and previously a NULL buffer would be dereferenced, and a 0 buffer length would cause nCount an underflow in the nCount value which would allow a buffer overflow to occur. --- dlls/riched20/editor.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1e18c10..2a6f908 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1863,6 +1863,8 @@ static int ME_GetTextEx(ME_TextEditor *editor, GETTEXTEX *ex, LPARAM pText) { int nStart, nCount; /* in chars */ + if (!ex->cb || !pText) return 0; + if (ex->flags & ~(GT_SELECTION | GT_USECRLF)) FIXME("GETTEXTEX flags 0x%08x not supported\n", ex->flags & ~(GT_SELECTION | GT_USECRLF));

1 0