wine-commits April 2008

wine-commits@winehq.org

4 participants
1278 discussions

Vitaliy Margolen : localui: Add Russian translation.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: a4d9ad0fe2d48165200f31872f2ccd9c35780189 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4d9ad0fe2d48165200f31872… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 5 10:38:19 2008 -0600 localui: Add Russian translation. --- dlls/localui/localui.rc | 1 + dlls/localui/ui_Ru.rc | 54 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/localui/localui.rc b/dlls/localui/localui.rc index fc2ad73..7c67807 100644 --- a/dlls/localui/localui.rc +++ b/dlls/localui/localui.rc @@ -45,4 +45,5 @@ #include "ui_Nl.rc" #include "ui_No.rc" #include "ui_Pl.rc" +#include "ui_Ru.rc" #include "ui_Sv.rc" diff --git a/dlls/localui/ui_Ru.rc b/dlls/localui/ui_Ru.rc new file mode 100644 index 0000000..96e78f1 --- /dev/null +++ b/dlls/localui/ui_Ru.rc @@ -0,0 +1,54 @@ +/* + * Russian resources for localui + * + * Copyright 2008 Vitaliy Margolen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "�� " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "�� &�� :", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "��", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "�� " +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "��-�� (��)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "&�� :", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "��", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "�� " + IDS_INVALIDNAME "�� '%s'" + IDS_PORTEXISTS "�� '%s' �� " + IDS_NOTHINGTOCONFIG "�� " +}

1 0

Vitaliy Margolen : iccvid: Add Russian translation.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 2e4e2ac3c3a75774460f163b63a27e9d2f75a653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e4e2ac3c3a75774460f163b6… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 5 10:38:02 2008 -0600 iccvid: Add Russian translation. --- dlls/iccvid/iccvid_Ru.rc | 25 +++++++++++++++++++++++++ dlls/iccvid/rsrc.rc | 1 + 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/iccvid/iccvid_Ru.rc b/dlls/iccvid/iccvid_Ru.rc new file mode 100644 index 0000000..c78ee72 --- /dev/null +++ b/dlls/iccvid/iccvid_Ru.rc @@ -0,0 +1,25 @@ +/* + * Copyright 2008 Vitaliy Margolen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "�� -�� Cinepak" + IDS_DESCRIPTION "�� -�� Cinepak" +} diff --git a/dlls/iccvid/rsrc.rc b/dlls/iccvid/rsrc.rc index baa9fb3..b3a92ea 100644 --- a/dlls/iccvid/rsrc.rc +++ b/dlls/iccvid/rsrc.rc @@ -28,5 +28,6 @@ #include "iccvid_No.rc" #include "iccvid_Pl.rc" #include "iccvid_Ro.rc" +#include "iccvid_Ru.rc" #include "iccvid_Sv.rc" #include "iccvid_Tr.rc"

1 0

Eric Pouech : dbghelp: Prevent debug overflow of internal buffer while tracing.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: ce7656d218cd9dcd9772992b29e965b92c2a0609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce7656d218cd9dcd9772992b2… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Apr 5 09:35:28 2008 +0200 dbghelp: Prevent debug overflow of internal buffer while tracing. --- dlls/dbghelp/msc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index a2454d0..a2d0c23 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1575,7 +1575,7 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root while (*ptr1) { ptr2 = ptr1 + strlen(ptr1) + 1; - TRACE("\t%s => %s\n", ptr1, ptr2); + TRACE("\t%s => %s\n", ptr1, debugstr_a(ptr2)); ptr1 = ptr2 + strlen(ptr2) + 1; } }

1 0

Eric Pouech : dbghelp: Be stricter when looping in symbol tables.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: f46d717818d11cd80127ca64646db57311af72cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f46d717818d11cd80127ca646… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Apr 5 09:34:07 2008 +0200 dbghelp: Be stricter when looping in symbol tables. --- dlls/dbghelp/msc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 25589fc..a2454d0 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1322,6 +1322,7 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root const union codeview_symbol* sym = (const union codeview_symbol*)(root + i); length = sym->generic.len + 2; if (i + length > size) break; + if (!sym->generic.id || length < 4) break; if (length & 3) FIXME("unpadded len %u\n", length); switch (sym->generic.id)

1 0

James Hawkins : msi: Don' t execute the view again when modifying a WHERE query.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 4d9c17da02397898f195858d9e2d55927154bd10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d9c17da02397898f195858d9… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Apr 6 14:31:19 2008 -0500 msi: Don't execute the view again when modifying a WHERE query. --- dlls/msi/tests/db.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/where.c | 10 ++-- 2 files changed, 107 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 663388e..cd9abad 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -5887,6 +5887,107 @@ static void test_viewmodify_refresh(void) DeleteFileA(msifile); } +static void test_where_viewmodify(void) +{ + MSIHANDLE hdb, hview, hrec; + const char *query; + UINT r; + + DeleteFile(msifile); + + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "CREATE TABLE `Table` ( `A` INT, `B` INT PRIMARY KEY `A` )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Table` ( `A`, `B` ) VALUES ( 1, 2 )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Table` ( `A`, `B` ) VALUES ( 3, 4 )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Table` ( `A`, `B` ) VALUES ( 5, 6 )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* `B` = 3 doesn't match, but the view shouldn't be executed */ + query = "SELECT * FROM `Table` WHERE `B` = 3"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + hrec = MsiCreateRecord(2); + MsiRecordSetInteger(hrec, 1, 7); + MsiRecordSetInteger(hrec, 2, 8); + + r = MsiViewModify(hview, MSIMODIFY_INSERT_TEMPORARY, hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + MsiCloseHandle(hrec); + MsiViewClose(hview); + MsiCloseHandle(hview); + + query = "SELECT * FROM `Table` WHERE `A` = 7"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiRecordGetInteger(hrec, 1); + ok(r == 7, "Expected 7, got %d\n", r); + + r = MsiRecordGetInteger(hrec, 2); + ok(r == 8, "Expected 8, got %d\n", r); + + MsiRecordSetInteger(hrec, 2, 9); + + r = MsiViewModify(hview, MSIMODIFY_UPDATE, hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + MsiCloseHandle(hrec); + MsiViewClose(hview); + MsiCloseHandle(hview); + + query = "SELECT * FROM `Table` WHERE `A` = 7"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiRecordGetInteger(hrec, 1); + ok(r == 7, "Expected 7, got %d\n", r); + + r = MsiRecordGetInteger(hrec, 2); + ok(r == 9, "Expected 9, got %d\n", r); + + query = "UPDATE `Table` SET `B` = 10 WHERE `A` = 7"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewModify(hview, MSIMODIFY_REFRESH, hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiRecordGetInteger(hrec, 1); + ok(r == 7, "Expected 7, got %d\n", r); + + r = MsiRecordGetInteger(hrec, 2); + ok(r == 10, "Expected 10, got %d\n", r); + + MsiCloseHandle(hrec); + MsiViewClose(hview); + MsiCloseHandle(hview); + MsiCloseHandle(hdb); +} + START_TEST(db) { test_msidatabase(); @@ -5923,4 +6024,5 @@ START_TEST(db) test_noquotes(); test_forcecodepage(); test_viewmodify_refresh(); + test_where_viewmodify(); } diff --git a/dlls/msi/where.c b/dlls/msi/where.c index aa5d5f3..8883496 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -86,6 +86,9 @@ static UINT find_entry_in_hash(MSIHASHENTRY **table, UINT row, UINT *val) { MSIHASHENTRY *entry; + if (!table) + return ERROR_SUCCESS; + if (!(entry = table[row % MSI_HASH_TABLE_SIZE])) { WARN("Row not found in hash table!\n"); @@ -503,15 +506,12 @@ static UINT WHERE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *rec, UINT row ) { MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; - UINT r; TRACE("%p %d %p\n", wv, eModifyMode, rec); - r = WHERE_execute(view, NULL); - if (r != ERROR_SUCCESS) - return r; - find_entry_in_hash(wv->reorder, row - 1, &row); + row++; + return wv->table->ops->modify( wv->table, eModifyMode, rec, row ); }

1 0

James Hawkins : msi: Open the install properties key based on the install context.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: bcba82dc0c7b965ceaa15e82bc67658d129ef09b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcba82dc0c7b965ceaa15e82b… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat Apr 5 06:02:04 2008 -0500 msi: Open the install properties key based on the install context. --- dlls/msi/action.c | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index ff93124..43ada4c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3350,6 +3350,10 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) rc = MSIREG_OpenLocalClassesProductKey(package->ProductCode, &hukey, TRUE); if (rc != ERROR_SUCCESS) goto end; + + rc = MSIREG_OpenLocalSystemInstallProps(package->ProductCode, &props, TRUE); + if (rc != ERROR_SUCCESS) + goto end; } else { @@ -3360,6 +3364,10 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) rc = MSIREG_OpenUserProductsKey(package->ProductCode,&hukey,TRUE); if (rc != ERROR_SUCCESS) goto end; + + rc = MSIREG_OpenCurrentUserInstallProps(package->ProductCode, &props, TRUE); + if (rc != ERROR_SUCCESS) + goto end; } rc = RegCreateKeyW(hukey, szSourceList, &source); @@ -3372,10 +3380,6 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) if (rc != ERROR_SUCCESS) goto end; - rc = MSIREG_OpenCurrentUserInstallProps(package->ProductCode, &props, TRUE); - if (rc != ERROR_SUCCESS) - goto end; - buffer = msi_dup_property( package, INSTALLPROPERTY_PRODUCTNAMEW ); msi_reg_set_val_str( hukey, INSTALLPROPERTY_PRODUCTNAMEW, buffer ); msi_free(buffer); @@ -3995,9 +3999,18 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) if (rc != ERROR_SUCCESS) return rc; - rc = MSIREG_OpenCurrentUserInstallProps(package->ProductCode, &props, TRUE); - if (rc != ERROR_SUCCESS) - return rc; + if (package->Context == MSIINSTALLCONTEXT_MACHINE) + { + rc = MSIREG_OpenLocalSystemInstallProps(package->ProductCode, &props, TRUE); + if (rc != ERROR_SUCCESS) + return rc; + } + else + { + rc = MSIREG_OpenCurrentUserInstallProps(package->ProductCode, &props, TRUE); + if (rc != ERROR_SUCCESS) + return rc; + } /* dump all the info i can grab */ /* FIXME: Flesh out more information */ @@ -4069,7 +4082,7 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) msi_free(upgrade_code); } - + RegCloseKey(hkey); rc = MSIREG_OpenUserDataProductKey(package->ProductCode, &hudkey, TRUE);

1 0

James Hawkins : msi: Test and reimplement MsiQueryProductState.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: e21a26e47b2f1fb2fbd617a2a9a59f9df5b01792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21a26e47b2f1fb2fbd617a2a… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat Apr 5 05:41:54 2008 -0500 msi: Test and reimplement MsiQueryProductState. --- dlls/msi/action.c | 8 ++-- dlls/msi/msi.c | 86 +++++++++++++++++++++----------------- dlls/msi/msipriv.h | 3 +- dlls/msi/registry.c | 35 ++++++++++++---- dlls/msi/tests/install.c | 5 ++- dlls/msi/tests/msi.c | 102 +++++++++++++++++++++++++++++++++++++++++++++- 6 files changed, 185 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e21a26e47b2f1fb2fbd61…

1 0

James Hawkins : msi: Don' t reorder the table when matching rows as the results are already ordered.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 85866317c58307cbe9a7ae6eb19c655963e52af2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85866317c58307cbe9a7ae6eb… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat Apr 5 02:17:57 2008 -0500 msi: Don't reorder the table when matching rows as the results are already ordered. --- dlls/msi/table.c | 3 --- dlls/msi/tests/db.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 572cad6..c3739e5 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1796,9 +1796,6 @@ static UINT TABLE_find_matching_rows( struct tagMSIVIEW *view, UINT col, *row = entry->row; - if (tv->order) - *row = tv->order->reorder[*row]; - return ERROR_SUCCESS; } diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 9be1691..663388e 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4775,8 +4775,9 @@ static void test_defaultdatabase(void) static void test_order(void) { MSIHANDLE hdb, hview, hrec; + CHAR buffer[MAX_PATH]; LPCSTR query; - UINT r; + UINT r, sz; int val; hdb = create_db(); @@ -4985,6 +4986,47 @@ static void test_order(void) MsiViewClose(hview); MsiCloseHandle(hview); + + query = "CREATE TABLE `Buffet` ( `One` CHAR(72), `Two` SHORT PRIMARY KEY `One`)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Buffet` ( `One`, `Two` ) VALUES ( 'uno', 2)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Buffet` ( `One`, `Two` ) VALUES ( 'dos', 3)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Buffet` ( `One`, `Two` ) VALUES ( 'tres', 1)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "SELECT * FROM `Buffet` WHERE `One` = 'dos' ORDER BY `Two`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 1, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buffer, "dos"), "Expected \"dos\", got \"%s\"\n", buffer); + + r = MsiRecordGetInteger(hrec, 2); + ok(r == 3, "Expected 3, got %d\n", r); + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + MsiViewClose(hview); + MsiCloseHandle(hview); MsiCloseHandle(hdb); }

1 0

James Hawkins : msi: Set the install context based on the ALLUSERS property .
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 82517d6d676d575277a7bbbc3a39832365a37409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82517d6d676d575277a7bbbc3… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat Apr 5 00:10:02 2008 -0500 msi: Set the install context based on the ALLUSERS property. --- dlls/msi/action.c | 31 ++++++++++++++++++++----------- dlls/msi/files.c | 8 ++++---- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 28 ++++++++++++++++++++++++++-- 4 files changed, 51 insertions(+), 17 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e7edabe..2029c11 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3345,13 +3345,22 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) /* ok there is a lot more done here but i need to figure out what */ - rc = MSIREG_OpenProductsKey(package->ProductCode,&hkey,TRUE); - if (rc != ERROR_SUCCESS) - goto end; + if (package->Context == MSIINSTALLCONTEXT_MACHINE) + { + rc = MSIREG_OpenLocalClassesProductKey(package->ProductCode, &hukey, TRUE); + if (rc != ERROR_SUCCESS) + goto end; + } + else + { + rc = MSIREG_OpenProductsKey(package->ProductCode,&hkey,TRUE); + if (rc != ERROR_SUCCESS) + goto end; - rc = MSIREG_OpenUserProductsKey(package->ProductCode,&hukey,TRUE); - if (rc != ERROR_SUCCESS) - goto end; + rc = MSIREG_OpenUserProductsKey(package->ProductCode,&hukey,TRUE); + if (rc != ERROR_SUCCESS) + goto end; + } rc = RegCreateKeyW(hukey, szSourceList, &source); if (rc != ERROR_SUCCESS) @@ -3400,19 +3409,19 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) buffer = strrchrW( package->PackagePath, '\\') + 1; rc = MsiSourceListSetInfoW( package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, + package->Context, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEW, buffer ); if (rc != ERROR_SUCCESS) goto end; rc = MsiSourceListSetInfoW( package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, + package->Context, MSICODE_PRODUCT, INSTALLPROPERTY_MEDIAPACKAGEPATHW, szEmpty ); if (rc != ERROR_SUCCESS) goto end; rc = MsiSourceListSetInfoW( package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, + package->Context, MSICODE_PRODUCT, INSTALLPROPERTY_DISKPROMPTW, szEmpty ); if (rc != ERROR_SUCCESS) goto end; @@ -4221,13 +4230,13 @@ static UINT ACTION_ResolveSource(MSIPACKAGE* package) DWORD size = 0; rc = MsiSourceListGetInfoW(package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, + package->Context, MSICODE_PRODUCT, INSTALLPROPERTY_DISKPROMPTW,NULL,&size); if (rc == ERROR_MORE_DATA) { prompt = msi_alloc(size * sizeof(WCHAR)); MsiSourceListGetInfoW(package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, + package->Context, MSICODE_PRODUCT, INSTALLPROPERTY_DISKPROMPTW,prompt,&size); } else diff --git a/dlls/msi/files.c b/dlls/msi/files.c index e0f7889..1aae66d 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -581,11 +581,11 @@ static UINT load_media_info(MSIPACKAGE *package, MSIFILE *file, struct media_inf } if (mi->type == DRIVE_CDROM || mi->type == DRIVE_REMOVABLE) - msi_package_add_media_disk(package, MSIINSTALLCONTEXT_USERUNMANAGED, + msi_package_add_media_disk(package, package->Context, MSICODE_PRODUCT, mi->disk_id, mi->volume_label, mi->disk_prompt); - msi_package_add_info(package, MSIINSTALLCONTEXT_USERUNMANAGED, + msi_package_add_info(package, package->Context, options, INSTALLPROPERTY_LASTUSEDSOURCEW, source); msi_free(source_dir); @@ -603,7 +603,7 @@ static UINT find_published_source(MSIPACKAGE *package, struct media_info *mi) UINT r; r = MsiSourceListGetInfoW(package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, + package->Context, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEW, source, &size); if (r != ERROR_SUCCESS) return r; @@ -612,7 +612,7 @@ static UINT find_published_source(MSIPACKAGE *package, struct media_info *mi) volumesz = MAX_PATH; promptsz = MAX_PATH; while (MsiSourceListEnumMediaDisksW(package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERUNMANAGED, + package->Context, MSICODE_PRODUCT, index++, &id, volume, &volumesz, prompt, &promptsz) == ERROR_SUCCESS) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 975ebb6..43fa923 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -307,6 +307,7 @@ typedef struct tagMSIPACKAGE float center_y; UINT WordCount; + UINT Context; struct list subscriptions; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index fad0520..a587a63 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -416,7 +416,6 @@ static VOID set_installer_properties(MSIPACKAGE *package) static const WCHAR szColorBits[] = {'C','o','l','o','r','B','i','t','s',0}; static const WCHAR szIntFormat[] = {'%','d',0}; static const WCHAR szIntel[] = { 'I','n','t','e','l',0 }; - static const WCHAR szAllUsers[] = { 'A','L','L','U','S','E','R','S',0 }; static const WCHAR szUserInfo[] = { 'S','O','F','T','W','A','R','E','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -542,7 +541,6 @@ static VOID set_installer_properties(MSIPACKAGE *package) /* in a wine environment the user is always admin and privileged */ MSI_SetPropertyW(package,szAdminUser,szOne); MSI_SetPropertyW(package,szPriv,szOne); - MSI_SetPropertyW(package, szAllUsers, szOne); /* set the os things */ OSVersion.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW); @@ -762,6 +760,30 @@ static UINT msi_load_admin_properties(MSIPACKAGE *package) return r; } +static UINT msi_set_context(MSIPACKAGE *package) +{ + WCHAR val[10]; + DWORD sz = 10; + DWORD num; + UINT r; + + static const WCHAR szOne[] = {'1',0}; + static const WCHAR szAllUsers[] = {'A','L','L','U','S','E','R','S',0}; + + package->Context = MSIINSTALLCONTEXT_USERUNMANAGED; + + r = MSI_GetPropertyW(package, szAllUsers, val, &sz); + if (r == ERROR_SUCCESS) + { + num = atolW(val); + if (num == 1 || num == 2) + package->Context = MSIINSTALLCONTEXT_MACHINE; + } + + MSI_SetPropertyW(package, szAllUsers, szOne); + return ERROR_SUCCESS; +} + MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) { static const WCHAR szLevel[] = { 'U','I','L','e','v','e','l',0 }; @@ -801,6 +823,8 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) if (package->WordCount & MSIWORDCOUNT_ADMINISTRATIVE) msi_load_admin_properties( package ); + + msi_set_context( package ); } return package;

1 0

James Hawkins : msi: Reset the feature states if iInstallLevel is 0 or below.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 30c1b88828464e1220c7eb4b884aedce6913607f URL: http://source.winehq.org/git/wine.git/?a=commit;h=30c1b88828464e1220c7eb4b8… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Apr 4 22:48:20 2008 -0500 msi: Reset the feature states if iInstallLevel is 0 or below. --- dlls/msi/install.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 999840d..6415459 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -1169,15 +1169,16 @@ UINT MSI_SetInstallLevel( MSIPACKAGE *package, int iInstallLevel ) TRACE("%p %i\n", package, iInstallLevel); - if (iInstallLevel<1 || iInstallLevel>32767) + if (iInstallLevel > 32767) return ERROR_INVALID_PARAMETER; + if (iInstallLevel < 1) + return MSI_SetFeatureStates( package ); + sprintfW( level, fmt, iInstallLevel ); r = MSI_SetPropertyW( package, szInstallLevel, level ); if ( r == ERROR_SUCCESS ) - { r = MSI_SetFeatureStates( package ); - } return r; }

1 0

Dan Hipschman : qedit/tests: Add a partial test for IMediaDet_get_StreamMediaType.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 742120ba94b2b9d58a9a0d5bd3eaa2b84434d21e URL: http://source.winehq.org/git/wine.git/?a=commit;h=742120ba94b2b9d58a9a0d5bd… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Apr 4 16:01:27 2008 -0700 qedit/tests: Add a partial test for IMediaDet_get_StreamMediaType. --- dlls/qedit/tests/mediadet.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 0ec9458..0870fd0 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -22,6 +22,8 @@ #define COBJMACROS +#include "ole2.h" +#include "uuids.h" #include "wine/test.h" #include "qedit.h" @@ -84,6 +86,7 @@ static void test_mediadet(void) BSTR filename = NULL; long nstrms = 0; long strm; + AM_MEDIA_TYPE mt; hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaDet, (LPVOID*)&pM); @@ -114,6 +117,12 @@ static void test_mediadet(void) todo_wine ok(hr == S_OK, "IMediaDet_get_CurrentStream\n"); todo_wine ok(strm == 0, "IMediaDet_get_CurrentStream\n"); + ZeroMemory(&mt, sizeof mt); + hr = IMediaDet_get_StreamMediaType(pM, &mt); + todo_wine ok(hr == S_OK, "IMediaDet_get_StreamMediaType\n"); + todo_wine ok(IsEqualGUID(&mt.majortype, &MEDIATYPE_Video), + "IMediaDet_get_StreamMediaType\n"); + hr = IMediaDet_Release(pM); ok(hr == 0, "IMediaDet_Release returned: %x\n", hr);

1 0

Dan Hipschman : qedit/tests: Add a test for IMediaDet_(put|get) _CurrentStream.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: b37ee801668d67cbdac6b072d08bdf4c17f3698d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b37ee801668d67cbdac6b072d… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Apr 4 16:01:06 2008 -0700 qedit/tests: Add a test for IMediaDet_(put|get)_CurrentStream. --- dlls/qedit/tests/mediadet.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 26d27b1..0ec9458 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -83,6 +83,7 @@ static void test_mediadet(void) IMediaDet *pM = NULL; BSTR filename = NULL; long nstrms = 0; + long strm; hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaDet, (LPVOID*)&pM); @@ -105,6 +106,14 @@ static void test_mediadet(void) "IMediaDet_get_Filename\n"); SysFreeString(filename); + hr = IMediaDet_put_CurrentStream(pM, 0); + todo_wine ok(hr == S_OK, "IMediaDet_put_CurrentStream\n"); + + strm = -1; + hr = IMediaDet_get_CurrentStream(pM, &strm); + todo_wine ok(hr == S_OK, "IMediaDet_get_CurrentStream\n"); + todo_wine ok(strm == 0, "IMediaDet_get_CurrentStream\n"); + hr = IMediaDet_Release(pM); ok(hr == 0, "IMediaDet_Release returned: %x\n", hr);

1 0

Dan Hipschman : qedit/tests: Add a test for IMediaDet_get_Filename.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 07f9c44b36450e98ece1427843b3894a998febf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07f9c44b36450e98ece142784… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Apr 4 16:00:41 2008 -0700 qedit/tests: Add a test for IMediaDet_get_Filename. --- dlls/qedit/tests/mediadet.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index de4bd23..26d27b1 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -98,6 +98,13 @@ static void test_mediadet(void) todo_wine ok(hr == S_OK, "IMediaDet_get_OutputStreams\n"); todo_wine ok(nstrms == 1, "IMediaDet_get_OutputStreams\n"); + filename = NULL; + hr = IMediaDet_get_Filename(pM, &filename); + todo_wine ok(hr == S_OK, "IMediaDet_get_Filename\n"); + todo_wine ok(lstrcmpW(filename, test_avi_filename) == 0, + "IMediaDet_get_Filename\n"); + SysFreeString(filename); + hr = IMediaDet_Release(pM); ok(hr == 0, "IMediaDet_Release returned: %x\n", hr);

1 0

Dan Hipschman : qedit/tests: Add a test for IMediaDet_get_OutputStreams.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: b0b47ac5f58f37bf06e76ab51173fd7617891774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0b47ac5f58f37bf06e76ab51… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Apr 4 16:00:05 2008 -0700 qedit/tests: Add a test for IMediaDet_get_OutputStreams. --- dlls/qedit/tests/mediadet.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index b9ea9c0..de4bd23 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -82,6 +82,7 @@ static void test_mediadet(void) HRESULT hr; IMediaDet *pM = NULL; BSTR filename = NULL; + long nstrms = 0; hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaDet, (LPVOID*)&pM); @@ -93,6 +94,10 @@ static void test_mediadet(void) todo_wine ok(hr == S_OK, "IMediaDet_put_Filename -> %x\n", hr); SysFreeString(filename); + hr = IMediaDet_get_OutputStreams(pM, &nstrms); + todo_wine ok(hr == S_OK, "IMediaDet_get_OutputStreams\n"); + todo_wine ok(nstrms == 1, "IMediaDet_get_OutputStreams\n"); + hr = IMediaDet_Release(pM); ok(hr == 0, "IMediaDet_Release returned: %x\n", hr);

1 0

Dan Hipschman : qedit/tests: Add test framework and test for IMediaDet_put_Filename.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 999bc5bcb292a796454d081abf0ca1d868a00090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=999bc5bcb292a796454d081ab… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Apr 4 15:59:08 2008 -0700 qedit/tests: Add test framework and test for IMediaDet_put_Filename. --- dlls/qedit/tests/Makefile.in | 4 ++- dlls/qedit/tests/mediadet.c | 66 ++++++++++++++++++++++++++++++++++++++++++ dlls/qedit/tests/qedit.rc | 22 ++++++++++++++ dlls/qedit/tests/test.avi | Bin 0 -> 5676 bytes 4 files changed, 91 insertions(+), 1 deletions(-) diff --git a/dlls/qedit/tests/Makefile.in b/dlls/qedit/tests/Makefile.in index 5236975..94c5e60 100644 --- a/dlls/qedit/tests/Makefile.in +++ b/dlls/qedit/tests/Makefile.in @@ -3,12 +3,14 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = qedit.dll -IMPORTS = ole32 kernel32 +IMPORTS = oleaut32 ole32 kernel32 EXTRALIBS = -lstrmiids -luuid CTESTS = \ mediadet.c +RC_SRCS = qedit.rc + @MAKE_TEST_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index b550c8e..b9ea9c0 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -25,22 +25,88 @@ #include "wine/test.h" #include "qedit.h" +static WCHAR test_avi_filename[MAX_PATH]; + +static BOOL init_tests(void) +{ + static WCHAR temp_path[MAX_PATH]; + static WCHAR prefix[] = {'D','E','S',0}; + static WCHAR avi[] = {'a','v','i',0}; + HRSRC res; + HGLOBAL data; + char *mem; + DWORD size, written; + HANDLE fh; + + res = FindResourceW(NULL, (LPWSTR) 1, (LPWSTR) 256); + if (!res) + return FALSE; + + data = LoadResource(NULL, res); + if (!data) + return FALSE; + + mem = LockResource(data); + if (!mem) + return FALSE; + + size = SizeofResource(NULL, res); + if (size == 0) + return FALSE; + + if (!GetTempPathW(sizeof temp_path, temp_path)) + return FALSE; + + /* We might end up relying on the extension here, so .TMP is no good. */ + if (!GetTempFileNameW(temp_path, prefix, 0, test_avi_filename)) + return FALSE; + + DeleteFileW(test_avi_filename); + lstrcpyW(test_avi_filename + lstrlenW(test_avi_filename) - 3, avi); + + fh = CreateFileW(test_avi_filename, GENERIC_WRITE, 0, NULL, + CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + if (fh == INVALID_HANDLE_VALUE) + return FALSE; + + if (!WriteFile(fh, mem, size, &written, NULL) || written != size) + return FALSE; + + CloseHandle(fh); + + return TRUE; +} + static void test_mediadet(void) { HRESULT hr; IMediaDet *pM = NULL; + BSTR filename = NULL; hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaDet, (LPVOID*)&pM); ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); ok(pM != NULL, "pM is NULL\n"); + filename = SysAllocString(test_avi_filename); + hr = IMediaDet_put_Filename(pM, filename); + todo_wine ok(hr == S_OK, "IMediaDet_put_Filename -> %x\n", hr); + SysFreeString(filename); + hr = IMediaDet_Release(pM); ok(hr == 0, "IMediaDet_Release returned: %x\n", hr); + + DeleteFileW(test_avi_filename); } START_TEST(mediadet) { + if (!init_tests()) + { + skip("Couldn't initialize tests!\n"); + return; + } + CoInitialize(NULL); test_mediadet(); CoUninitialize(); diff --git a/dlls/qedit/tests/qedit.rc b/dlls/qedit/tests/qedit.rc new file mode 100644 index 0000000..b138624 --- /dev/null +++ b/dlls/qedit/tests/qedit.rc @@ -0,0 +1,22 @@ +/* + * Resource file for qedit tests. + * + * Copyright 2008 Google (Dan Hipschman) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: test.avi */ +1 256 test.avi diff --git a/dlls/qedit/tests/test.avi b/dlls/qedit/tests/test.avi new file mode 100644 index 0000000..8756c64 Binary files /dev/null and b/dlls/qedit/tests/test.avi differ

1 0

Dan Hipschman : qedit/tests: Don't forget CoUninitialize.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 8b432b3655637aaf4541906def9ff301b9801731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b432b3655637aaf4541906de… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Apr 4 15:58:17 2008 -0700 qedit/tests: Don't forget CoUninitialize. --- dlls/qedit/tests/mediadet.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 5d5178d..b550c8e 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -43,4 +43,5 @@ START_TEST(mediadet) { CoInitialize(NULL); test_mediadet(); + CoUninitialize(); }

1 0

Michael Moss : wine.inf: Move winebrowser.exe to the system directory.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 4a8d26a9cf6da9fe0a05a26411fe81fa0bfae707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a8d26a9cf6da9fe0a05a2641… Author: Michael Moss <mmoss(a)google.com> Date: Fri Apr 4 14:08:41 2008 -0700 wine.inf: Move winebrowser.exe to the system directory. --- tools/wine.inf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 4d7f7b7..f3cda7b 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2212,7 +2212,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,,notepad.exe 10,,regedit.exe 10,,twain_32.dll -10,,winebrowser.exe 10,,winhelp.exe 10,command,start.exe 11,,actxprxy.dll @@ -2272,6 +2271,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,urlmon.dll 11,,user32.dll 11,,version.dll +11,,winebrowser.exe 11,,wininet.dll 11,,winmm.dll 11,,winspool.drv

1 0

Andrew Talbot : wintrust: Avoid assigning to struct members from other structs.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: e68cc16a11f92c59f8cb02781612ce98c844e590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e68cc16a11f92c59f8cb02781… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Apr 4 17:56:34 2008 +0100 wintrust: Avoid assigning to struct members from other structs. --- dlls/wintrust/register.c | 184 ++++++++++++++++++++++++++-------------------- 1 files changed, 103 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e68cc16a11f92c59f8cb0…

1 0

Andrew Talbot : port: Remove superfluous semicolon.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 8ba539844b275472f46556b092c70a5332870478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ba539844b275472f46556b09… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Apr 4 17:56:29 2008 +0100 port: Remove superfluous semicolon. --- libs/port/interlocked.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index c2d85b6..12b326f 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -49,7 +49,7 @@ __ASM_GLOBAL_FUNC(interlocked_cmpxchg_ptr, "lock; cmpxchg8b (%esi)\n\t" "pop %esi\n\t" "pop %ebx\n\t" - "ret"); + "ret") __ASM_GLOBAL_FUNC(interlocked_xchg, "movl 8(%esp),%eax\n\t" "movl 4(%esp),%edx\n\t"

1 0

Paul Vriens : rsaenh/tests: Fix a test on W2K and above.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 66c022c28cb3cc758f53d31467f70020bb6ca126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66c022c28cb3cc758f53d3146… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Apr 4 17:39:37 2008 +0200 rsaenh/tests: Fix a test on W2K and above. --- dlls/rsaenh/tests/rsaenh.c | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 4fef6e9..0119f28 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "winerror.h" #include "wincrypt.h" +#include "winreg.h" static HCRYPTPROV hProv; static const char szContainer[] = "winetest"; @@ -55,6 +56,33 @@ static const cryptdata cTestData[4] = { 12,12,16} }; +/* + * 1. Take the MD5 Hash of the container name (with an extra null byte) + * 2. Turn the hash into a 4 DWORD hex value + * 3. Append a '_' + * 4. Add the MachineGuid + * + */ +static void uniquecontainer(char *unique) +{ + /* MD5 hash of "winetest\0" in 4 DWORD hex */ + static const char szContainer_md5[] = "9d20fd8d05ed2b8455d125d0bf6d6a70"; + static const char szCryptography[] = "Software\\Microsoft\\Cryptography"; + static const char szMachineGuid[] = "MachineGuid"; + HKEY hkey; + char guid[MAX_PATH]; + DWORD size = MAX_PATH; + + /* Get the MachineGUID */ + RegOpenKeyA(HKEY_LOCAL_MACHINE, szCryptography, &hkey); + RegQueryValueExA(hkey, szMachineGuid, NULL, NULL, (LPBYTE)guid, &size); + RegCloseKey(hkey); + + lstrcpy(unique, szContainer_md5); + lstrcat(unique, "_"); + lstrcat(unique, guid); +} + static void printBytes(const char *heading, const BYTE *pb, size_t cb) { size_t i; @@ -1849,11 +1877,21 @@ static void test_null_provider(void) SetLastError(0xdeadbeef); result = CryptGetProvParam(prov, PP_UNIQUE_CONTAINER, (LPBYTE)szName, &dataLen, 0); if (!result && GetLastError() == NTE_BAD_TYPE) + { skip("PP_UNIQUE_CONTAINER is not supported (win9x or NT)\n"); + } else - ok(result && dataLen == strlen(szContainer)+1 && strcmp(szContainer,szName) == 0, - "failed getting PP_UNIQUE_CONTAINER. result = %s. Error 0x%08X. returned length = %d\n", - (result)? "TRUE":"FALSE",GetLastError(),dataLen); + { + char container[MAX_PATH]; + + ok(result, "failed getting PP_UNIQUE_CONTAINER : 0x%08X\n", GetLastError()); + uniquecontainer(container); + todo_wine + { + ok(dataLen == strlen(container)+1, "Expected a param length of 70, got %d\n", dataLen); + ok(!strcmp(container, szName), "Wrong container name : %s\n", szName); + } + } result = CryptGetUserKey(prov, AT_KEYEXCHANGE, &key); ok(!result && GetLastError() == NTE_NO_KEY, "Expected NTE_NO_KEY, got %08x\n", GetLastError());

1 0

Alexandre Julliard : user32: Fix a few ShowWindow todo tests.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: d0e1dd84b22b1906a44f682394b5d1b90ba5ded8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e1dd84b22b1906a44f68239… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 4 18:22:40 2008 +0200 user32: Fix a few ShowWindow todo tests. --- dlls/user32/tests/msg.c | 8 ++++---- dlls/user32/winpos.c | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6f37f48..a866987 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9443,7 +9443,7 @@ static void test_ShowWindow(void) /* 16 */ { SW_HIDE, FALSE, 0, WmEmptySeq, FALSE }, /* 17 */ { SW_SHOW, FALSE, WS_VISIBLE, WmShow, FALSE }, /* 18 */ { SW_SHOW, TRUE, WS_VISIBLE, WmEmptySeq, FALSE }, -/* 19 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_1, TRUE }, +/* 19 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_1, FALSE }, /* 20 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax_3, FALSE }, /* 21 */ { SW_HIDE, TRUE, WS_MINIMIZE, WmHide_2, FALSE }, /* 22 */ { SW_SHOWMINNOACTIVE, FALSE, WS_VISIBLE|WS_MINIMIZE, WmShowMinNoActivate, TRUE }, @@ -9464,11 +9464,11 @@ static void test_ShowWindow(void) /* 37 */ { SW_RESTORE, FALSE, WS_VISIBLE, WmRestore_2, FALSE }, /* 38 */ { SW_RESTORE, TRUE, WS_VISIBLE, WmEmptySeq, FALSE }, /* 39 */ { SW_SHOWNOACTIVATE, TRUE, WS_VISIBLE, WmEmptySeq, FALSE }, -/* 40 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_2, TRUE }, +/* 40 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_2, FALSE }, /* 41 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax_3, FALSE }, /* 42 */ { SW_SHOWMAXIMIZED, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmShowMaximized_2, TRUE }, /* 43 */ { SW_SHOWMAXIMIZED, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmMinMax_2, FALSE }, -/* 44 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_1, TRUE }, +/* 44 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_1, FALSE }, /* 45 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax_3, FALSE }, /* 46 */ { SW_RESTORE, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmRestore_3, FALSE }, /* 47 */ { SW_RESTORE, TRUE, WS_VISIBLE, WmRestore_4, FALSE }, @@ -9478,7 +9478,7 @@ static void test_ShowWindow(void) /* 51 */ { SW_SHOWNORMAL, TRUE, WS_VISIBLE, WmEmptySeq, FALSE }, /* 52 */ { SW_HIDE, TRUE, 0, WmHide_1, FALSE }, /* 53 */ { SW_HIDE, FALSE, 0, WmEmptySeq, FALSE }, -/* 54 */ { SW_MINIMIZE, FALSE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_3, TRUE }, +/* 54 */ { SW_MINIMIZE, FALSE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_3, FALSE }, /* 55 */ { SW_HIDE, TRUE, WS_MINIMIZE, WmHide_2, FALSE }, /* 56 */ { SW_SHOWNOACTIVATE, FALSE, WS_VISIBLE, WmShowNoActivate_2, FALSE }, /* 57 */ { SW_SHOW, TRUE, WS_VISIBLE, WmEmptySeq, FALSE } diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 04377b9..5d346ee 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -983,11 +983,9 @@ static BOOL show_window( HWND hwnd, INT cmd ) break; case SW_SHOWMINNOACTIVE: - swp |= SWP_NOACTIVATE | SWP_NOZORDER; - /* fall through */ case SW_MINIMIZE: case SW_FORCEMINIMIZE: /* FIXME: Does not work if thread is hung. */ - if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER; + swp |= SWP_NOACTIVATE | SWP_NOZORDER; /* fall through */ case SW_SHOWMINIMIZED: swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED;

1 0

Alexandre Julliard : winex11: Ignore ConfigureNotify events when a window is iconified.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: f6662c7bbec5eb010f5d4cd4844758fdaba4fa0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6662c7bbec5eb010f5d4cd48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 4 18:22:23 2008 +0200 winex11: Ignore ConfigureNotify events when a window is iconified. --- dlls/winex11.drv/winpos.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 1779b45..25f7413 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -549,7 +549,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) if (!hwnd) return; if (!(data = X11DRV_get_win_data( hwnd ))) return; - if (!data->mapped) return; + if (!data->mapped || data->iconic) return; /* Get geometry */ @@ -586,7 +586,6 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) hwnd, rect.left, rect.top, x, y ); if ((rect.right - rect.left == cx && rect.bottom - rect.top == cy) || - IsIconic(hwnd) || (IsRectEmpty( &rect ) && event->width == 1 && event->height == 1)) { if (flags & SWP_NOMOVE) return; /* if nothing changed, don't do anything */

1 0

softpub exported functions prototypes
by andre furtado 04 Apr '08

04 Apr '08

add softpub exported functions prototypes... HRESULT WINAPI GenericChainCertificateTrust(IN OUT PCRYPT_PROVIDER_DATA pProvData)HRESULT WINAPI GenericChainFinalProv(IN OUT PCRYPT_PROVIDER_DATA pProvData)HRESULT WINAPI HTTPSCertificateTrust(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI SoftpubDefCertInit(CRYPT_PROVIDER_DATA *pProvData)BOOL WINAPI SoftpubFreeDefUsageCallData(const char *pszUsageOID, CRYPT_PROVIDER_DEFUSAGE *psDefUsage)BOOL WINAPI SoftpubLoadDefUsageCallData(const char *pszUsageOID, CRYPT_PROVIDER_DEFUSAGE *psDefUsage)BOOL CALLBACK AddPersonalTrustDBPages(LPVOID lpv, LPFNADDPROPSHEETPAGE lpfnAddPage, LPARAM lParam) HRESULT WINAPI DriverCleanupPolicy(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI DriverFinalPolicy(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI DriverInitializePolicy(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI HTTPSFinalProv(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI OfficeCleanupPolicy(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI OfficeInitializePolicy(CRYPT_PROVIDER_DATA *pProvData)BOOL WINAPI OpenPersonalTrustDBDialog(HWND hWnd)HRESULT WINAPI OfficeInitializePolicy(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI SoftpubAuthenticode(CRYPT_PROVIDER_DATA *pProvData)BOOL WINAPI SoftpubCheckCert(CRYPT_PROVIDER_DATA *pProvData, DWORD idxSigner, BOOL fCounterSignerChain, DWORD idxCounterSigner)HRESULT WINAPI SoftpubCleanup(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI SoftpubDumpStructure(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI SoftpubInitialize(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *pProvData)HRESULT SoftpubLoadSignature(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI FindCertsByIssuer(OUT PCERT_CHAIN pCertChains, IN OUT DWORD *pcbCertChains, OUT DWORD *pcCertChains, IN BYTE* pbEncodedIssuerName, IN DWORD cbEncodedIssuerName, IN LPCWSTR pwszPurpose, IN DWORD dwKeySpec) André Renato Furtado talk2cod(a)hotmail.com _________________________________________________________________ Confira vídeos com notícias do NY Times, gols direto do Lance, videocassetadas e muito mais no MSN Video! http://video.msn.com/?mkt=pt-br

1 0

xenroll exported functions
by andre furtado 04 Apr '08

04 Apr '08

add documentation for exported functions of the xenroll library...IEnroll * WINAPI PIEnrollGetNoCOM(void)*/ returns a pointer to an IEnroll interface. */IEnroll2 * WINAPI PIEnroll2GetNoCOM(void)*/ returns a pointer to an IEnroll2 interface. */IEnroll4 * WINAPI PIEnroll4GetNoCOM(void)*/ returns a pointer to an IEnroll4 interface. */ André Renato Furtado talk2cod(a)hotmail.com _________________________________________________________________ Instale a Barra de Ferramentas com Desktop Search e ganhe EMOTICONS para o Messenger! É GRÁTIS! http://www.msn.com.br/emoticonpack

1 0

xenroll exported functions
by andre furtado 04 Apr '08

04 Apr '08

add documentation for exported functions of the xenroll library...IEnroll * WINAPI PIEnrollGetNoCOM(void)*/ returns a pointer to an IEnroll interface. */IEnroll2 * WINAPI PIEnroll2GetNoCOM(void)*/ returns a pointer to an IEnroll2 interface. */IEnroll4 * WINAPI PIEnroll4GetNoCOM(void)*/ returns a pointer to an IEnroll4 interface. */ André Renato Furtado talk2cod(a)hotmail.com _________________________________________________________________ Conheça o Windows Live Spaces, a rede de relacionamentos do Messenger! http://www.amigosdomessenger.com.br/

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2008