October 2007 - Wine-commits

Hwang YunSong(황윤성) : wininet: Updated Korean resource.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: 94ac6cdfd8a49dd951810cc4988dae91279de15b URL: http://source.winehq.org/git/wine.git/?a=commit;h=94ac6cdfd8a49dd951810cc49… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Thu Oct 25 09:05:17 2007 +0900 wininet: Updated Korean resource. --- dlls/wininet/wininet_Ko.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/wininet_Ko.rc b/dlls/wininet/wininet_Ko.rc index 01950e0..26f4b17 100644 --- a/dlls/wininet/wininet_Ko.rc +++ b/dlls/wininet/wininet_Ko.rc @@ -1,5 +1,5 @@ /* - * Copyright 2005 YunSong Hwang + * Copyright 2005,2007 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,10 +23,10 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "��Ʈ��ũ ��ȣ �Է�" FONT 8, "MS Shell Dlg" { - LTEXT "�� ̸�� ȣ�� Է��Ͻÿ�:", -1, 40, 6, 150, 15 + LTEXT "�� ̸�� ȣ�� Է��Ͻÿ�:", -1, 40, 6, 150, 15 LTEXT "��Ͻ�", -1, 40, 26, 50, 10 LTEXT "Realm", -1, 40, 46, 50, 10 - LTEXT " ��", -1, 40, 66, 50, 10 + LTEXT "��", -1, 40, 66, 50, 10 LTEXT "��ȣ", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0

1 0

Hwang YunSong(황윤성) : msacm32: Updated Korean resource.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: d1ea494463a4023aea3625091c914a6b0b533276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1ea494463a4023aea3625091… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Thu Oct 25 09:07:11 2007 +0900 msacm32: Updated Korean resource. --- dlls/msacm32/msacm_Ko.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msacm32/msacm_Ko.rc b/dlls/msacm32/msacm_Ko.rc index 9e22380..0b78d6e 100644 --- a/dlls/msacm32/msacm_Ko.rc +++ b/dlls/msacm32/msacm_Ko.rc @@ -1,7 +1,7 @@ /* * Korean resource file for MS ACM * - * Copyright 2005 YunSong Hwang + * Copyright 2005,2007 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,10 +28,10 @@ BEGIN LTEXT "�̸�(&N):", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 97, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "�ٸ� �̸�� (&S)...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 + PUSHBUTTON "�ٸ� �̸�� (&S)...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 103, 14, 70, 14 PUSHBUTTON "��(&R)", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 LTEXT "��(&F):", -1, 5, 41, 44, 8, NOT WS_GROUP

1 0

Hwang YunSong(황윤성) : mpr: Updated Korean resource.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: 2f4fc986d55cfd0b0d8a4231c49b84f8c0f058fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f4fc986d55cfd0b0d8a4231c… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Thu Oct 25 09:05:56 2007 +0900 mpr: Updated Korean resource. --- dlls/mpr/mpr_Ko.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/mpr_Ko.rc b/dlls/mpr/mpr_Ko.rc index 651ff6a..e2c53cc 100644 --- a/dlls/mpr/mpr_Ko.rc +++ b/dlls/mpr/mpr_Ko.rc @@ -2,7 +2,7 @@ * MPR dll resources * * Copyright (C) 2004 Juan Lang - * Copyright 2005 YunSong Hwang + * Copyright 2005,2007 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -40,7 +40,7 @@ FONT 8, "MS Shell Dlg" LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "��ȣ ��(&S) (Insecure)", IDC_SAVEPASSWORD, + CHECKBOX "��ȣ ��(&S) (��ȿ� ��)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "Ȯ��", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "��", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP

1 0

Hwang YunSong(황윤성) : comctl32: Updated Korean resource.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: 7db430ac84bd665f4e9687d80e2a9caf8c20dc9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7db430ac84bd665f4e9687d80… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Thu Oct 25 09:01:53 2007 +0900 comctl32: Updated Korean resource. --- dlls/comctl32/comctl_Ko.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/comctl_Ko.rc b/dlls/comctl32/comctl_Ko.rc index f557b53..52dff6e 100644 --- a/dlls/comctl32/comctl_Ko.rc +++ b/dlls/comctl32/comctl_Ko.rc @@ -1,6 +1,6 @@ /* * Copyright 2002 Won-kyu Park <wkpark(a)kldp.org> - * Copyright 2005 YunSong Hwang + * Copyright 2005,2007 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -57,11 +57,11 @@ BEGIN PUSHBUTTON "�ٽ�(&E)", IDC_RESET_BTN,308,23,44,14 PUSHBUTTON "��(&H)", IDC_HELP_BTN,308,40,44,14 PUSHBUTTON "�� ̵�(&U)", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "�Ʒ�� ̵�(&D)", IDC_MOVEDN_BTN,308,91,44,14 + PUSHBUTTON "�Ʒ��̵�(&D)", IDC_MOVEDN_BTN,308,91,49,14 LTEXT "�� ư(&V)", -1,4,5,84,10 LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "��ϱ�(&A) ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- ��ϱ�(&R)", IDC_REMOVE_BTN,131,62,44,14 + PUSHBUTTON "<-��(&R)", IDC_REMOVE_BTN,131,62,44,14 LTEXT "�� ư(&T):", -1,182,5,78,10 LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP END

1 0

Hwang YunSong(황윤성) : wordpad: Updated Korean resource.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: d97a491b69cbea1b0f0b419c00d03481898215e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d97a491b69cbea1b0f0b419c0… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Thu Oct 25 09:02:39 2007 +0900 wordpad: Updated Korean resource. --- programs/wordpad/Ko.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index 800f2cf..5e6633e 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -76,7 +76,7 @@ BEGIN POPUP "��(&O)" BEGIN MENUITEM "�۲�(&F) . . .", ID_FONTSETTINGS - MENUITEM " �� (&U)" ID_BULLET + MENUITEM "�� (&U)" ID_BULLET MENUITEM "�ܶ�(&P) . . ." ID_PARAFORMAT MENUITEM "��(&T) . . ." ID_TABSTOPS POPUP "��(&B)" @@ -107,7 +107,7 @@ END IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "��¥�� ð�" -FONT 10, "MS Sans Serif" +FONT 10, "MS Shell Dlg" BEGIN LTEXT "�� ",0,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT @@ -118,7 +118,7 @@ END IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "�� " -FONT 10, "MS Sans Serif" +FONT 10, "MS Shell Dlg" BEGIN LTEXT "�� ",0,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT @@ -147,7 +147,7 @@ END IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "��" -FONT 8, "MS SHell DLg" +FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "�� ", 0, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT @@ -223,5 +223,5 @@ BEGIN "�̰�� Ư�� ٹ�� Դϴ�. " \ "�� ϱ⸦ ��մϱ�?" STRING_INVALID_NUMBER, "�ùٸ�� " - STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE �� ʽ��ϴ�" END

1 0

Lei Zhang : user32: Do not send button click to dialog with disabled default button.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: 7c2263ddc4c6326d79a9d7f246eeba7ca7d45c5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c2263ddc4c6326d79a9d7f24… Author: Lei Zhang <thestig(a)google.com> Date: Thu Oct 25 00:36:54 2007 -0700 user32: Do not send button click to dialog with disabled default button. --- dlls/user32/dialog.c | 3 ++ dlls/user32/tests/dialog.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 9607dcc..d8cf63b 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1183,6 +1183,9 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) } else if (DC_HASDEFID == HIWORD(dw = SendMessageW (hwndDlg, DM_GETDEFID, 0, 0))) { + HWND hwndDef = GetDlgItem(hwndDlg, LOWORD(dw)); + if (!hwndDef || !IsWindowEnabled(hwndDef)) + return TRUE; SendMessageW( hwndDlg, WM_COMMAND, MAKEWPARAM( LOWORD(dw), BN_CLICKED ), (LPARAM)GetDlgItem(hwndDlg, LOWORD(dw))); } diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index afde292..718805e 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -488,6 +488,44 @@ static LRESULT CALLBACK main_window_procA (HWND hwnd, UINT uiMsg, WPARAM wParam, return result; } +static LRESULT CALLBACK disabled_test_proc (HWND hwnd, UINT uiMsg, + WPARAM wParam, LPARAM lParam) +{ + LRESULT result; + DWORD dw; + HWND hwndOk; + + switch (uiMsg) + { + case WM_INITDIALOG: + dw = SendMessage(hwnd, DM_GETDEFID, 0, 0); + assert(DC_HASDEFID == HIWORD(dw)); + hwndOk = GetDlgItem(hwnd, LOWORD(dw)); + assert(hwndOk); + EnableWindow(hwndOk, FALSE); + + PostMessage(hwnd, WM_KEYDOWN, VK_RETURN, 0); + PostMessage(hwnd, WM_COMMAND, IDCANCEL, 0); + break; + case WM_COMMAND: + if (wParam == IDOK) + { + g_terminated = TRUE; + EndDialog(hwnd, 0); + return 0; + } + else if (wParam == IDCANCEL) + { + EndDialog(hwnd, 0); + return 0; + } + break; + } + + result=DefWindowProcA (hwnd, uiMsg, wParam, lParam); + return result; +} + static LRESULT CALLBACK testDlgWinProc (HWND hwnd, UINT uiMsg, WPARAM wParam, LPARAM lParam) { @@ -876,6 +914,13 @@ static void test_DialogBoxParamA(void) ok(ERROR_RESOURCE_NAME_NOT_FOUND == GetLastError(),"got %d, expected ERROR_RESOURCE_NAME_NOT_FOUND\n",GetLastError()); } +static void test_DisabledDialogTest(void) +{ + g_terminated = FALSE; + DialogBoxParam(g_hinst, "IDD_DIALOG", NULL, (DLGPROC)disabled_test_proc, 0); + ok(FALSE == g_terminated, "dialog with disabled ok button has been terminated\n"); +} + START_TEST(dialog) { g_hinst = GetModuleHandleA (0); @@ -888,4 +933,5 @@ START_TEST(dialog) InitialFocusTest(); test_GetDlgItemText(); test_DialogBoxParamA(); + test_DisabledDialogTest(); }

1 0

Hwang YunSong(황윤성) : comdlg32: Updated Korean resource.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: 8783eeb7512429bce7445063939ff97b16d90b28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8783eeb7512429bce74450639… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Thu Oct 25 09:03:20 2007 +0900 comdlg32: Updated Korean resource. --- dlls/comdlg32/cdlg_Ko.rc | 52 +++++++++++++++++++++++----------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/comdlg32/cdlg_Ko.rc b/dlls/comdlg32/cdlg_Ko.rc index 46f91e1..a855fb1 100644 --- a/dlls/comdlg32/cdlg_Ko.rc +++ b/dlls/comdlg32/cdlg_Ko.rc @@ -1,6 +1,6 @@ /* * Copyright 1996 Bang Jun Young - * Copyright 2005,2006 YunSong Hwang + * Copyright 2005,2006,2007 YunSong Hwang * Copyright 2006 Byeong-Sik Jeon * * This library is free software; you can redistribute it and/or @@ -61,7 +61,7 @@ FONT 9, "MS Shell Dlg" COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP LTEXT "��̺�(&V):", 1091, 110, 104, 92, 9 COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "�ٸ� �̸�� ", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "�ٸ� �̸�� ", 1, 197, 6, 68, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "��", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "��(&H)", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP CHECKBOX "�б� ��(&R)", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP @@ -82,12 +82,12 @@ FONT 9, "MS Shell Dlg" DEFPUSHBUTTON "�μ�", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "��", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "��(&S)", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - LTEXT "��(&F)m:", 1090, 60, 80, 30, 9 + LTEXT "��(&F):", 1090, 60, 80, 30, 9 LTEXT "��(&T):", 1091, 120, 80, 30, 9 LTEXT "�μ� ǰ��(&Q):", 1092, 6, 100, 76, 9 COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - CHECKBOX "��Ϸ� �μ�(&L)", chx1, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "�� ", chx2, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "��Ϸ� �μ�(&L)", chx1,9, 116, 67, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "�� ", chx2, 181, 103, 51, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -100,7 +100,7 @@ FONT 9, "MS Shell Dlg" RADIOBUTTON "�⺻ ��(&D)", rad1, 16, 20, 80, 12 LTEXT "[��]", 1088, 35, 35, 120, 9 RADIOBUTTON "�� (&P)", rad2, 16, 50, 80, 12 - COMBOBOX cmb1, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX cmb1, 83, 50, 98, 19, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "Ȯ��", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "��", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "��(&S)", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP @@ -125,7 +125,7 @@ FONT 9, "MS Shell Dlg" LTEXT "�۲�(&F):",stc1 ,6,3,40,9 COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "�۲� ��Ÿ��(&Y):",stc2 ,108,3,44,9 + LTEXT "�۲� ��Ÿ��(&Y):",stc2 ,108,3,59,9 COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE LTEXT "ũ��(&S):",stc3,179,3,30,9 @@ -157,17 +157,17 @@ FONT 9, "MS Shell Dlg" LTEXT "�⺻ ��(&B):", 1088, 4, 4, 140, 10 LTEXT "�� (&C):", 1089, 4, 106, 140, 10 LTEXT "�� | �ܻ�(&I)", 1090, 150, 151, 48, 10 - LTEXT "��(&R):", 726 /*1094*/,249,126,24,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "��(&G):",727/*1095*/,249,140,24,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "�Ķ�(&B):",728 /*1096*/,249,154,24,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "��(&H):" ,723 /*1091*/,202,126,22,10 + LTEXT "��(&R):", 726 /*1094*/,249,126,27,10 + EDITTEXT 706, 277,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "��(&G):",727/*1095*/,249,140,27,10 + EDITTEXT 707, 277,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "�Ķ�(&B):",728 /*1096*/,249,154,27,10 + EDITTEXT 708, 277,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "��(&H):" ,723 /*1091*/,197,126,31,10 EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "ä��(&S):" ,724 /*1092*/,202,140,22,10 + LTEXT "ä��(&S):" ,724 /*1092*/,197,140,31,10 EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "��(&L):" ,725 /*1093*/,202,154,22,10 + LTEXT "��(&L):" ,725 /*1093*/,197,154,31,10 EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 @@ -191,9 +191,9 @@ FONT 9, "MS Shell Dlg" LTEXT "ã�� (&N):", -1, 4, 8, 42, 8 EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "�ܾ� ��(&W)", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "��/�ҹ�� (&C)", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "��/�ҹ�� (&C)", chx2, 4, 42, 74, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "��", grp1, 107, 26, 68, 28 - CONTROL "��(&U)", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 + CONTROL "��(&U)", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 24, 12 CONTROL "�Ʒ��(&D)", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 DEFPUSHBUTTON "�� ã��(&F)", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON @@ -212,7 +212,7 @@ FONT 9, "MS Shell Dlg" LTEXT "�ٲ� ��(&P):", -1, 4, 26, 48, 8 EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "�ܾ� ��(&W)", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "��/�ҹ�� (&C)", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "��/�ҹ�� (&C)", chx2, 5, 62, 74, 12, BS_AUTOCHECKBOX | WS_TABSTOP DEFPUSHBUTTON "�� ã��(&F)", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "�ٲٱ�(&R)", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP @@ -254,12 +254,12 @@ FONT 9, "MS Shell Dlg" GROUPBOX "�μ� ��", grp1, 8,92, 144,64, WS_GROUP CONTROL "��(&A)", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "��(&G)", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 + CONTROL "��(&G)", rad3,"Button",BS_AUTORADIOBUTTON,16,122,45,12 CONTROL "�� (&S)", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 EDITTEXT edt1, 74,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 118,122, 26,12, WS_GROUP | ES_NUMBER - RTEXT "��⼭��(&F):", stc2, 52,124, 20,8 - RTEXT "��(&T):", stc3, 100,124, 16,8 + RTEXT "��(&F):", stc2, 73,113, 27,8 + RTEXT "��(&T):", stc3, 120,113, 22,8 } PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 178 @@ -313,14 +313,14 @@ BEGIN GROUPBOX "��", grp1, 8, 156, 64, 56, BS_GROUPBOX AUTORADIOBUTTON "��(&P)", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "��(&L)", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON - GROUPBOX "Borders", grp4, 80, 156, 152, 56, BS_GROUPBOX - LTEXT "��(&E):", stc15, 88, 172, 21, 8 + GROUPBOX "��ڸ�", grp4, 80, 156, 152, 56, BS_GROUPBOX + LTEXT "��(&E):", stc15, 82, 173, 28, 8 EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER - LTEXT "��(&R):", stc16, 159, 172, 27, 8 + LTEXT "��(&R):", stc16, 151, 172, 34, 8 EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER LTEXT "��(&O):", stc17, 88, 192, 21, 8 EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER - LTEXT "�Ʒ�(&B):", stc18, 159, 192, 23, 8 + LTEXT "�Ʒ�(&B):", stc18, 154, 191, 31, 8 EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER DEFPUSHBUTTON "Ȯ��", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "��", IDCANCEL, 126, 220, 50, 14

1 0

Dan Hipschman : oleaut32: Use widl to generate oaidl_p.c.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: 9d7b34c19225e962af46cd6ad382de8103988d22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d7b34c19225e962af46cd6ad… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Oct 24 18:05:04 2007 -0700 oleaut32: Use widl to generate oaidl_p.c. --- .gitignore | 2 + dlls/oleaut32/Makefile.in | 4 +- dlls/oleaut32/oaidl_p.c |13781 -------------------------------------- dlls/oleaut32/oleaut32_oaidl.idl | 25 + dlls/oleaut32/usrmarshal.c | 4 +- 5 files changed, 32 insertions(+), 13784 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d7b34c19225e962af46c…

1 0

Detlef Riekenberg : include/commdlg: Add more defines for PrintDlg/ PrintDlgEx.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: 03f5774db7cd198b970bd6c3c7824e5a4bbdb36d URL: http://source.winehq.org/git/wine.git/?a=commit;h=03f5774db7cd198b970bd6c3c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Oct 24 23:52:01 2007 +0200 include/commdlg: Add more defines for PrintDlg/PrintDlgEx. --- include/commdlg.h | 61 ++++++++++++++++++++++++++++++++-------------------- 1 files changed, 37 insertions(+), 24 deletions(-) diff --git a/include/commdlg.h b/include/commdlg.h index da3e6d1..cd4dc59 100644 --- a/include/commdlg.h +++ b/include/commdlg.h @@ -556,30 +556,43 @@ typedef struct tagPDW DECL_WINELIB_TYPE_AW(PRINTDLG) DECL_WINELIB_TYPE_AW(LPPRINTDLG) -#define PD_ALLPAGES 0x00000000 -#define PD_SELECTION 0x00000001 -#define PD_PAGENUMS 0x00000002 -#define PD_NOSELECTION 0x00000004 -#define PD_NOPAGENUMS 0x00000008 -#define PD_COLLATE 0x00000010 -#define PD_PRINTTOFILE 0x00000020 -#define PD_PRINTSETUP 0x00000040 -#define PD_NOWARNING 0x00000080 -#define PD_RETURNDC 0x00000100 -#define PD_RETURNIC 0x00000200 -#define PD_RETURNDEFAULT 0x00000400 -#define PD_SHOWHELP 0x00000800 -#define PD_ENABLEPRINTHOOK 0x00001000 -#define PD_ENABLESETUPHOOK 0x00002000 -#define PD_ENABLEPRINTTEMPLATE 0x00004000 -#define PD_ENABLESETUPTEMPLATE 0x00008000 -#define PD_ENABLEPRINTTEMPLATEHANDLE 0x00010000 -#define PD_ENABLESETUPTEMPLATEHANDLE 0x00020000 -#define PD_USEDEVMODECOPIES 0x00040000 +#define PD_ALLPAGES 0x00000000 +#define PD_SELECTION 0x00000001 +#define PD_PAGENUMS 0x00000002 +#define PD_NOSELECTION 0x00000004 +#define PD_NOPAGENUMS 0x00000008 +#define PD_COLLATE 0x00000010 +#define PD_PRINTTOFILE 0x00000020 +#define PD_PRINTSETUP 0x00000040 +#define PD_NOWARNING 0x00000080 +#define PD_RETURNDC 0x00000100 +#define PD_RETURNIC 0x00000200 +#define PD_RETURNDEFAULT 0x00000400 +#define PD_SHOWHELP 0x00000800 +#define PD_ENABLEPRINTHOOK 0x00001000 +#define PD_ENABLESETUPHOOK 0x00002000 +#define PD_ENABLEPRINTTEMPLATE 0x00004000 +#define PD_ENABLESETUPTEMPLATE 0x00008000 +#define PD_ENABLEPRINTTEMPLATEHANDLE 0x00010000 +#define PD_ENABLESETUPTEMPLATEHANDLE 0x00020000 +#define PD_USEDEVMODECOPIES 0x00040000 #define PD_USEDEVMODECOPIESANDCOLLATE 0x00040000 -#define PD_DISABLEPRINTTOFILE 0x00080000 -#define PD_HIDEPRINTTOFILE 0x00100000 -#define PD_NONETWORKBUTTON 0x00200000 +#define PD_DISABLEPRINTTOFILE 0x00080000 +#define PD_HIDEPRINTTOFILE 0x00100000 +#define PD_NONETWORKBUTTON 0x00200000 +#define PD_CURRENTPAGE 0x00400000 +#define PD_NOCURRENTPAGE 0x00800000 +#define PD_EXCLUSIONFLAGS 0x01000000 +#define PD_USELARGETEMPLATE 0x10000000 + + +#define PD_EXCL_COPIESANDCOLLATE (DM_COPIES | DM_COLLATE) + +#define START_PAGE_GENERAL 0xffffffff + +#define PD_RESULT_CANCEL 0 +#define PD_RESULT_PRINT 1 +#define PD_RESULT_APPLY 2 typedef struct { @@ -661,7 +674,7 @@ DECL_WINELIB_TYPE_AW(LPPAGESETUPDLG) #define PSD_ENABLEPAGESETUPTEMPLATEHANDLE 0x00020000 #define PSD_ENABLEPAGEPAINTHOOK 0x00040000 #define PSD_DISABLEPAGEPAINTING 0x00080000 -#define PSD_NONETWORKBUTTON 0x00200000 +#define PSD_NONETWORKBUTTON 0x00200000 typedef struct tagPRINTPAGERANGE {

1 0

Juan Lang : crypt32: Avoid misleading fixme when no data are passed to CryptUnprotectData.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: 62f4022563b0b61868b0c928973d352c2a93a079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62f4022563b0b61868b0c9289… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 24 12:46:31 2007 -0700 crypt32: Avoid misleading fixme when no data are passed to CryptUnprotectData. --- dlls/crypt32/protectdata.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/protectdata.c b/dlls/crypt32/protectdata.c index a1a3369..3ecd35b 100644 --- a/dlls/crypt32/protectdata.c +++ b/dlls/crypt32/protectdata.c @@ -1015,6 +1015,11 @@ BOOL WINAPI CryptUnprotectData(DATA_BLOB* pDataIn, SetLastError(ERROR_INVALID_PARAMETER); goto finished; } + if (!pDataIn->cbData) + { + SetLastError(ERROR_INVALID_DATA); + goto finished; + } /* debug: show our arguments */ report(pDataIn,pOptionalEntropy,pPromptStruct,dwFlags);

1 0