June 2007 - Wine-commits - list.winehq.org

Detlef Riekenberg : ntprint: Add a stub for ntprint.dll.
by Alexandre Julliard 19 Jun '07

19 Jun '07

Module: wine Branch: master Commit: a8697b58f1cdc428d15a9a9438ac79bbad7bd4ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8697b58f1cdc428d15a9a943… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jun 19 00:02:15 2007 +0200 ntprint: Add a stub for ntprint.dll. --- Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/ntprint/Makefile.in | 13 ++++++++++ dlls/ntprint/ntprint.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ntprint/ntprint.spec | 35 ++++++++++++++++++++++++++++ 7 files changed, 111 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index c63c782..fe6731b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -314,6 +314,7 @@ ALL_MAKEFILES = \ dlls/ntdll/tests/Makefile \ dlls/ntdsapi/Makefile \ dlls/ntoskrnl.exe/Makefile \ + dlls/ntprint/Makefile \ dlls/objsel/Makefile \ dlls/odbc32/Makefile \ dlls/odbccp32/Makefile \ @@ -669,6 +670,7 @@ dlls/ntdll/Makefile: dlls/ntdll/Makefile.in dlls/Makedll.rules dlls/ntdll/tests/Makefile: dlls/ntdll/tests/Makefile.in dlls/Maketest.rules dlls/ntdsapi/Makefile: dlls/ntdsapi/Makefile.in dlls/Makedll.rules dlls/ntoskrnl.exe/Makefile: dlls/ntoskrnl.exe/Makefile.in dlls/Makedll.rules +dlls/ntprint/Makefile: dlls/ntprint/Makefile.in dlls/Makedll.rules dlls/objsel/Makefile: dlls/objsel/Makefile.in dlls/Makedll.rules dlls/odbc32/Makefile: dlls/odbc32/Makefile.in dlls/Makedll.rules dlls/odbccp32/Makefile: dlls/odbccp32/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 0828b37..05d20a3 100755 --- a/configure +++ b/configure @@ -20692,6 +20692,8 @@ ac_config_files="$ac_config_files dlls/ntdsapi/Makefile" ac_config_files="$ac_config_files dlls/ntoskrnl.exe/Makefile" +ac_config_files="$ac_config_files dlls/ntprint/Makefile" + ac_config_files="$ac_config_files dlls/objsel/Makefile" ac_config_files="$ac_config_files dlls/odbc32/Makefile" @@ -21782,6 +21784,7 @@ do "dlls/ntdll/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ntdll/tests/Makefile" ;; "dlls/ntdsapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ntdsapi/Makefile" ;; "dlls/ntoskrnl.exe/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ntoskrnl.exe/Makefile" ;; + "dlls/ntprint/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ntprint/Makefile" ;; "dlls/objsel/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/objsel/Makefile" ;; "dlls/odbc32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/odbc32/Makefile" ;; "dlls/odbccp32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/odbccp32/Makefile" ;; diff --git a/configure.ac b/configure.ac index 5d6fce7..070faac 100644 --- a/configure.ac +++ b/configure.ac @@ -1597,6 +1597,7 @@ AC_CONFIG_FILES([dlls/ntdll/Makefile]) AC_CONFIG_FILES([dlls/ntdll/tests/Makefile]) AC_CONFIG_FILES([dlls/ntdsapi/Makefile]) AC_CONFIG_FILES([dlls/ntoskrnl.exe/Makefile]) +AC_CONFIG_FILES([dlls/ntprint/Makefile]) AC_CONFIG_FILES([dlls/objsel/Makefile]) AC_CONFIG_FILES([dlls/odbc32/Makefile]) AC_CONFIG_FILES([dlls/odbccp32/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 9c16a9a..265b541 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -132,6 +132,7 @@ BASEDIRS = \ ntdll \ ntdsapi \ ntoskrnl.exe \ + ntprint \ objsel \ odbc32 \ odbccp32 \ diff --git a/dlls/ntprint/Makefile.in b/dlls/ntprint/Makefile.in new file mode 100644 index 0000000..93fbcf6 --- /dev/null +++ b/dlls/ntprint/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = ntprint.dll +IMPORTS = kernel32 + +C_SRCS = \ + ntprint.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/ntprint/ntprint.c b/dlls/ntprint/ntprint.c new file mode 100644 index 0000000..d3f8503 --- /dev/null +++ b/dlls/ntprint/ntprint.c @@ -0,0 +1,56 @@ +/* + * Implementation of the Spooler Setup API (Printing) + * + * Copyright 2007 Detlef Riekenberg + * + * 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 + */ + +#include <stdarg.h> + +#define COBJMACROS +#define NONAMELESSUNION + +#include "windef.h" +#include "winbase.h" +#include "winver.h" +#include "winnls.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ntprint); + +HINSTANCE NTPRINT_hInstance = NULL; + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(%p, %d, %p)\n",hinstDLL, fdwReason, lpvReserved); + + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + + case DLL_PROCESS_ATTACH: + NTPRINT_hInstance = hinstDLL; + DisableThreadLibraryCalls( hinstDLL ); + break; + } + return TRUE; +} diff --git a/dlls/ntprint/ntprint.spec b/dlls/ntprint/ntprint.spec new file mode 100644 index 0000000..f703e96 --- /dev/null +++ b/dlls/ntprint/ntprint.spec @@ -0,0 +1,35 @@ +@ stub ClassInstall32 +@ stub PSetupAssociateICMProfiles +@ stub PSetupBuildDriversFromPath +@ stub PSetupCreateDrvSetupPage +@ stub PSetupCreateMonitorInfo +@ stub PSetupCreatePrinterDeviceInfoList +@ stub PSetupDestroyDriverInfo3 +@ stub PSetupDestroyMonitorInfo +@ stub PSetupDestroyPrinterDeviceInfoList +@ stub PSetupDestroySelectedDriverInfo +@ stub PSetupDriverInfoFromName +@ stub PSetupEnumMonitor +@ stub PSetupFreeDrvField +@ stub PSetupGetDriverInfForPrinter +@ stub PSetupGetDriverInfo3 +@ stub PSetupGetLocalDataField +@ stub PSetupGetPathToSearch +@ stub PSetupGetSelectedDriverInfo +@ stub PSetupInstallICMProfiles +@ stub PSetupInstallMonitor +@ stub PSetupInstallPrinterDriver +@ stub PSetupInstallPrinterDriverFromTheWeb +@ stub PSetupIsCompatibleDriver +@ stub PSetupIsDriverInstalled +@ stub PSetupIsMonitorInstalled +@ stub PSetupIsOemDriver +@ stub PSetupIsTheDriverFoundInInfInstalled +@ stub PSetupKillBadUserConnections +@ stub PSetupPreSelectDriver +@ stub PSetupProcessPrinterAdded +@ stub PSetupRefreshDriverList +@ stub PSetupSelectDeviceButtons +@ stub PSetupSelectDriver +@ stub PSetupSetSelectDevTitleAndInstructions +@ stub PSetupThisPlatform

1 0

Detlef Riekenberg : printui: Add version resource.
by Alexandre Julliard 19 Jun '07

19 Jun '07

Module: wine Branch: master Commit: aec01bfcf4c4c9ddb0f2d8f1243dfdf57a26e689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aec01bfcf4c4c9ddb0f2d8f12… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jun 18 23:04:09 2007 +0200 printui: Add version resource. --- .gitignore | 1 + dlls/printui/Makefile.in | 2 ++ dlls/printui/printui.rc | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 15c7492..a2e2c37 100644 --- a/.gitignore +++ b/.gitignore @@ -426,6 +426,7 @@ dlls/olesvr32/libolesvr32.def dlls/opengl32/libopengl32.def dlls/opengl32/version.res dlls/powrprof/libpowrprof.def +dlls/printui/printui.res dlls/psapi/libpsapi.def dlls/psapi/tests/*.ok dlls/psapi/tests/psapi_crosstest.exe diff --git a/dlls/printui/Makefile.in b/dlls/printui/Makefile.in index 20fde18..2cb44b9 100644 --- a/dlls/printui/Makefile.in +++ b/dlls/printui/Makefile.in @@ -8,6 +8,8 @@ IMPORTS = kernel32 C_SRCS = \ printui.c +RC_SRCS = printui.rc + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/printui/printui.rc b/dlls/printui/printui.rc new file mode 100644 index 0000000..d8d0d4b --- /dev/null +++ b/dlls/printui/printui.rc @@ -0,0 +1,37 @@ +/* + * Top level resource file for printui.dll + * + * Copyright 2007 Detlef Riekenberg + * + * 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 + * + */ + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winver.h" + +#define WINE_FILENAME_STR "printui.dll" +#define WINE_FILEDESCRIPTION_STR "User Interface for Printing" + +/* Same Version as WinXP_sp2 */ +#define WINE_FILEVERSION 5,1,2600,2180 +#define WINE_FILEVERSION_STR "5.1.2600.2180" + +#define WINE_PRODUCTVERSION 5,1,2600,2180 +#define WINE_PRODUCTVERSION_STR "5.1.2600.2180" + +#include "wine/wine_common_ver.rc"

1 0

Lei Zhang : riched20: Add tests for EM_FORMATRANGE.
by Alexandre Julliard 19 Jun '07

19 Jun '07

Module: wine Branch: master Commit: 55771014e12310ab9c98f9e1bb9e6f0a455fb090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55771014e12310ab9c98f9e1b… Author: Lei Zhang <thestig(a)google.com> Date: Mon Jun 18 14:13:31 2007 -0700 riched20: Add tests for EM_FORMATRANGE. --- dlls/riched20/tests/editor.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 1881005..b20e719 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1491,6 +1491,51 @@ static void test_WM_PASTE(void) DestroyWindow(hwndRichEdit); } +static void test_EM_FORMATRANGE(void) +{ + int r; + FORMATRANGE fr; + HDC hdc; + HWND hwndRichEdit = new_richedit(NULL); + + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) haystack); + + hdc = GetDC(hwndRichEdit); + ok(hdc != NULL, "Could not get HDC\n"); + + fr.hdc = fr.hdcTarget = hdc; + fr.rc.top = fr.rcPage.top = fr.rc.left = fr.rcPage.left = 0; + fr.rc.right = fr.rcPage.right = GetDeviceCaps(hdc, HORZRES); + fr.rc.bottom = fr.rcPage.bottom = GetDeviceCaps(hdc, VERTRES); + fr.chrg.cpMin = 0; + fr.chrg.cpMax = 20; + + r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, (LPARAM) NULL); + todo_wine { + ok(r == 31, "EM_FORMATRANGE expect %d, got %d\n", 31, r); + } + + r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, (LPARAM) &fr); + todo_wine { + ok(r == 20, "EM_FORMATRANGE expect %d, got %d\n", 20, r); + } + + fr.chrg.cpMin = 0; + fr.chrg.cpMax = 10; + + r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, (LPARAM) &fr); + todo_wine { + ok(r == 10, "EM_FORMATRANGE expect %d, got %d\n", 10, r); + } + + r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, (LPARAM) NULL); + todo_wine { + ok(r == 31, "EM_FORMATRANGE expect %d, got %d\n", 31, r); + } + + DestroyWindow(hwndRichEdit); +} + static int nCallbackCount = 0; static DWORD CALLBACK EditStreamCallback(DWORD_PTR dwCookie, LPBYTE pbBuff, @@ -1808,6 +1853,7 @@ START_TEST( editor ) test_EM_EXSETSEL(); test_WM_PASTE(); test_EM_StreamIn_Undo(); + test_EM_FORMATRANGE(); test_unicode_conversions(); /* Set the environment variable WINETEST_RICHED20 to keep windows

1 0

James Hawkins : msi: Properly delete rows from the table, instead of zeroing out the row.
by Alexandre Julliard 19 Jun '07

19 Jun '07

Module: wine Branch: master Commit: 9309f4dfa0f82e3ed2d3582a33fad5eb6a321498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9309f4dfa0f82e3ed2d3582a3… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jun 18 13:49:31 2007 -0700 msi: Properly delete rows from the table, instead of zeroing out the row. --- dlls/msi/alter.c | 1 + dlls/msi/create.c | 1 + dlls/msi/delete.c | 1 + dlls/msi/distinct.c | 1 + dlls/msi/insert.c | 1 + dlls/msi/join.c | 1 + dlls/msi/msipriv.h | 5 +++++ dlls/msi/order.c | 1 + dlls/msi/select.c | 1 + dlls/msi/streams.c | 7 +++++++ dlls/msi/table.c | 41 +++++++++++++++++++++++++++++++---------- dlls/msi/tests/db.c | 50 +++++++++++++++++++++++++++++++++++++++++++++----- dlls/msi/update.c | 1 + dlls/msi/where.c | 1 + 14 files changed, 98 insertions(+), 15 deletions(-) diff --git a/dlls/msi/alter.c b/dlls/msi/alter.c index 58a6099..b506aa1 100644 --- a/dlls/msi/alter.c +++ b/dlls/msi/alter.c @@ -130,6 +130,7 @@ static const MSIVIEWOPS alter_ops = ALTER_fetch_stream, NULL, NULL, + NULL, ALTER_execute, ALTER_close, ALTER_get_dimensions, diff --git a/dlls/msi/create.c b/dlls/msi/create.c index 965a4a6..9c3fb39 100644 --- a/dlls/msi/create.c +++ b/dlls/msi/create.c @@ -124,6 +124,7 @@ static const MSIVIEWOPS create_ops = NULL, NULL, NULL, + NULL, CREATE_execute, CREATE_close, CREATE_get_dimensions, diff --git a/dlls/msi/delete.c b/dlls/msi/delete.c index 1484f6a..bd33956 100644 --- a/dlls/msi/delete.c +++ b/dlls/msi/delete.c @@ -185,6 +185,7 @@ static const MSIVIEWOPS delete_ops = DELETE_fetch_stream, NULL, NULL, + NULL, DELETE_execute, DELETE_close, DELETE_get_dimensions, diff --git a/dlls/msi/distinct.c b/dlls/msi/distinct.c index a00f274..8513823 100644 --- a/dlls/msi/distinct.c +++ b/dlls/msi/distinct.c @@ -274,6 +274,7 @@ static const MSIVIEWOPS distinct_ops = NULL, NULL, NULL, + NULL, DISTINCT_execute, DISTINCT_close, DISTINCT_get_dimensions, diff --git a/dlls/msi/insert.c b/dlls/msi/insert.c index 48706ea..95c35f3 100644 --- a/dlls/msi/insert.c +++ b/dlls/msi/insert.c @@ -225,6 +225,7 @@ static const MSIVIEWOPS insert_ops = NULL, NULL, NULL, + NULL, INSERT_execute, INSERT_close, INSERT_get_dimensions, diff --git a/dlls/msi/join.c b/dlls/msi/join.c index b384630..ab1935e 100644 --- a/dlls/msi/join.c +++ b/dlls/msi/join.c @@ -245,6 +245,7 @@ static const MSIVIEWOPS join_ops = JOIN_fetch_stream, NULL, NULL, + NULL, JOIN_execute, JOIN_close, JOIN_get_dimensions, diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index fd61b5c..e577fc5 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -149,6 +149,11 @@ typedef struct tagMSIVIEWOPS UINT (*insert_row)( struct tagMSIVIEW *view, MSIRECORD *record, BOOL temporary ); /* + * Deletes a row from the database + */ + UINT (*delete_row)( struct tagMSIVIEW *view, UINT row ); + + /* * execute - loads the underlying data into memory so it can be read */ UINT (*execute)( struct tagMSIVIEW *view, MSIRECORD *record ); diff --git a/dlls/msi/order.c b/dlls/msi/order.c index 82b1269..c0ab643 100644 --- a/dlls/msi/order.c +++ b/dlls/msi/order.c @@ -274,6 +274,7 @@ static const MSIVIEWOPS order_ops = NULL, NULL, NULL, + NULL, ORDER_execute, ORDER_close, ORDER_get_dimensions, diff --git a/dlls/msi/select.c b/dlls/msi/select.c index 44999e3..6953e1f 100644 --- a/dlls/msi/select.c +++ b/dlls/msi/select.c @@ -267,6 +267,7 @@ static const MSIVIEWOPS select_ops = SELECT_fetch_stream, SELECT_set_row, SELECT_insert_row, + NULL, SELECT_execute, SELECT_close, SELECT_get_dimensions, diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 611f997..fbb8b79 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -204,6 +204,12 @@ done: return r; } +static UINT STREAMS_delete_row(struct tagMSIVIEW *view, UINT row) +{ + FIXME("(%p %d): stub!\n", view, row); + return ERROR_SUCCESS; +} + static UINT STREAMS_execute(struct tagMSIVIEW *view, MSIRECORD *record) { TRACE("(%p, %p)\n", view, record); @@ -323,6 +329,7 @@ static const MSIVIEWOPS streams_ops = STREAMS_fetch_stream, STREAMS_set_row, STREAMS_insert_row, + STREAMS_delete_row, STREAMS_execute, STREAMS_close, STREAMS_get_dimensions, diff --git a/dlls/msi/table.c b/dlls/msi/table.c index c9b1572..cf706d8 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1476,6 +1476,35 @@ static UINT TABLE_insert_row( struct tagMSIVIEW *view, MSIRECORD *rec, BOOL temp return TABLE_set_row( view, row, rec, (1<<tv->num_cols) - 1 ); } +static UINT TABLE_delete_row( struct tagMSIVIEW *view, UINT row ) +{ + MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + UINT r, num_rows, num_cols; + BYTE *src, *dest; + + TRACE("%p %d\n", tv, row); + + if ( !tv->table ) + return ERROR_INVALID_PARAMETER; + + r = TABLE_get_dimensions( view, &num_rows, &num_cols ); + if ( r != ERROR_SUCCESS ) + return r; + + if ( row >= num_rows ) + return ERROR_FUNCTION_FAILED; + + tv->table->row_count--; + + if ( row == num_rows - 1 ) + return ERROR_SUCCESS; + + dest = tv->table->data[row]; + src = tv->table->data[row + 1]; + memmove(dest, src, (num_rows - row - 1) * tv->row_size); + return ERROR_SUCCESS; +} + static UINT TABLE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *rec) { @@ -1618,6 +1647,7 @@ static const MSIVIEWOPS table_ops = TABLE_fetch_stream, TABLE_set_row, TABLE_insert_row, + TABLE_delete_row, TABLE_execute, TABLE_close, TABLE_get_dimensions, @@ -1896,15 +1926,6 @@ static UINT msi_table_find_row( MSITABLEVIEW *tv, MSIRECORD *rec, UINT *row ) return r; } -static UINT msi_delete_row( MSITABLEVIEW *tv, UINT row ) -{ - UINT i; - - for( i=1; i<=tv->num_cols; i++ ) - TABLE_set_int( tv, row, i, 0 ); - return ERROR_SUCCESS; -} - static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg, string_table *st, LPCWSTR name ) { @@ -2028,7 +2049,7 @@ static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg, else { TRACE("deleting row [%d]:\n", row); - msi_delete_row( tv, row ); + TABLE_delete_row( &tv->view, row ); } } if( TRACE_ON(msidb) ) dump_record( rec ); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 9f98540..2f4cc76 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1872,7 +1872,7 @@ static const WCHAR data5[] = { /* _StringPool */ /* update row, 0x0002 is a bitmask of present column data, keys are excluded */ static const WCHAR data6[] = { /* MOO */ 0x0002, 0x8001, 0x0001, /* update row */ - 0x0000, 0x8003, /* delete row */ + 0x0000, 0x8002, /* delete row */ }; static const WCHAR data7[] = { /* BINARY */ @@ -1943,7 +1943,7 @@ static void generate_transform_manual(void) static void test_try_transform(void) { - MSIHANDLE hdb, hrec; + MSIHANDLE hdb, hview, hrec; LPCSTR query; UINT r; DWORD sz; @@ -2037,14 +2037,14 @@ static void test_try_transform(void) /* check unchanged value */ hrec = 0; - query = "select `NOO`,`OOO` from `MOO` where `NOO` = 2 AND `OOO` = 'b'"; + query = "select `NOO`,`OOO` from `MOO` where `NOO` = 3 AND `OOO` = 'c'"; r = do_query(hdb, query, &hrec); ok(r == ERROR_SUCCESS, "select query failed\n"); MsiCloseHandle(hrec); /* check deleted value */ hrec = 0; - query = "select * from `MOO` where `NOO` = 3"; + query = "select * from `MOO` where `NOO` = 2"; r = do_query(hdb, query, &hrec); ok(r == ERROR_NO_MORE_ITEMS, "select query failed\n"); if (hrec) MsiCloseHandle(hrec); @@ -2063,7 +2063,47 @@ static void test_try_transform(void) ok(sz == 9, "stream data was wrong size\n"); if (hrec) MsiCloseHandle(hrec); - MsiCloseHandle( hdb ); + /* check the validity of the table with a deleted row */ + hrec = 0; + query = "select * from `MOO`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "open view failed\n"); + + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "view execute failed\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "view fetch failed\n"); + + r = MsiRecordGetInteger(hrec, 1); + ok(r == 1, "Expected 1, got %d\n", r); + + sz = sizeof buffer; + r = MsiRecordGetString(hrec, 2, buffer, &sz); + ok(r == ERROR_SUCCESS, "record get string failed\n"); + ok(!lstrcmpA(buffer, "c"), "Expected c, got %s\n", buffer); + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "view fetch failed\n"); + + r = MsiRecordGetInteger(hrec, 1); + ok(r == 3, "Expected 3, got %d\n", r); + + sz = sizeof buffer; + r = MsiRecordGetString(hrec, 2, buffer, &sz); + ok(r == ERROR_SUCCESS, "record get string failed\n"); + ok(!lstrcmpA(buffer, "c"), "Expected b, got %s\n", buffer); + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "view fetch succeeded\n"); + + MsiCloseHandle(hrec); + MsiCloseHandle(hview); + MsiCloseHandle(hdb); DeleteFile(msifile); DeleteFile(msifile2); diff --git a/dlls/msi/update.c b/dlls/msi/update.c index 6b9b3cf..bc3fb2e 100644 --- a/dlls/msi/update.c +++ b/dlls/msi/update.c @@ -177,6 +177,7 @@ static const MSIVIEWOPS update_ops = NULL, NULL, NULL, + NULL, UPDATE_execute, UPDATE_close, UPDATE_get_dimensions, diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 78056e1..ab9c9a6 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -439,6 +439,7 @@ static const MSIVIEWOPS where_ops = WHERE_fetch_stream, WHERE_set_row, NULL, + NULL, WHERE_execute, WHERE_close, WHERE_get_dimensions,

1 0

Andrew Talbot : msvidc32: Constify some variables.
by Alexandre Julliard 19 Jun '07

19 Jun '07

Module: wine Branch: master Commit: 76d857f3f5a0937a4787ccba5a0a9c5328477d08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76d857f3f5a0937a4787ccba5… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Jun 18 21:42:07 2007 +0100 msvidc32: Constify some variables. --- dlls/msvidc32/msvideo1.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index d49b35a..9de2a2d 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -52,7 +52,7 @@ static HINSTANCE MSVIDC32_hModule; #define WHAM_MAGIC mmioFOURCC('W', 'H', 'A', 'M') #define PALETTE_COUNT 256 -#define LE_16(x) ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0]) +#define LE_16(x) ((((const uint8_t *)(x))[1] << 8) | ((const uint8_t *)(x))[0]) /* FIXME - check the stream size */ #define CHECK_STREAM_PTR(n) \ @@ -70,7 +70,7 @@ typedef struct Msvideo1Context { } Msvideo1Context; static void -msvideo1_decode_8bit( int width, int height, unsigned char *buf, int buf_size, +msvideo1_decode_8bit( int width, int height, const unsigned char *buf, int buf_size, unsigned char *pixels, int stride) { int block_ptr, pixel_ptr; @@ -193,7 +193,7 @@ msvideo1_decode_8bit( int width, int height, unsigned char *buf, int buf_size, } static void -msvideo1_decode_16bit( int width, int height, unsigned char *buf, int buf_size, +msvideo1_decode_16bit( int width, int height, const unsigned char *buf, int buf_size, unsigned short *pixels, int stride) { int block_ptr, pixel_ptr; @@ -456,7 +456,7 @@ static LRESULT CRAM_DecompressEx( Msvideo1Context *info, ICDECOMPRESSEX *icd, DW return ICERR_OK; } -static LRESULT CRAM_GetInfo( Msvideo1Context *info, ICINFO *icinfo, DWORD dwSize ) +static LRESULT CRAM_GetInfo( const Msvideo1Context *info, ICINFO *icinfo, DWORD dwSize ) { if (!icinfo) return sizeof(ICINFO); if (dwSize < sizeof(ICINFO)) return 0;

1 0

Alexandre Julliard : winedbg: Added support for indirect call with absolute address.
by Alexandre Julliard 19 Jun '07

19 Jun '07

Module: wine Branch: master Commit: 87fe0145c0ca0bc3efd015e27b5fa4621c2ae6ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=87fe0145c0ca0bc3efd015e27… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 18 17:21:07 2007 +0200 winedbg: Added support for indirect call with absolute address. --- programs/winedbg/be_i386.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 7629137..2a51ec7 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -497,7 +497,25 @@ static unsigned be_i386_is_func_call(const void* insn, ADDRESS64* callee) WINE_FIXME("Unsupported yet call insn (0xFF 0x%02x) (SIB bytes) at %p\n", ch, insn); return FALSE; case 0x05: /* addr32 */ - WINE_FIXME("Unsupported yet call insn (0xFF 0x%02x) (addr32) at %p\n", ch, insn); + if ((ch & 0x38) == 0x10 || /* call */ + (ch & 0x38) == 0x18) /* lcall */ + { + void *addr; + if (!dbg_read_memory((const char *)insn + 2, &addr, sizeof(addr))) + return FALSE; + if ((ch & 0x38) == 0x18) /* lcall */ + { + if (!dbg_read_memory((const char*)addr + operand_size, &segment, sizeof(segment))) + return FALSE; + } + else segment = dbg_context.SegCs; + if (!dbg_read_memory((const char*)addr, &dst, sizeof(dst))) + return FALSE; + callee->Mode = get_selector_type(dbg_curr_thread->handle, &dbg_context, segment); + callee->Segment = segment; + callee->Offset = dst; + return TRUE; + } return FALSE; default: switch (ch & 0x07)

1 0

Jeff Latimer : hnetcfg: Stub implementation of the dll.
by Alexandre Julliard 19 Jun '07

19 Jun '07

Module: wine Branch: master Commit: a00aa0391dea6f17631d057beeaeb33a599eb39d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a00aa0391dea6f17631d057be… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Mon Jun 18 23:27:00 2007 +1000 hnetcfg: Stub implementation of the dll. --- Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/hnetcfg/Makefile.in | 13 +++++++ dlls/hnetcfg/hnetcfg.c | 86 +++++++++++++++++++++++++++++++++++++++++++++ dlls/hnetcfg/hnetcfg.spec | 4 ++ 7 files changed, 110 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 763851f..c63c782 100644 --- a/Makefile.in +++ b/Makefile.in @@ -242,6 +242,7 @@ ALL_MAKEFILES = \ dlls/hid/Makefile \ dlls/hlink/Makefile \ dlls/hlink/tests/Makefile \ + dlls/hnetcfg/Makefile \ dlls/iccvid/Makefile \ dlls/icmp/Makefile \ dlls/ifsmgr.vxd/Makefile \ @@ -596,6 +597,7 @@ dlls/hhctrl.ocx/Makefile: dlls/hhctrl.ocx/Makefile.in dlls/Makedll.rules dlls/hid/Makefile: dlls/hid/Makefile.in dlls/Makedll.rules dlls/hlink/Makefile: dlls/hlink/Makefile.in dlls/Makedll.rules dlls/hlink/tests/Makefile: dlls/hlink/tests/Makefile.in dlls/Maketest.rules +dlls/hnetcfg/Makefile: dlls/hnetcfg/Makefile.in dlls/Makedll.rules dlls/iccvid/Makefile: dlls/iccvid/Makefile.in dlls/Makedll.rules dlls/icmp/Makefile: dlls/icmp/Makefile.in dlls/Makedll.rules dlls/ifsmgr.vxd/Makefile: dlls/ifsmgr.vxd/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index d6abf81..0828b37 100755 --- a/configure +++ b/configure @@ -20548,6 +20548,8 @@ ac_config_files="$ac_config_files dlls/hlink/Makefile" ac_config_files="$ac_config_files dlls/hlink/tests/Makefile" +ac_config_files="$ac_config_files dlls/hnetcfg/Makefile" + ac_config_files="$ac_config_files dlls/iccvid/Makefile" ac_config_files="$ac_config_files dlls/icmp/Makefile" @@ -21708,6 +21710,7 @@ do "dlls/hid/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/hid/Makefile" ;; "dlls/hlink/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/hlink/Makefile" ;; "dlls/hlink/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/hlink/tests/Makefile" ;; + "dlls/hnetcfg/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/hnetcfg/Makefile" ;; "dlls/iccvid/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/iccvid/Makefile" ;; "dlls/icmp/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/icmp/Makefile" ;; "dlls/ifsmgr.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ifsmgr.vxd/Makefile" ;; diff --git a/configure.ac b/configure.ac index 96b2c5c..5d6fce7 100644 --- a/configure.ac +++ b/configure.ac @@ -1525,6 +1525,7 @@ AC_CONFIG_FILES([dlls/hhctrl.ocx/Makefile]) AC_CONFIG_FILES([dlls/hid/Makefile]) AC_CONFIG_FILES([dlls/hlink/Makefile]) AC_CONFIG_FILES([dlls/hlink/tests/Makefile]) +AC_CONFIG_FILES([dlls/hnetcfg/Makefile]) AC_CONFIG_FILES([dlls/iccvid/Makefile]) AC_CONFIG_FILES([dlls/icmp/Makefile]) AC_CONFIG_FILES([dlls/ifsmgr.vxd/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index f1366f6..9c16a9a 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -78,6 +78,7 @@ BASEDIRS = \ hhctrl.ocx \ hid \ hlink \ + hnetcfg \ iccvid \ icmp \ ifsmgr.vxd \ diff --git a/dlls/hnetcfg/Makefile.in b/dlls/hnetcfg/Makefile.in new file mode 100644 index 0000000..b858b5a --- /dev/null +++ b/dlls/hnetcfg/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = hnetcfg.dll +IMPORTS = kernel32 + +C_SRCS = \ + hnetcfg.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/hnetcfg/hnetcfg.c b/dlls/hnetcfg/hnetcfg.c new file mode 100644 index 0000000..a95b443 --- /dev/null +++ b/dlls/hnetcfg/hnetcfg.c @@ -0,0 +1,86 @@ +/* + * Copyright (C) 2007 Jeff Latimer + * + * 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n",hInstDLL,fdwReason,lpvReserved); + + switch(fdwReason) { + case DLL_WINE_PREATTACH: + return FALSE; + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + +/****************************************************************** + * DllCanUnloadNow (HNETCFG.@) + * + * + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + FIXME(":stub\n"); + return S_OK; +} + + +/****************************************************************** + * DllGetClassObject (HNETCFG.@) + * + * + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + + FIXME("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + return E_NOINTERFACE; +} + +/****************************************************************** + * DllRegisterServer (HNETCFG.@) + * + * + */ +HRESULT WINAPI DllRegisterServer(void) +{ + return S_OK; +} + +/****************************************************************** + * DllUnregisterServer (HNETCFG.@) + * + * + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return S_OK; +} diff --git a/dlls/hnetcfg/hnetcfg.spec b/dlls/hnetcfg/hnetcfg.spec new file mode 100644 index 0000000..be44a59 --- /dev/null +++ b/dlls/hnetcfg/hnetcfg.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject( ptr ptr ptr ) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

James Hawkins : msi: Send the expected data to set_deferred_action_props.
by Alexandre Julliard 19 Jun '07

19 Jun '07

Module: wine Branch: master Commit: 82f4e3981bacb58625f1d72893342b8d328365c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f4e3981bacb58625f1d7289… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jun 18 09:40:34 2007 -0700 msi: Send the expected data to set_deferred_action_props. --- dlls/msi/custom.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index c89acbf..af9c8dc 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -157,7 +157,7 @@ static LPWSTR msi_get_deferred_action(LPCWSTR action, LPCWSTR actiondata, static void set_deferred_action_props(MSIPACKAGE *package, LPWSTR deferred_data) { - LPWSTR end, beg = deferred_data; + LPWSTR end, beg = deferred_data + 1; end = strchrW(beg, ';'); *end = '\0'; @@ -189,11 +189,10 @@ UINT ACTION_CustomAction(MSIPACKAGE *package,LPCWSTR action, BOOL execute) LPWSTR action_copy = strdupW(action); WCHAR *deformated=NULL; - /* deferred action: [CustomActionData]Action */ + /* deferred action: [properties]Action */ if ((ptr = strchrW(action_copy, ']'))) { - deferred_data = action_copy + 1; - *ptr = '\0'; + deferred_data = action_copy; action = ptr + 1; }

1 0

appdb/include objectManager.php
by WineHQ 19 Jun '07

19 Jun '07

ChangeSet ID: 31224 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/18 19:29:37 Modified files: include : objectManager.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Don't display editor for non-existent entries Patch: http://cvs.winehq.org/patch.py?id=31224 Old revision New revision Changes Path 1.31 1.32 +8 -0 appdb/include/objectManager.php Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.31 appdb/include/objectManager.php:1.32 --- appdb/include/objectManager.php:1.31 19 Jun 2007 0:29:37 -0000 +++ appdb/include/objectManager.php 19 Jun 2007 0:29:37 -0000 @@ -181,6 +181,14 @@ class ObjectManager $oObject = new $this->sClass($this->iId); + /* The entry does not exist */ + if(!$oObject->objectGetId()) + { + echo "<font color=\"red\">There is no entry with that id in the database</font>.\n"; + echo "</div>"; + return; + } + /* Display errors, if any, and fetch form data */ if($this->displayErrors($sErrors)) {

1 0

appdb/include version_queue.php
by WineHQ 19 Jun '07

19 Jun '07

ChangeSet ID: 31223 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/18 19:28:49 Modified files: include : version_queue.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Delete all objects in version_queue::delete() Patch: http://cvs.winehq.org/patch.py?id=31223 Old revision New revision Changes Path 1.15 1.16 +12 -1 appdb/include/version_queue.php Index: appdb/include/version_queue.php diff -u -p appdb/include/version_queue.php:1.15 appdb/include/version_queue.php:1.16 --- appdb/include/version_queue.php:1.15 19 Jun 2007 0:28:49 -0000 +++ appdb/include/version_queue.php 19 Jun 2007 0:28:49 -0000 @@ -76,7 +76,18 @@ class version_queue function delete() { - return $this->oVersion->delete(); + $bSuccess = TRUE; + + if(!$this->oVersion->delete()) + $bSuccess = FALSE; + + if(!$this->oTestDataQueue->delete()) + $bSuccess = FALSE; + + if($this->oDownloadUrl->iId && !$this->oDownloadUrl->delete()) + $bSuccess = FALSE; + + return $bSuccess; } function unQueue()

1 0