October 2006 - Wine-Commits

Hwang YunSong(황윤성) : oledlg: Updated Korean resource.
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: 94523a85d2b33497ad4e7788f221ed5b94a103d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94523a85d2b33497ad4e7788f… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Oct 23 16:44:43 2006 +0900 oledlg: Updated Korean resource. --- dlls/oledlg/oledlg_Ko.rc | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/oledlg/oledlg_Ko.rc b/dlls/oledlg/oledlg_Ko.rc index 8d75b08..762e85f 100644 --- a/dlls/oledlg/oledlg_Ko.rc +++ b/dlls/oledlg/oledlg_Ko.rc @@ -53,3 +53,43 @@ STRINGTABLE DISCARDABLE IDS_NOTOLEMOD "�� ùٸ� OLE�� ƴѰŷ� ��Դϴ�. OLE��Ʈ�� Ҽ� ��ϴ�." IDS_NOTOLEMODCAPTION "��Ʈ�� ϱ�" } + +DD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ư�� ٿ��ֱ�" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "��:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "�ٿ��ֱ�(&P)", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "��ũ�� ٿ��ֱ�(&L)", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 55, 10 + LTEXT "&As:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE + CONTROL "Ȯ��", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 + CONTROL "��", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 + CONTROL "��(&H)", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 + CONTROL "�� (&D)", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 + CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44 + CONTROL "�� ٲٱ�(&I)...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 + CONTROL "<< �� ؽ�Ʈ�� ٰ� >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + CONTROL "��", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 + CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PS_PASTE_DATA "�� %s�� Ŭ�� ϱ�." + IDS_PS_PASTE_OBJECT "�� Ŭ�� ÷��ϸ� %s�� ؼ� �̰�� ֽ��ϴ�." + IDS_PS_PASTE_OBJECT_AS_ICON "�� Ŭ�� ÷��ϸ� %s�� ؼ� �̰�� ֽ��ϴ�. �̰�� Ÿ�� ̴ϴ�." + IDS_PS_PASTE_LINK_DATA "�� %s�� Ŭ�� ϱ�. �� ʹ� �� Ͽ� ��Ǿ� �־ �� ٲ�� ٲ�̴ϴ�." + IDS_PS_PASTE_LINK_OBJECT "�� Ŭ��忡 �ִ� �׸�� ֽ��ϴ�. �� ׸�� Ͽ� ��Ǿ� �־ �� ٲ�� ٲ�̴ϴ�." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "�� Ŭ��忡 �ִ� �� ֽ��ϴ�. �� Ͽ� ��Ǿ� �־ �� ٲ�� ٲ�̴ϴ�t." + IDS_PS_NON_OLE "�� Ŭ�� ϱ�." + IDS_PS_UNKNOWN_TYPE "�˼� �� " + IDS_PS_UNKNOWN_SRC "�˼� �� " + IDS_PS_UNKNOWN_APP "�� α׷�� ̰�� ϴ�" +}

1 0

Hwang YunSong(황윤성) : wineconsole: Updated Korean resource.
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: 825e50d5c8edd9a67ca354a02e168957aa05b4e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=825e50d5c8edd9a67ca354a02… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Oct 23 09:59:14 2006 +0900 wineconsole: Updated Korean resource. --- programs/wineconsole/wineconsole_Ko.rc | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/programs/wineconsole/wineconsole_Ko.rc b/programs/wineconsole/wineconsole_Ko.rc index 123351b..5a43141 100644 --- a/programs/wineconsole/wineconsole_Ko.rc +++ b/programs/wineconsole/wineconsole_Ko.rc @@ -36,7 +36,21 @@ IDS_FNT_PREVIEW_2, "" IDS_DLG_TIT_DEFAULT, "��ġ - �⺻ ��" IDS_DLG_TIT_CURRENT, "��ġ - �� " IDS_DLG_TIT_ERROR, "�� " -IDS_DLG_ERR_SBWINSIZE, "��ũ�� ũ�� ݵ�� â�� ͺ�� ų� Ŀ��մϴ�." +IDS_DLG_ERR_SBWINSIZE, "��ũ�� ũ�� ݵ�� â�� ų� Ŀ��մϴ�." + +IDS_CMD_INVALID_EVENT_ID "wineconsole: �̺�Ʈ id�� ٿ� �� ϴ�\n" +IDS_CMD_INVALID_BACKEND "wineconsole: �ùٸ�� 鿣��\n" +IDS_CMD_INVALID_OPTION "wineconsole: ��Ҽ� �� ɼ�\n" +IDS_CMD_ABOUT "Wine �ֿܼ�� α׷� ��\n" +IDS_CMD_LAUNCH_FAILED "wineconsole: Ǯ�׸� %s �� .\n"\ + "�� ùٸ�� ʽ��ϴ�.\n" + +IDS_USAGE_HEADER "\n��:\n wineconsole [�ɼ�] <��>\n\n�ɼ�:\n" +IDS_USAGE_BACKEND " --backend={user|ncurses} ��ڰ� �� â�� ,\n"\ + " ncurses�� Wine �ܼ�ó�� ͹̳ο� ��Ÿ�� \n" +IDS_USAGE_COMMAND " <��> The Wine ��α׷�� ܼ�� ؼ� ��۵�\n" +IDS_USAGE_FOOTER "\n��:\n wineconsole cmd\nWine �ֿܼ�� Wine �� Ʈ ��\n\n" + END IDD_OPTION DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 @@ -57,10 +71,10 @@ FONT 8, "MS Shell Dlg" AUTOCHECKBOX "��(&E)", IDC_OPT_QUICK_EDIT, 129, 43, 60, 10, WS_TABSTOP GROUPBOX "�� 丮", -1, 10, 57, 190, 35, BS_GROUPBOX - LTEXT "�ٽ� �δ� �� (&N) :", -1, 14, 67, 78, 18 + LTEXT "�ٽ� �θ�� (&N) :", -1, 14, 67, 78, 18 EDITTEXT IDC_OPT_HIST_SIZE, 92, 69, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_OPT_HIST_SIZE_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - AUTOCHECKBOX "�� (&R)", IDC_OPT_HIST_NODOUBLE, 130, 67, 50, 18, WS_TABSTOP|BS_MULTILINE + AUTOCHECKBOX "�ι� ��(&R)", IDC_OPT_HIST_NODOUBLE, 130, 67, 50, 18, WS_TABSTOP|BS_MULTILINE } IDD_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105

1 0

Mike McCormack : user32: Add a test showing a problem in GetClassNameA.
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: 48a63f2979964fedfce54c25304015b586669fa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48a63f2979964fedfce54c253… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Oct 23 20:41:33 2006 +0900 user32: Add a test showing a problem in GetClassNameA. --- dlls/user/tests/class.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/user/tests/class.c b/dlls/user/tests/class.c index 385bb7b..5a6a979 100644 --- a/dlls/user/tests/class.c +++ b/dlls/user/tests/class.c @@ -300,6 +300,8 @@ static void test_instances(void) HINSTANCE kernel32 = GetModuleHandleA("kernel32"); HINSTANCE user32 = GetModuleHandleA("user32"); HINSTANCE main_module = GetModuleHandleA(NULL); + DWORD r; + char buffer[0x10]; memset( &cls, 0, sizeof(cls) ); cls.style = CS_HREDRAW | CS_VREDRAW; @@ -411,6 +413,10 @@ static void test_instances(void) "Didn't get kernel32 class for null instance\n" ); DestroyWindow( hwnd2 ); + r = GetClassName( hwnd, buffer, 4 ); + todo_wine ok( r == 3, "return wrong\n"); + ok( !strcmp( buffer, "__t"), "name wrong\n"); + ok( UnregisterClassA( name, kernel32 ), "Unregister failed for kernel32\n" ); hwnd2 = CreateWindowExA( 0, name, "test_window", 0, 0, 0, 0, 0, 0, 0, NULL, 0 );

1 0

Mike McCormack : msi: Fix insertion of null integers into a table.
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: f6c7ae6a0c8b84794c4a46588f207e89cc17c75c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c7ae6a0c8b84794c4a46588… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Oct 24 02:18:21 2006 +0900 msi: Fix insertion of null integers into a table. --- dlls/msi/table.c | 4 +++- dlls/msi/tests/db.c | 7 +------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 8d416f2..444c2a8 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1378,7 +1378,9 @@ static UINT msi_table_modify_row( MSITAB if( (~tv->columns[i].type & MSITYPE_KEY) && (~mask & (1<<i)) ) continue; - if( (tv->columns[i].type & MSITYPE_STRING) && + if (MSI_RecordIsNull( rec, i+1)) + val = 0; + else if( (tv->columns[i].type & MSITYPE_STRING) && ! MSITYPE_IS_BINARY(tv->columns[i].type) ) { const WCHAR *str = MSI_RecordGetString( rec, i+1 ); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 832e9eb..0a3125e 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1458,10 +1458,7 @@ static void test_msiimport(void) ok(i == 2, "Expected 2, got %d\n", i); i = MsiRecordGetInteger(rec, 4); - todo_wine - { - ok(i == 0x80000000, "Expected 0x80000000, got %d\n", i); - } + ok(i == MSI_NULL_INTEGER, "Expected MSI_NULL_INTEGER, got %d\n", i); i = MsiRecordGetInteger(rec, 5); ok(i == 2147483640, "Expected 2147483640, got %d\n", i); @@ -2887,12 +2884,10 @@ static void test_integers(void) r = MsiRecordGetFieldCount(rec); ok(r == 8, "record count wrong: %d\n", r); - todo_wine { i = MsiRecordGetInteger(rec, 1); ok(i == MSI_NULL_INTEGER, "Expected MSI_NULL_INTEGER, got %d\n", i); i = MsiRecordGetInteger(rec, 3); ok(i == MSI_NULL_INTEGER, "Expected MSI_NULL_INTEGER, got %d\n", i); - } i = MsiRecordGetInteger(rec, 2); ok(i == 2, "Expected 2, got %d\n", i); i = MsiRecordGetInteger(rec, 4);

1 0

Mike McCormack : msi: Add the column type INTEGER as an alias for INT.
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: 885801137514eaba980e48706c90fabb411bffd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=885801137514eaba980e48706… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Oct 24 02:02:43 2006 +0900 msi: Add the column type INTEGER as an alias for INT. --- dlls/msi/tests/db.c | 130 ++++++++++++++++++---------------------------- dlls/msi/tests/package.c | 2 +- dlls/msi/tokenize.c | 2 + 3 files changed, 54 insertions(+), 80 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 6b71abd..832e9eb 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -2810,55 +2810,43 @@ static void test_integers(void) "`five` SHORT NOT NULL, `six` INT NOT NULL, " "`seven` INTEGER NOT NULL, `eight` LONG NOT NULL " "PRIMARY KEY `one`)"; - todo_wine - { - r = MsiDatabaseOpenView(hdb, query, &view); - ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); - r = MsiViewExecute(view, 0); - ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); - r = MsiViewClose(view); - ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); - } + r = MsiDatabaseOpenView(hdb, query, &view); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(view, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + r = MsiViewClose(view); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); r = MsiCloseHandle(view); ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); query = "SELECT * FROM `integers`"; r = MsiDatabaseOpenView(hdb, query, &view); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiViewGetColumnInfo(view, MSICOLINFO_NAMES, &rec); count = MsiRecordGetFieldCount(rec); - todo_wine - { - ok(count == 8, "Expected 8, got %d\n", count); - ok(check_record(rec, 1, "one"), "Expected one\n"); - ok(check_record(rec, 2, "two"), "Expected two\n"); - ok(check_record(rec, 3, "three"), "Expected three\n"); - ok(check_record(rec, 4, "four"), "Expected four\n"); - ok(check_record(rec, 5, "five"), "Expected five\n"); - ok(check_record(rec, 6, "six"), "Expected six\n"); - ok(check_record(rec, 7, "seven"), "Expected seven\n"); - ok(check_record(rec, 8, "eight"), "Expected eight\n"); - } + ok(count == 8, "Expected 8, got %d\n", count); + ok(check_record(rec, 1, "one"), "Expected one\n"); + ok(check_record(rec, 2, "two"), "Expected two\n"); + ok(check_record(rec, 3, "three"), "Expected three\n"); + ok(check_record(rec, 4, "four"), "Expected four\n"); + ok(check_record(rec, 5, "five"), "Expected five\n"); + ok(check_record(rec, 6, "six"), "Expected six\n"); + ok(check_record(rec, 7, "seven"), "Expected seven\n"); + ok(check_record(rec, 8, "eight"), "Expected eight\n"); MsiCloseHandle(rec); r = MsiViewGetColumnInfo(view, MSICOLINFO_TYPES, &rec); count = MsiRecordGetFieldCount(rec); - todo_wine - { - ok(count == 8, "Expected 8, got %d\n", count); - ok(check_record(rec, 1, "I2"), "Expected I2\n"); - ok(check_record(rec, 2, "I2"), "Expected I2\n"); - ok(check_record(rec, 3, "I2"), "Expected I2\n"); - ok(check_record(rec, 4, "I4"), "Expected I4\n"); - ok(check_record(rec, 5, "i2"), "Expected i2\n"); - ok(check_record(rec, 6, "i2"), "Expected i2\n"); - ok(check_record(rec, 7, "i2"), "Expected i2\n"); - ok(check_record(rec, 8, "i4"), "Expected i4\n"); - } + ok(count == 8, "Expected 8, got %d\n", count); + ok(check_record(rec, 1, "I2"), "Expected I2\n"); + ok(check_record(rec, 2, "I2"), "Expected I2\n"); + ok(check_record(rec, 3, "I2"), "Expected I2\n"); + ok(check_record(rec, 4, "I4"), "Expected I4\n"); + ok(check_record(rec, 5, "i2"), "Expected i2\n"); + ok(check_record(rec, 6, "i2"), "Expected i2\n"); + ok(check_record(rec, 7, "i2"), "Expected i2\n"); + ok(check_record(rec, 8, "i4"), "Expected i4\n"); MsiCloseHandle(rec); MsiViewClose(view); @@ -2867,23 +2855,17 @@ static void test_integers(void) /* insert values into it, NULL where NOT NULL is specified */ query = "INSERT INTO `integers` ( `one`, `two`, `three`, `four`, `five`, `six`, `seven`, `eight` )" "VALUES('', '', '', '', '', '', '', '')"; - todo_wine - { - r = MsiDatabaseOpenView(hdb, query, &view); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - r = MsiViewExecute(view, 0); - ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_FUNCTION_FAILED, got %d\n", r); - } + r = MsiDatabaseOpenView(hdb, query, &view); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(view, 0); + ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_FUNCTION_FAILED, got %d\n", r); MsiViewClose(view); MsiCloseHandle(view); query = "SELECT * FROM `integers`"; r = do_query(hdb, query, &rec); - todo_wine - { - ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); - } + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); r = MsiRecordGetFieldCount(rec); ok(r == -1, "record count wrong: %d\n", r); @@ -2893,46 +2875,36 @@ static void test_integers(void) /* insert legitimate values into it */ query = "INSERT INTO `integers` ( `one`, `two`, `three`, `four`, `five`, `six`, `seven`, `eight` )" "VALUES('', '2', '', '4', '5', '6', '7', '8')"; - todo_wine - { - r = MsiDatabaseOpenView(hdb, query, &view); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - r = MsiViewExecute(view, 0); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - } + r = MsiDatabaseOpenView(hdb, query, &view); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(view, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); query = "SELECT * FROM `integers`"; r = do_query(hdb, query, &rec); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiRecordGetFieldCount(rec); - todo_wine - { - ok(r == 8, "record count wrong: %d\n", r); - } + ok(r == 8, "record count wrong: %d\n", r); + todo_wine { i = MsiRecordGetInteger(rec, 1); - ok(i == 0x80000000, "Expected 0x80000000, got %d\n", i); + ok(i == MSI_NULL_INTEGER, "Expected MSI_NULL_INTEGER, got %d\n", i); i = MsiRecordGetInteger(rec, 3); - ok(i == 0x80000000, "Expected 0x80000000, got %d\n", i); - todo_wine - { - i = MsiRecordGetInteger(rec, 2); - ok(i == 2, "Expected 2, got %d\n", i); - i = MsiRecordGetInteger(rec, 4); - ok(i == 4, "Expected 4, got %d\n", i); - i = MsiRecordGetInteger(rec, 5); - ok(i == 5, "Expected 5, got %d\n", i); - i = MsiRecordGetInteger(rec, 6); - ok(i == 6, "Expected 6, got %d\n", i); - i = MsiRecordGetInteger(rec, 7); - ok(i == 7, "Expected 7, got %d\n", i); - i = MsiRecordGetInteger(rec, 8); - ok(i == 8, "Expected 8, got %d\n", i); + ok(i == MSI_NULL_INTEGER, "Expected MSI_NULL_INTEGER, got %d\n", i); } + i = MsiRecordGetInteger(rec, 2); + ok(i == 2, "Expected 2, got %d\n", i); + i = MsiRecordGetInteger(rec, 4); + ok(i == 4, "Expected 4, got %d\n", i); + i = MsiRecordGetInteger(rec, 5); + ok(i == 5, "Expected 5, got %d\n", i); + i = MsiRecordGetInteger(rec, 6); + ok(i == 6, "Expected 6, got %d\n", i); + i = MsiRecordGetInteger(rec, 7); + ok(i == 7, "Expected 7, got %d\n", i); + i = MsiRecordGetInteger(rec, 8); + ok(i == 8, "Expected 8, got %d\n", i); MsiCloseHandle(rec); MsiViewClose(view); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index feac142..1faa751 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1418,13 +1418,13 @@ static void test_msipackage(void) r = try_query(hdb, query); ok(r == ERROR_SUCCESS, "failed to create Properties table\n"); - todo_wine { query = "CREATE TABLE `InstallExecuteSequence` (" "`Action` CHAR(72), `Condition` CHAR(0), `Sequence` INTEGER " "PRIMARY KEY `Action`)"; r = try_query(hdb, query); ok(r == ERROR_SUCCESS, "failed to create InstallExecuteSequence table\n"); + todo_wine { sprintf(name, "#%ld", hdb); r = MsiOpenPackage(name, &hpack); ok(r == ERROR_INSTALL_PACKAGE_INVALID, "MsiOpenPackage returned wrong code\n"); diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c index 18bb341..6cd1dae 100644 --- a/dlls/msi/tokenize.c +++ b/dlls/msi/tokenize.c @@ -94,6 +94,7 @@ static const WCHAR INNER_W[] = { 'I','N' static const WCHAR INSERT_W[] = { 'I','N','S','E','R','T',0 }; static const WCHAR INSTEAD_W[] = { 'I','N','S','T','E','A','D',0 }; static const WCHAR INT_W[] = { 'I','N','T',0 }; +static const WCHAR INTEGER_W[] = { 'I','N','T','E','G','E','R',0 }; static const WCHAR INTERSECT_W[] = { 'I','N','T','E','R','S','E','C','T',0 }; static const WCHAR INTO_W[] = { 'I','N','T','O',0 }; static const WCHAR IS_W[] = { 'I','S',0 }; @@ -206,6 +207,7 @@ static const Keyword aKeywordTable[] = { { INSERT_W, TK_INSERT }, { INSTEAD_W, TK_INSTEAD }, { INT_W, TK_INT }, + { INTEGER_W, TK_INT }, { INTERSECT_W, TK_INTERSECT }, { INTO_W, TK_INTO }, { IS_W, TK_IS },

1 0

Mike McCormack : msi: Only apply transforms that are valid for a database.
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: 0d7dc8f98ddabc39deff7e409581ae4baaa66f03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d7dc8f98ddabc39deff7e409… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Oct 24 01:12:13 2006 +0900 msi: Only apply transforms that are valid for a database. --- dlls/msi/action.c | 31 ++++++++++++++++++++++++++++--- dlls/msi/msipriv.h | 1 + dlls/msi/suminfo.c | 16 ++++++++++++++++ 3 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 9205884..66504e8 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -398,6 +398,28 @@ static LPWSTR* msi_split_string( LPCWSTR return ret; } +static UINT msi_check_transform_applicable( MSIPACKAGE *package, IStorage *patch ) +{ + WCHAR szProductCode[] = { 'P','r','o','d','u','c','t','C','o','d','e',0 }; + LPWSTR prod_code, patch_product; + UINT ret; + + prod_code = msi_dup_property( package, szProductCode ); + patch_product = msi_get_suminfo_product( patch ); + + TRACE("db = %s patch = %s\n", debugstr_w(prod_code), debugstr_w(patch_product)); + + if ( strstrW( patch_product, prod_code ) ) + ret = ERROR_SUCCESS; + else + ret = ERROR_FUNCTION_FAILED; + + msi_free( patch_product ); + msi_free( prod_code ); + + return ret; +} + static UINT msi_apply_substorage_transform( MSIPACKAGE *package, MSIDATABASE *patch_db, LPCWSTR name ) { @@ -416,14 +438,17 @@ static UINT msi_apply_substorage_transfo r = IStorage_OpenStorage( patch_db->storage, name, NULL, STGM_SHARE_EXCLUSIVE, NULL, 0, &stg ); if (SUCCEEDED(r)) { - ret = msi_table_apply_transform( package->db, stg ); + ret = msi_check_transform_applicable( package, stg ); + if (ret == ERROR_SUCCESS) + msi_table_apply_transform( package->db, stg ); + else + TRACE("substorage transform %s wasn't applicable\n", debugstr_w(name)); IStorage_Release( stg ); - ret = ERROR_SUCCESS; } else ERR("failed to open substorage %s\n", debugstr_w(name)); - return ret; + return ERROR_SUCCESS; } static UINT msi_check_patch_applicable( MSIPACKAGE *package, MSISUMMARYINFO *si ) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 5fe45f6..5acdd25 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -688,6 +688,7 @@ extern UINT MSI_PreviewDialogW( MSIPREVI /* summary information */ extern MSISUMMARYINFO *MSI_GetSummaryInformationW( IStorage *stg, UINT uiUpdateCount ); extern LPWSTR msi_suminfo_dup_string( MSISUMMARYINFO *si, UINT uiProperty ); +extern LPWSTR msi_get_suminfo_product( IStorage *stg ); /* undocumented functions */ UINT WINAPI MsiCreateAndVerifyInstallerDirectory( DWORD ); diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 44bcbf4..f7f5787 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -602,6 +602,22 @@ LPWSTR msi_suminfo_dup_string( MSISUMMAR return strdupAtoW( prop->u.pszVal ); } +LPWSTR msi_get_suminfo_product( IStorage *stg ) +{ + MSISUMMARYINFO *si; + LPWSTR prod; + + si = MSI_GetSummaryInformationW( stg, 0 ); + if (!si) + { + ERR("no summary information!\n"); + return NULL; + } + prod = msi_suminfo_dup_string( si, PID_REVNUMBER ); + msiobj_release( &si->hdr ); + return prod; +} + UINT WINAPI MsiSummaryInfoGetPropertyA( MSIHANDLE handle, UINT uiProperty, UINT *puiDataType, INT *piValue, FILETIME *pftValue, LPSTR szValueBuf, DWORD *pcchValueBuf)

1 0

Mike McCormack : msi: Initialize the summary information from a storage interface, not a db.
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: 7f98f1d086351d172f0a56c7b72c34c8835ef281 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f98f1d086351d172f0a56c7b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Oct 24 01:11:30 2006 +0900 msi: Initialize the summary information from a storage interface, not a db. --- dlls/msi/action.c | 2 +- dlls/msi/database.c | 5 +---- dlls/msi/msipriv.h | 4 ++-- dlls/msi/suminfo.c | 18 +++++++++--------- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 8d79028..9205884 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -460,7 +460,7 @@ static UINT msi_parse_patch_summary( MSI LPWSTR str, *substorage; UINT i, r = ERROR_SUCCESS; - si = MSI_GetSummaryInformationW( patch_db, 0 ); + si = MSI_GetSummaryInformationW( patch_db->storage, 0 ); if (!si) return ERROR_FUNCTION_FAILED; diff --git a/dlls/msi/database.c b/dlls/msi/database.c index c36139e..e496acf 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -57,15 +57,12 @@ DEFINE_GUID( CLSID_MsiPatch, 0x000c1086, static VOID MSI_CloseDatabase( MSIOBJECTHDR *arg ) { MSIDATABASE *db = (MSIDATABASE *) arg; - DWORD r; msi_free(db->path); free_cached_tables( db ); msi_free_transforms( db ); msi_destroy_stringtable( db->strings ); - r = IStorage_Release( db->storage ); - if( r ) - ERR("database reference count was not zero (%d)\n", r); + IStorage_Release( db->storage ); if (db->deletefile) { DeleteFileW( db->deletefile ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 94edb23..5fe45f6 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -256,7 +256,7 @@ #define MSI_MAX_PROPS 20 typedef struct tagMSISUMMARYINFO { MSIOBJECTHDR hdr; - MSIDATABASE *db; + IStorage *storage; DWORD update_count; PROPVARIANT property[MSI_MAX_PROPS]; } MSISUMMARYINFO; @@ -686,7 +686,7 @@ extern MSIPREVIEW *MSI_EnableUIPreview( extern UINT MSI_PreviewDialogW( MSIPREVIEW *, LPCWSTR ); /* summary information */ -extern MSISUMMARYINFO *MSI_GetSummaryInformationW( MSIDATABASE *db, UINT uiUpdateCount ); +extern MSISUMMARYINFO *MSI_GetSummaryInformationW( IStorage *stg, UINT uiUpdateCount ); extern LPWSTR msi_suminfo_dup_string( MSISUMMARYINFO *si, UINT uiProperty ); /* undocumented functions */ diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 5d51e4f..44bcbf4 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -96,7 +96,7 @@ static void MSI_CloseSummaryInfo( MSIOBJ for( i = 0; i < MSI_MAX_PROPS; i++ ) free_prop( &si->property[i] ); - msiobj_release( &si->db->hdr ); + IStorage_Release( si->storage ); } static UINT get_type( UINT uiProperty ) @@ -105,7 +105,7 @@ static UINT get_type( UINT uiProperty ) { case PID_CODEPAGE: return VT_I2; - + case PID_SUBJECT: case PID_AUTHOR: case PID_KEYWORDS: @@ -405,28 +405,28 @@ static UINT save_summary_info( MSISUMMAR return ERROR_SUCCESS; } -MSISUMMARYINFO *MSI_GetSummaryInformationW( MSIDATABASE *db, UINT uiUpdateCount ) +MSISUMMARYINFO *MSI_GetSummaryInformationW( IStorage *stg, UINT uiUpdateCount ) { IStream *stm = NULL; MSISUMMARYINFO *si; DWORD grfMode; HRESULT r; - TRACE("%p %d\n", db, uiUpdateCount ); + TRACE("%p %d\n", stg, uiUpdateCount ); si = alloc_msiobject( MSIHANDLETYPE_SUMMARYINFO, sizeof (MSISUMMARYINFO), MSI_CloseSummaryInfo ); if( !si ) return si; - msiobj_addref( &db->hdr ); - si->db = db; memset( &si->property, 0, sizeof si->property ); si->update_count = uiUpdateCount; + IStorage_AddRef( stg ); + si->storage = stg; /* read the stream... if we fail, we'll start with an empty property set */ grfMode = STGM_READ | STGM_SHARE_EXCLUSIVE; - r = IStorage_OpenStream( si->db->storage, szSumInfo, 0, grfMode, 0, &stm ); + r = IStorage_OpenStream( si->storage, szSumInfo, 0, grfMode, 0, &stm ); if( SUCCEEDED(r) ) { load_summary_info( si, stm ); @@ -462,7 +462,7 @@ UINT WINAPI MsiGetSummaryInformationW( M return ERROR_INVALID_PARAMETER; } - si = MSI_GetSummaryInformationW( db, uiUpdateCount ); + si = MSI_GetSummaryInformationW( db->storage, uiUpdateCount ); if (si) { *pHandle = alloc_msihandle( &si->hdr ); @@ -749,7 +749,7 @@ UINT WINAPI MsiSummaryInfoPersist( MSIHA return ERROR_INVALID_HANDLE; grfMode = STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE; - r = IStorage_CreateStream( si->db->storage, szSumInfo, grfMode, 0, 0, &stm ); + r = IStorage_CreateStream( si->storage, szSumInfo, grfMode, 0, 0, &stm ); if( SUCCEEDED(r) ) { ret = save_summary_info( si, stm );

1 0

Byeong-Sik Jeon : notepad: Update Korean resources.
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: fd7f9b735dd04604fb22f7f1ccc6abe0fb2f1d29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd7f9b735dd04604fb22f7f1c… Author: Byeong-Sik Jeon <wjsqudtlr(a)gmail.com> Date: Sat Oct 21 00:47:04 2006 +0900 notepad: Update Korean resources. --- programs/notepad/Ko.rc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/notepad/Ko.rc b/programs/notepad/Ko.rc index dca2447..f751d30 100644 --- a/programs/notepad/Ko.rc +++ b/programs/notepad/Ko.rc @@ -28,7 +28,7 @@ MAIN_MENU MENU POPUP "��(&F)" { MENUITEM "�� (&N)\tCtrl+N", CMD_NEW MENUITEM "��(&O)...\tCtrl+O", CMD_OPEN - MENUITEM " ��(&S)\tCtrl+S", CMD_SAVE + MENUITEM "��(&S)\tCtrl+S", CMD_SAVE MENUITEM "�ٸ� �̸�� (&A)...", CMD_SAVE_AS MENUITEM SEPARATOR MENUITEM "��Ʈ(&P)\tCtrl+P", CMD_PRINT @@ -42,6 +42,7 @@ POPUP "��(&E)" { 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 SEPARATOR MENUITEM "�� (&A)\tCtrl+A", CMD_SELECT_ALL

1 0

Byeong-Sik Jeon : oleview: Update Korean resources.
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: 43e96028a952d5fd0b0e5574fcf5c9cebb638f52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43e96028a952d5fd0b0e5574f… Author: Byeong-Sik Jeon <wjsqudtlr(a)gmail.com> Date: Sat Oct 21 00:47:04 2006 +0900 oleview: Update Korean resources. --- programs/oleview/Ko.rc | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/programs/oleview/Ko.rc b/programs/oleview/Ko.rc index 81370d9..8fab7ff 100644 --- a/programs/oleview/Ko.rc +++ b/programs/oleview/Ko.rc @@ -97,7 +97,8 @@ STRINGTABLE IDS_ABOUT "OleView - OLE/COM ��ü ��" IDS_ABOUTVER "�� 1.0" IDS_TYPELIBTITLE "ITypeLib ��" - + IDS_OPEN "��" + IDM_BIND, "�� " IDM_TYPELIB, "Ÿ�� ̺귯�� " IDM_SYSCONF, "�ӽ� ��ü�� DCOM�� ٲٱ�" @@ -139,9 +140,12 @@ STRINGTABLE IDS_CGCOFAIL, "CoGetClassObject ��." IDS_ERROR_UNKN, "�˼� �� " - IDS_TRUE "��" - IDS_FALSE "��" - IDS_BYTES "��Ʈ" + IDS_TRUE, "��" + IDS_FALSE, "��" + IDS_BYTES, "��Ʈ" + + IDS_ERROR_LOADTYPELIB, "LoadTypeLib( %s ) �� ($%x)" + IDS_INHERITINTERFACES, "Inherited Interfaces" } DLG_CREATEINSTON DIALOG DISCARDABLE 0, 0, 250, 41

1 0

Hans Leidekker : dnsapi: Add stubs for DnsWriteQuestionToBuffer_{UTF8, W}.
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: a3a2f06a07da31dbd98fac0acf0eaac50c5473b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3a2f06a07da31dbd98fac0ac… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Oct 20 16:13:52 2006 +0200 dnsapi: Add stubs for DnsWriteQuestionToBuffer_{UTF8,W}. --- dlls/dnsapi/dnsapi.spec | 4 ++-- dlls/dnsapi/main.c | 21 +++++++++++++++++---- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/dnsapi/dnsapi.spec b/dlls/dnsapi/dnsapi.spec index 977bde4..bdc340a 100644 --- a/dlls/dnsapi/dnsapi.spec +++ b/dlls/dnsapi/dnsapi.spec @@ -123,7 +123,7 @@ @ stub DnsValidateUtf8Byte @ stub DnsWinsRecordFlagForString @ stub DnsWinsRecordFlagString -@ stub DnsWriteQuestionToBuffer_UTF8 -@ stub DnsWriteQuestionToBuffer_W +@ stdcall DnsWriteQuestionToBuffer_UTF8(ptr ptr str long long long) +@ stdcall DnsWriteQuestionToBuffer_W(ptr ptr wstr long long long) @ stub DnsWriteReverseNameStringForIpAddress @ stub GetCurrentTimeInSeconds diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index 778f7a9..13f5ba6 100644 --- a/dlls/dnsapi/main.c +++ b/dlls/dnsapi/main.c @@ -164,12 +164,25 @@ DNS_STATUS WINAPI DnsModifyRecordsInSet_ } /****************************************************************************** - * DnsWriteQuestionToBuffer [DNSAPI.@] + * DnsWriteQuestionToBuffer_UTF8 [DNSAPI.@] * */ -BOOL WINAPI DnsWriteQuestionToBuffer( PDNS_MESSAGE_BUFFER buffer, LPDWORD size, - LPWSTR name, WORD type, WORD xid, - BOOL recurse ) +BOOL WINAPI DnsWriteQuestionToBuffer_UTF8( PDNS_MESSAGE_BUFFER buffer, LPDWORD size, + LPSTR name, WORD type, WORD xid, + BOOL recurse ) +{ + FIXME( "(%p,%p,%s,%d,%d,%d) stub\n", buffer, size, debugstr_a(name), + type, xid, recurse ); + return FALSE; +} + +/****************************************************************************** + * DnsWriteQuestionToBuffer_W [DNSAPI.@] + * + */ +BOOL WINAPI DnsWriteQuestionToBuffer_W( PDNS_MESSAGE_BUFFER buffer, LPDWORD size, + LPWSTR name, WORD type, WORD xid, + BOOL recurse ) { FIXME( "(%p,%p,%s,%d,%d,%d) stub\n", buffer, size, debugstr_w(name), type, xid, recurse );

1 0