Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 41027: Update odbc32 to Wine-1.1.21. It still doesn't work at all.
by tkreuzer＠svn.reactos.org 21 May '09

21 May '09

Author: tkreuzer Date: Thu May 21 21:32:41 2009 New Revision: 41027 URL: http://svn.reactos.org/svn/reactos?rev=41027&view=rev Log: Update odbc32 to Wine-1.1.21. It still doesn't work at all. Modified: branches/ros-amd64-bringup/reactos/dll/win32/odbc32/odbc32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/odbc32/odbc32.spec branches/ros-amd64-bringup/reactos/dll/win32/odbc32/proxyodbc.c branches/ros-amd64-bringup/reactos/dll/win32/odbc32/proxyodbc.h Modified: branches/ros-amd64-bringup/reactos/dll/win32/odbc32/odbc32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/odbc32/odbc32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/odbc32/odbc32.rbuild [iso-8859-1] Thu May 21 21:32:41 2009 @@ -7,6 +7,7 @@ <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> <library>wine</library> + <library>advapi32</library> <library>kernel32</library> <file>proxyodbc.c</file> </module> Modified: branches/ros-amd64-bringup/reactos/dll/win32/odbc32/odbc32.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/odbc32/odbc32.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/odbc32/odbc32.spec [iso-8859-1] Thu May 21 21:32:41 2009 @@ -86,43 +86,43 @@ 86 stub ODBSetTryWaitValue 89 stub ODBCSharedPerfMon 90 stub ODBCSharedVSFlag -106 stub SQLColAttributesW -107 stub SQLConnectW -108 stub SQLDescribeColW -110 stub SQLErrorW -111 stub SQLExecDirectW -117 stub SQLGetCursorNameW -119 stub SQLPrepareW -121 stub SQLSetCursorNameW -127 stub SQLColAttributeW -132 stub SQLGetConnectAttrW -133 stub SQLGetDescFieldW -134 stub SQLGetDescRecW -135 stub SQLGetDiagFieldW -136 stub SQLGetDiagRecW -138 stub SQLGetStmtAttrW -139 stub SQLSetConnectAttrW -140 stub SQLColumnsW -141 stub SQLDriverConnectW -142 stub SQLGetConnectOptionW -145 stub SQLGetInfoW -147 stub SQLGetTypeInfoW -150 stub SQLSetConnectOptionW -152 stub SQLSpecialColumnsW -153 stub SQLStatisticsW -154 stub SQLTablesW -155 stub SQLBrowseConnectW -156 stub SQLColumnPrivilegesW -157 stub SQLDataSourcesW -160 stub SQLForeignKeysW -162 stub SQLNativeSqlW -165 stub SQLPrimaryKeysW -166 stub SQLProcedureColumnsW -167 stub SQLProceduresW -170 stub SQLTablePrivilegesW -171 stub SQLDriversW -173 stub SQLSetDescFieldW -176 stub SQLSetStmtAttrW +106 stdcall SQLColAttributesW(long long long ptr long ptr ptr) +107 stdcall SQLConnectW(long wstr long wstr long wstr long) +108 stdcall SQLDescribeColW(long long wstr long ptr ptr ptr ptr ptr) +110 stdcall SQLErrorW(long long long wstr ptr wstr long ptr) +111 stdcall SQLExecDirectW(long wstr long) +117 stdcall SQLGetCursorNameW(long wstr long ptr) +119 stdcall SQLPrepareW(long wstr long) +121 stdcall SQLSetCursorNameW(long wstr long) +127 stdcall SQLColAttributeW(long long long ptr long ptr ptr) +132 stdcall SQLGetConnectAttrW(long long ptr long ptr) +133 stdcall SQLGetDescFieldW(long long long ptr long ptr) +134 stdcall SQLGetDescRecW(long long wstr long ptr ptr ptr ptr ptr ptr ptr) +135 stdcall SQLGetDiagFieldW(long long long long ptr long ptr) +136 stdcall SQLGetDiagRecW(long long long wstr ptr wstr long ptr) +138 stdcall SQLGetStmtAttrW(long long ptr long ptr) +139 stdcall SQLSetConnectAttrW(long long ptr long) +140 stdcall SQLColumnsW(long wstr long wstr long wstr long wstr long) +141 stdcall SQLDriverConnectW(long long wstr long wstr long wstr long) +142 stdcall SQLGetConnectOptionW(long long ptr) +145 stdcall SQLGetInfoW(long long ptr long ptr) +147 stdcall SQLGetTypeInfoW(long long) +150 stdcall SQLSetConnectOptionW(long long long) +152 stdcall SQLSpecialColumnsW(long long wstr long wstr long wstr long long long) +153 stdcall SQLStatisticsW(long wstr long wstr long wstr long long long) +154 stdcall SQLTablesW(long wstr long wstr long wstr long wstr long) +155 stdcall SQLBrowseConnectW(long wstr long wstr long ptr) +156 stdcall SQLColumnPrivilegesW(long wstr long wstr long wstr long wstr long) +157 stdcall SQLDataSourcesW(long long wstr long ptr wstr long ptr) +160 stdcall SQLForeignKeysW(long wstr long wstr long wstr long wstr long wstr long wstr long) +162 stdcall SQLNativeSqlW(long wstr long wstr long ptr) +165 stdcall SQLPrimaryKeysW(long wstr long wstr long wstr long) +166 stdcall SQLProcedureColumnsW(long wstr long wstr long wstr long wstr long) +167 stdcall SQLProceduresW(long wstr long wstr long wstr long) +170 stdcall SQLTablePrivilegesW(long wstr long wstr long wstr long) +171 stdcall SQLDriversW(long long wstr long ptr wstr long ptr) +173 stdcall SQLSetDescFieldW(long long long ptr long) +176 stdcall SQLSetStmtAttrW(long long ptr long) 206 stub SQLColAttributesA 207 stub SQLConnectA 208 stub SQLDescribeColA Modified: branches/ros-amd64-bringup/reactos/dll/win32/odbc32/proxyodbc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/odbc32/proxyodbc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/odbc32/proxyodbc.c [iso-8859-1] Thu May 21 21:32:41 2009 @@ -15,11 +15,11 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * NOTES: - * Proxy ODBC driver manager. This manager delegates all ODBC - * calls to a real ODBC driver manager named by the environment + * Proxy ODBC driver manager. This manager delegates all ODBC + * calls to a real ODBC driver manager named by the environment * variable LIB_ODBC_DRIVER_MANAGER, or to libodbc.so if the * variable is not set. * @@ -36,10 +36,10 @@ #include "windef.h" #include "winbase.h" +#include "winreg.h" #include "wine/debug.h" -//#include "wine/library.h" - -#undef TRACE_ON +#include "wine/library.h" +#include "wine/unicode.h" #include "sql.h" #include "sqltypes.h" @@ -54,84 +54,84 @@ static const DM_FUNC template_func[] = { - /* 00 */ { SQL_API_SQLALLOCCONNECT, "SQLAllocConnect", SQLAllocConnect, NULL }, - /* 01 */ { SQL_API_SQLALLOCENV, "SQLAllocEnv", SQLAllocEnv, NULL }, - /* 02 */ { SQL_API_SQLALLOCHANDLE, "SQLAllocHandle", SQLAllocHandle, NULL }, - /* 03 */ { SQL_API_SQLALLOCSTMT, "SQLAllocStmt", SQLAllocStmt, NULL }, - /* 04 */ { SQL_API_SQLALLOCHANDLESTD, "SQLAllocHandleStd", SQLAllocHandleStd, NULL }, - /* 05 */ { SQL_API_SQLBINDCOL, "SQLBindCol", SQLBindCol, NULL }, - /* 06 */ { SQL_API_SQLBINDPARAM, "SQLBindParam", SQLBindParam, NULL }, - /* 07 */ { SQL_API_SQLBINDPARAMETER, "SQLBindParameter", SQLBindParameter, NULL }, - /* 08 */ { SQL_API_SQLBROWSECONNECT, "SQLBrowseConnect", SQLBrowseConnect, NULL }, - /* 09 */ { SQL_API_SQLBULKOPERATIONS, "SQLBulkOperations", SQLBulkOperations, NULL }, - /* 10 */ { SQL_API_SQLCANCEL, "SQLCancel", SQLCancel, NULL }, - /* 11 */ { SQL_API_SQLCLOSECURSOR, "SQLCloseCursor", SQLCloseCursor, NULL }, - /* 12 */ { SQL_API_SQLCOLATTRIBUTE, "SQLColAttribute", SQLColAttribute, NULL }, - /* 13 */ { SQL_API_SQLCOLATTRIBUTES, "SQLColAttributes", SQLColAttributes, NULL }, - /* 14 */ { SQL_API_SQLCOLUMNPRIVILEGES, "SQLColumnPrivileges", SQLColumnPrivileges, NULL }, - /* 15 */ { SQL_API_SQLCOLUMNS, "SQLColumns", SQLColumns, NULL }, - /* 16 */ { SQL_API_SQLCONNECT, "SQLConnect", SQLConnect, NULL }, - /* 17 */ { SQL_API_SQLCOPYDESC, "SQLCopyDesc", SQLCopyDesc, NULL }, - /* 18 */ { SQL_API_SQLDATASOURCES, "SQLDataSources", SQLDataSources, NULL }, - /* 19 */ { SQL_API_SQLDESCRIBECOL, "SQLDescribeCol", SQLDescribeCol, NULL }, - /* 20 */ { SQL_API_SQLDESCRIBEPARAM, "SQLDescribeParam", SQLDescribeParam, NULL }, - /* 21 */ { SQL_API_SQLDISCONNECT, "SQLDisconnect", SQLDisconnect, NULL }, - /* 22 */ { SQL_API_SQLDRIVERCONNECT, "SQLDriverConnect", SQLDriverConnect, NULL }, - /* 23 */ { SQL_API_SQLDRIVERS, "SQLDrivers", SQLDrivers, NULL }, - /* 24 */ { SQL_API_SQLENDTRAN, "SQLEndTran", SQLEndTran, NULL }, - /* 25 */ { SQL_API_SQLERROR, "SQLError", SQLError, NULL }, - /* 26 */ { SQL_API_SQLEXECDIRECT, "SQLExecDirect", SQLExecDirect, NULL }, - /* 27 */ { SQL_API_SQLEXECUTE, "SQLExecute", SQLExecute, NULL }, - /* 28 */ { SQL_API_SQLEXTENDEDFETCH, "SQLExtendedFetch", SQLExtendedFetch, NULL }, - /* 29 */ { SQL_API_SQLFETCH, "SQLFetch", SQLFetch, NULL }, - /* 30 */ { SQL_API_SQLFETCHSCROLL, "SQLFetchScroll", SQLFetchScroll, NULL }, - /* 31 */ { SQL_API_SQLFOREIGNKEYS, "SQLForeignKeys", SQLForeignKeys, NULL }, - /* 32 */ { SQL_API_SQLFREEENV, "SQLFreeEnv", SQLFreeEnv, NULL }, - /* 33 */ { SQL_API_SQLFREEHANDLE, "SQLFreeHandle", SQLFreeHandle, NULL }, - /* 34 */ { SQL_API_SQLFREESTMT, "SQLFreeStmt", SQLFreeStmt, NULL }, - /* 35 */ { SQL_API_SQLFREECONNECT, "SQLFreeConnect", SQLFreeConnect, NULL }, - /* 36 */ { SQL_API_SQLGETCONNECTATTR, "SQLGetConnectAttr", SQLGetConnectAttr, NULL }, - /* 37 */ { SQL_API_SQLGETCONNECTOPTION, "SQLGetConnectOption", SQLGetConnectOption, NULL }, - /* 38 */ { SQL_API_SQLGETCURSORNAME, "SQLGetCursorName", SQLGetCursorName, NULL }, - /* 39 */ { SQL_API_SQLGETDATA, "SQLGetData", SQLGetData, NULL }, - /* 40 */ { SQL_API_SQLGETDESCFIELD, "SQLGetDescField", SQLGetDescField, NULL }, - /* 41 */ { SQL_API_SQLGETDESCREC, "SQLGetDescRec", SQLGetDescRec, NULL }, - /* 42 */ { SQL_API_SQLGETDIAGFIELD, "SQLGetDiagField", SQLGetDiagField, NULL }, - /* 43 */ { SQL_API_SQLGETENVATTR, "SQLGetEnvAttr", SQLGetEnvAttr, NULL }, - /* 44 */ { SQL_API_SQLGETFUNCTIONS, "SQLGetFunctions", SQLGetFunctions, NULL }, - /* 45 */ { SQL_API_SQLGETINFO, "SQLGetInfo", SQLGetInfo, NULL }, - /* 46 */ { SQL_API_SQLGETSTMTATTR, "SQLGetStmtAttr", SQLGetStmtAttr, NULL }, - /* 47 */ { SQL_API_SQLGETSTMTOPTION, "SQLGetStmtOption", SQLGetStmtOption, NULL }, - /* 48 */ { SQL_API_SQLGETTYPEINFO, "SQLGetTypeInfo", SQLGetTypeInfo, NULL }, - /* 49 */ { SQL_API_SQLMORERESULTS, "SQLMoreResults", SQLMoreResults, NULL }, - /* 50 */ { SQL_API_SQLNATIVESQL, "SQLNativeSql", SQLNativeSql, NULL }, - /* 51 */ { SQL_API_SQLNUMPARAMS, "SQLNumParams", SQLNumParams, NULL }, - /* 52 */ { SQL_API_SQLNUMRESULTCOLS, "SQLNumResultCols", SQLNumResultCols, NULL }, - /* 53 */ { SQL_API_SQLPARAMDATA, "SQLParamData", SQLParamData, NULL }, - /* 54 */ { SQL_API_SQLPARAMOPTIONS, "SQLParamOptions", SQLParamOptions, NULL }, - /* 55 */ { SQL_API_SQLPREPARE, "SQLPrepare", SQLPrepare, NULL }, - /* 56 */ { SQL_API_SQLPRIMARYKEYS, "SQLPrimaryKeys", SQLPrimaryKeys, NULL }, - /* 57 */ { SQL_API_SQLPROCEDURECOLUMNS, "SQLProcedureColumns", SQLProcedureColumns, NULL }, - /* 58 */ { SQL_API_SQLPROCEDURES, "SQLProcedures", SQLProcedures, NULL }, - /* 59 */ { SQL_API_SQLPUTDATA, "SQLPutData", SQLPutData, NULL }, - /* 60 */ { SQL_API_SQLROWCOUNT, "SQLRowCount", SQLRowCount, NULL }, - /* 61 */ { SQL_API_SQLSETCONNECTATTR, "SQLSetConnectAttr", SQLSetConnectAttr, NULL }, - /* 62 */ { SQL_API_SQLSETCONNECTOPTION, "SQLSetConnectOption", SQLSetConnectOption, NULL }, - /* 63 */ { SQL_API_SQLSETCURSORNAME, "SQLSetCursorName", SQLSetCursorName, NULL }, - /* 64 */ { SQL_API_SQLSETDESCFIELD, "SQLSetDescField", SQLSetDescField, NULL }, - /* 65 */ { SQL_API_SQLSETDESCREC, "SQLSetDescRec", SQLSetDescRec, NULL }, - /* 66 */ { SQL_API_SQLSETENVATTR, "SQLSetEnvAttr", SQLSetEnvAttr, NULL }, - /* 67 */ { SQL_API_SQLSETPARAM, "SQLSetParam", SQLSetParam, NULL }, - /* 68 */ { SQL_API_SQLSETPOS, "SQLSetPos", SQLSetPos, NULL }, - /* 69 */ { SQL_API_SQLSETSCROLLOPTIONS, "SQLSetScrollOptions", SQLSetScrollOptions, NULL }, - /* 70 */ { SQL_API_SQLSETSTMTATTR, "SQLSetStmtAttr", SQLSetStmtAttr, NULL }, - /* 71 */ { SQL_API_SQLSETSTMTOPTION, "SQLSetStmtOption", SQLSetStmtOption, NULL }, - /* 72 */ { SQL_API_SQLSPECIALCOLUMNS, "SQLSpecialColumns", SQLSpecialColumns, NULL }, - /* 73 */ { SQL_API_SQLSTATISTICS, "SQLStatistics", SQLStatistics, NULL }, - /* 74 */ { SQL_API_SQLTABLEPRIVILEGES, "SQLTablePrivileges", SQLTablePrivileges, NULL }, - /* 75 */ { SQL_API_SQLTABLES, "SQLTables", SQLTables, NULL }, - /* 76 */ { SQL_API_SQLTRANSACT, "SQLTransact", SQLTransact, NULL }, - /* 77 */ { SQL_API_SQLGETDIAGREC, "SQLGetDiagRec", SQLGetDiagRec, NULL }, + /* 00 */ { SQL_API_SQLALLOCCONNECT, "SQLAllocConnect", SQLAllocConnect, NULL, NULL }, + /* 01 */ { SQL_API_SQLALLOCENV, "SQLAllocEnv", SQLAllocEnv, NULL, NULL }, + /* 02 */ { SQL_API_SQLALLOCHANDLE, "SQLAllocHandle", SQLAllocHandle, NULL, NULL }, + /* 03 */ { SQL_API_SQLALLOCSTMT, "SQLAllocStmt", SQLAllocStmt, NULL, NULL }, + /* 04 */ { SQL_API_SQLALLOCHANDLESTD, "SQLAllocHandleStd", SQLAllocHandleStd, NULL, NULL }, + /* 05 */ { SQL_API_SQLBINDCOL, "SQLBindCol", SQLBindCol, NULL, NULL }, + /* 06 */ { SQL_API_SQLBINDPARAM, "SQLBindParam", SQLBindParam, NULL, NULL }, + /* 07 */ { SQL_API_SQLBINDPARAMETER, "SQLBindParameter", SQLBindParameter, NULL, NULL }, + /* 08 */ { SQL_API_SQLBROWSECONNECT, "SQLBrowseConnect", SQLBrowseConnect, NULL, NULL }, + /* 09 */ { SQL_API_SQLBULKOPERATIONS, "SQLBulkOperations", SQLBulkOperations, NULL, NULL }, + /* 10 */ { SQL_API_SQLCANCEL, "SQLCancel", SQLCancel, NULL, NULL }, + /* 11 */ { SQL_API_SQLCLOSECURSOR, "SQLCloseCursor", SQLCloseCursor, NULL, NULL }, + /* 12 */ { SQL_API_SQLCOLATTRIBUTE, "SQLColAttribute", SQLColAttribute, NULL, NULL }, + /* 13 */ { SQL_API_SQLCOLATTRIBUTES, "SQLColAttributes", SQLColAttributes, NULL, NULL }, + /* 14 */ { SQL_API_SQLCOLUMNPRIVILEGES, "SQLColumnPrivileges", SQLColumnPrivileges, NULL, NULL }, + /* 15 */ { SQL_API_SQLCOLUMNS, "SQLColumns", SQLColumns, NULL, NULL }, + /* 16 */ { SQL_API_SQLCONNECT, "SQLConnect", SQLConnect, NULL, NULL }, + /* 17 */ { SQL_API_SQLCOPYDESC, "SQLCopyDesc", SQLCopyDesc, NULL, NULL }, + /* 18 */ { SQL_API_SQLDATASOURCES, "SQLDataSources", SQLDataSources, NULL, NULL }, + /* 19 */ { SQL_API_SQLDESCRIBECOL, "SQLDescribeCol", SQLDescribeCol, NULL, NULL }, + /* 20 */ { SQL_API_SQLDESCRIBEPARAM, "SQLDescribeParam", SQLDescribeParam, NULL, NULL }, + /* 21 */ { SQL_API_SQLDISCONNECT, "SQLDisconnect", SQLDisconnect, NULL, NULL }, + /* 22 */ { SQL_API_SQLDRIVERCONNECT, "SQLDriverConnect", SQLDriverConnect, NULL, NULL }, + /* 23 */ { SQL_API_SQLDRIVERS, "SQLDrivers", SQLDrivers, NULL, NULL }, + /* 24 */ { SQL_API_SQLENDTRAN, "SQLEndTran", SQLEndTran, NULL, NULL }, + /* 25 */ { SQL_API_SQLERROR, "SQLError", SQLError, NULL, NULL }, + /* 26 */ { SQL_API_SQLEXECDIRECT, "SQLExecDirect", SQLExecDirect, NULL, NULL }, + /* 27 */ { SQL_API_SQLEXECUTE, "SQLExecute", SQLExecute, NULL, NULL }, + /* 28 */ { SQL_API_SQLEXTENDEDFETCH, "SQLExtendedFetch", SQLExtendedFetch, NULL, NULL }, + /* 29 */ { SQL_API_SQLFETCH, "SQLFetch", SQLFetch, NULL, NULL }, + /* 30 */ { SQL_API_SQLFETCHSCROLL, "SQLFetchScroll", SQLFetchScroll, NULL, NULL }, + /* 31 */ { SQL_API_SQLFOREIGNKEYS, "SQLForeignKeys", SQLForeignKeys, NULL, NULL }, + /* 32 */ { SQL_API_SQLFREEENV, "SQLFreeEnv", SQLFreeEnv, NULL, NULL }, + /* 33 */ { SQL_API_SQLFREEHANDLE, "SQLFreeHandle", SQLFreeHandle, NULL, NULL }, + /* 34 */ { SQL_API_SQLFREESTMT, "SQLFreeStmt", SQLFreeStmt, NULL, NULL }, + /* 35 */ { SQL_API_SQLFREECONNECT, "SQLFreeConnect", SQLFreeConnect, NULL, NULL }, + /* 36 */ { SQL_API_SQLGETCONNECTATTR, "SQLGetConnectAttr", SQLGetConnectAttr, NULL, NULL }, + /* 37 */ { SQL_API_SQLGETCONNECTOPTION, "SQLGetConnectOption", SQLGetConnectOption, NULL, NULL }, + /* 38 */ { SQL_API_SQLGETCURSORNAME, "SQLGetCursorName", SQLGetCursorName, NULL, NULL }, + /* 39 */ { SQL_API_SQLGETDATA, "SQLGetData", SQLGetData, NULL, NULL }, + /* 40 */ { SQL_API_SQLGETDESCFIELD, "SQLGetDescField", SQLGetDescField, NULL, NULL }, + /* 41 */ { SQL_API_SQLGETDESCREC, "SQLGetDescRec", SQLGetDescRec, NULL, NULL }, + /* 42 */ { SQL_API_SQLGETDIAGFIELD, "SQLGetDiagField", SQLGetDiagField, NULL, NULL }, + /* 43 */ { SQL_API_SQLGETENVATTR, "SQLGetEnvAttr", SQLGetEnvAttr, NULL, NULL }, + /* 44 */ { SQL_API_SQLGETFUNCTIONS, "SQLGetFunctions", SQLGetFunctions, NULL, NULL }, + /* 45 */ { SQL_API_SQLGETINFO, "SQLGetInfo", SQLGetInfo, NULL, NULL }, + /* 46 */ { SQL_API_SQLGETSTMTATTR, "SQLGetStmtAttr", SQLGetStmtAttr, NULL, NULL }, + /* 47 */ { SQL_API_SQLGETSTMTOPTION, "SQLGetStmtOption", SQLGetStmtOption, NULL, NULL }, + /* 48 */ { SQL_API_SQLGETTYPEINFO, "SQLGetTypeInfo", SQLGetTypeInfo, NULL, NULL }, + /* 49 */ { SQL_API_SQLMORERESULTS, "SQLMoreResults", SQLMoreResults, NULL, NULL }, + /* 50 */ { SQL_API_SQLNATIVESQL, "SQLNativeSql", SQLNativeSql, NULL, NULL }, + /* 51 */ { SQL_API_SQLNUMPARAMS, "SQLNumParams", SQLNumParams, NULL, NULL }, + /* 52 */ { SQL_API_SQLNUMRESULTCOLS, "SQLNumResultCols", SQLNumResultCols, NULL, NULL }, + /* 53 */ { SQL_API_SQLPARAMDATA, "SQLParamData", SQLParamData, NULL, NULL }, + /* 54 */ { SQL_API_SQLPARAMOPTIONS, "SQLParamOptions", SQLParamOptions, NULL, NULL }, + /* 55 */ { SQL_API_SQLPREPARE, "SQLPrepare", SQLPrepare, NULL, NULL }, + /* 56 */ { SQL_API_SQLPRIMARYKEYS, "SQLPrimaryKeys", SQLPrimaryKeys, NULL, NULL }, + /* 57 */ { SQL_API_SQLPROCEDURECOLUMNS, "SQLProcedureColumns", SQLProcedureColumns, NULL, NULL }, + /* 58 */ { SQL_API_SQLPROCEDURES, "SQLProcedures", SQLProcedures, NULL, NULL }, + /* 59 */ { SQL_API_SQLPUTDATA, "SQLPutData", SQLPutData, NULL, NULL }, + /* 60 */ { SQL_API_SQLROWCOUNT, "SQLRowCount", SQLRowCount, NULL, NULL }, + /* 61 */ { SQL_API_SQLSETCONNECTATTR, "SQLSetConnectAttr", SQLSetConnectAttr, NULL, NULL }, + /* 62 */ { SQL_API_SQLSETCONNECTOPTION, "SQLSetConnectOption", SQLSetConnectOption, NULL, NULL }, + /* 63 */ { SQL_API_SQLSETCURSORNAME, "SQLSetCursorName", SQLSetCursorName, NULL, NULL }, + /* 64 */ { SQL_API_SQLSETDESCFIELD, "SQLSetDescField", SQLSetDescField, NULL, NULL }, + /* 65 */ { SQL_API_SQLSETDESCREC, "SQLSetDescRec", SQLSetDescRec, NULL, NULL }, + /* 66 */ { SQL_API_SQLSETENVATTR, "SQLSetEnvAttr", SQLSetEnvAttr, NULL, NULL }, + /* 67 */ { SQL_API_SQLSETPARAM, "SQLSetParam", SQLSetParam, NULL, NULL }, + /* 68 */ { SQL_API_SQLSETPOS, "SQLSetPos", SQLSetPos, NULL, NULL }, + /* 69 */ { SQL_API_SQLSETSCROLLOPTIONS, "SQLSetScrollOptions", SQLSetScrollOptions, NULL, NULL }, + /* 70 */ { SQL_API_SQLSETSTMTATTR, "SQLSetStmtAttr", SQLSetStmtAttr, NULL, NULL }, + /* 71 */ { SQL_API_SQLSETSTMTOPTION, "SQLSetStmtOption", SQLSetStmtOption, NULL, NULL }, + /* 72 */ { SQL_API_SQLSPECIALCOLUMNS, "SQLSpecialColumns", SQLSpecialColumns, NULL, NULL }, + /* 73 */ { SQL_API_SQLSTATISTICS, "SQLStatistics", SQLStatistics, NULL, NULL }, + /* 74 */ { SQL_API_SQLTABLEPRIVILEGES, "SQLTablePrivileges", SQLTablePrivileges, NULL, NULL }, + /* 75 */ { SQL_API_SQLTABLES, "SQLTables", SQLTables, NULL, NULL }, + /* 76 */ { SQL_API_SQLTRANSACT, "SQLTransact", SQLTransact, NULL, NULL }, + /* 77 */ { SQL_API_SQLGETDIAGREC, "SQLGetDiagRec", SQLGetDiagRec, NULL, NULL }, }; static PROXYHANDLE gProxyHandle; @@ -156,10 +156,299 @@ } \ } -SQLRETURN SQLDummyFunc() -{ - TRACE("SQLDummyFunc: \n"); +static SQLRETURN SQLDummyFunc(void) +{ + TRACE("SQLDummyFunc:\n"); return SQL_SUCCESS; +} + +/*********************************************************************** + * ODBC_ReplicateODBCInstToRegistry + * + * PARAMS + * + * RETURNS + * + * Utility to ODBC_ReplicateToRegistry to replicate the drivers of the + * ODBCINST.INI settings + * + * The driver settings are not replicated to the registry. If we were to + * replicate them we would need to decide whether to replicate all settings + * or to do some translation; whether to remove any entries present only in + * the windows registry, etc. + */ + +static void ODBC_ReplicateODBCInstToRegistry (SQLHENV hEnv) +{ + HKEY hODBCInst; + LONG reg_ret; + int success; + + success = 0; + TRACE ("Driver settings are not currently replicated to the registry\n"); + if ((reg_ret = RegCreateKeyExA (HKEY_LOCAL_MACHINE, + "Software\\ODBC\\ODBCINST.INI", 0, NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS /* a couple more than we need */, NULL, + &hODBCInst, NULL)) == ERROR_SUCCESS) + { + HKEY hDrivers; + if ((reg_ret = RegCreateKeyExA (hODBCInst, "ODBC Drivers", 0, + NULL, REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS /* overkill */, NULL, &hDrivers, NULL)) + == ERROR_SUCCESS) + { + SQLRETURN sql_ret; + SQLUSMALLINT dirn; + CHAR desc [256]; + SQLSMALLINT sizedesc; + + success = 1; + dirn = SQL_FETCH_FIRST; + while ((sql_ret = SQLDrivers (hEnv, dirn, (SQLCHAR*)desc, sizeof(desc), + &sizedesc, NULL, 0, NULL)) == SQL_SUCCESS || + sql_ret == SQL_SUCCESS_WITH_INFO) + { + /* FIXME Do some proper handling of the SUCCESS_WITH_INFO */ + dirn = SQL_FETCH_NEXT; + if (sizedesc == lstrlenA(desc)) + { + HKEY hThis; + if ((reg_ret = RegQueryValueExA (hDrivers, desc, NULL, + NULL, NULL, NULL)) == ERROR_FILE_NOT_FOUND) + { + if ((reg_ret = RegSetValueExA (hDrivers, desc, 0, + REG_SZ, (const BYTE *)"Installed", 10)) != ERROR_SUCCESS) + { + TRACE ("Error %d replicating driver %s\n", + reg_ret, desc); + success = 0; + } + } + else if (reg_ret != ERROR_SUCCESS) + { + TRACE ("Error %d checking for %s in drivers\n", + reg_ret, desc); + success = 0; + } + if ((reg_ret = RegCreateKeyExA (hODBCInst, desc, 0, + NULL, REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, NULL, &hThis, NULL)) + == ERROR_SUCCESS) + { + /* FIXME This is where the settings go. + * I suggest that if the disposition says it + * exists then we leave it alone. Alternatively + * include an extra value to flag that it is + * a replication of the unixODBC/iODBC/... + */ + if ((reg_ret = RegCloseKey (hThis)) != + ERROR_SUCCESS) + TRACE ("Error %d closing %s key\n", reg_ret, + desc); + } + else + { + TRACE ("Error %d ensuring driver key %s\n", + reg_ret, desc); + success = 0; + } + } + else + { + WARN ("Unusually long driver name %s not replicated\n", + desc); + success = 0; + } + } + if (sql_ret != SQL_NO_DATA) + { + TRACE ("Error %d enumerating drivers\n", (int)sql_ret); + success = 0; + } + if ((reg_ret = RegCloseKey (hDrivers)) != ERROR_SUCCESS) + { + TRACE ("Error %d closing hDrivers\n", reg_ret); + } + } + else + { + TRACE ("Error %d opening HKLM\\S\\O\\OI\\Drivers\n", reg_ret); + } + if ((reg_ret = RegCloseKey (hODBCInst)) != ERROR_SUCCESS) + { + TRACE ("Error %d closing HKLM\\S\\O\\ODBCINST.INI\n", reg_ret); + } + } + else + { + TRACE ("Error %d opening HKLM\\S\\O\\ODBCINST.INI\n", reg_ret); + } + if (!success) + { + WARN ("May not have replicated all ODBC drivers to the registry\n"); + } +} + +/*********************************************************************** + * ODBC_ReplicateODBCToRegistry + * + * PARAMS + * + * RETURNS + * + * Utility to ODBC_ReplicateToRegistry to replicate either the USER or + * SYSTEM dsns + * + * For now simply place the "Driver description" (as returned by SQLDataSources) + * into the registry as the driver. This is enough to satisfy Crystal's + * requirement that there be a driver entry. (It doesn't seem to care what + * the setting is). + * A slightly more accurate setting would be to access the registry to find + * the actual driver library for the given description (which appears to map + * to one of the HKLM/Software/ODBC/ODBCINST.INI keys). (If you do this note + * that this will add a requirement that this function be called after + * ODBC_ReplicateODBCInstToRegistry) + */ +static void ODBC_ReplicateODBCToRegistry (int is_user, SQLHENV hEnv) +{ + HKEY hODBC; + LONG reg_ret; + SQLRETURN sql_ret; + SQLUSMALLINT dirn; + CHAR dsn [SQL_MAX_DSN_LENGTH + 1]; + SQLSMALLINT sizedsn; + CHAR desc [256]; + SQLSMALLINT sizedesc; + int success; + const char *which = is_user ? "user" : "system"; + + success = 0; + if ((reg_ret = RegCreateKeyExA ( + is_user ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, + "Software\\ODBC\\ODBC.INI", 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS /* a couple more than we need */, NULL, &hODBC, + NULL)) == ERROR_SUCCESS) + { + success = 1; + dirn = is_user ? SQL_FETCH_FIRST_USER : SQL_FETCH_FIRST_SYSTEM; + while ((sql_ret = SQLDataSources (hEnv, dirn, + (SQLCHAR*)dsn, sizeof(dsn), &sizedsn, + (SQLCHAR*)desc, sizeof(desc), &sizedesc)) == SQL_SUCCESS + || sql_ret == SQL_SUCCESS_WITH_INFO) + { + /* FIXME Do some proper handling of the SUCCESS_WITH_INFO */ + dirn = SQL_FETCH_NEXT; + if (sizedsn == lstrlenA(dsn) && sizedesc == lstrlenA(desc)) + { + HKEY hDSN; + if ((reg_ret = RegCreateKeyExA (hODBC, dsn, 0, + NULL, REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, NULL, &hDSN, NULL)) + == ERROR_SUCCESS) + { + static const char DRIVERKEY[] = "Driver"; + if ((reg_ret = RegQueryValueExA (hDSN, DRIVERKEY, + NULL, NULL, NULL, NULL)) + == ERROR_FILE_NOT_FOUND) + { + if ((reg_ret = RegSetValueExA (hDSN, DRIVERKEY, 0, + REG_SZ, (LPBYTE)desc, sizedesc)) != ERROR_SUCCESS) + { + TRACE ("Error %d replicating description of " + "%s(%s)\n", reg_ret, dsn, desc); + success = 0; + } + } + else if (reg_ret != ERROR_SUCCESS) + { + TRACE ("Error %d checking for description of %s\n", + reg_ret, dsn); + success = 0; + } + if ((reg_ret = RegCloseKey (hDSN)) != ERROR_SUCCESS) + { + TRACE ("Error %d closing %s DSN key %s\n", + reg_ret, which, dsn); + } + } + else + { + TRACE ("Error %d opening %s DSN key %s\n", + reg_ret, which, dsn); + success = 0; + } + } + else + { + WARN ("Unusually long %s data source name %s (%s) not " + "replicated\n", which, dsn, desc); + success = 0; + } + } + if (sql_ret != SQL_NO_DATA) + { + TRACE ("Error %d enumerating %s datasources\n", + (int)sql_ret, which); + success = 0; + } + if ((reg_ret = RegCloseKey (hODBC)) != ERROR_SUCCESS) + { + TRACE ("Error %d closing %s ODBC.INI registry key\n", reg_ret, + which); + } + } + else + { + TRACE ("Error %d creating/opening %s ODBC.INI registry key\n", + reg_ret, which); + } + if (!success) + { + WARN ("May not have replicated all %s ODBC DSNs to the registry\n", + which); + } +} + +/*********************************************************************** + * ODBC_ReplicateToRegistry + * + * PARAMS + * + * RETURNS + * + * Unfortunately some of the functions that Windows documents as being part + * of the ODBC API it implements directly during compilation or something + * in terms of registry access functions. + * e.g. SQLGetInstalledDrivers queries the list at + * HKEY_LOCAL_MACHINE\Software\ODBC\ODBCINST.INI\ODBC Drivers + * + * This function is called when the driver manager is loaded and is used + * to replicate the appropriate details into the Wine registry + */ + +static void ODBC_ReplicateToRegistry (void) +{ + SQLRETURN sql_ret; + SQLHENV hEnv; + + if ((sql_ret = SQLAllocEnv (&hEnv)) == SQL_SUCCESS) + { + ODBC_ReplicateODBCInstToRegistry (hEnv); + ODBC_ReplicateODBCToRegistry (0 /* system dsns */, hEnv); + ODBC_ReplicateODBCToRegistry (1 /* user dsns */, hEnv); + + if ((sql_ret = SQLFreeEnv (hEnv)) != SQL_SUCCESS) + { + TRACE ("Error %d freeing the SQL environment.\n", (int)sql_ret); + } + } + else + { + TRACE ("Error %d opening an SQL environment.\n", (int)sql_ret); + WARN ("The external ODBC settings have not been replicated to the" + " Wine registry\n"); + } } /*********************************************************************** @@ -178,14 +467,17 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { int i; - TRACE("Initializing or Finalizing proxy ODBC: %p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); + TRACE("Initializing or Finalizing proxy ODBC: %p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); if (fdwReason == DLL_PROCESS_ATTACH) { TRACE("Loading ODBC...\n"); DisableThreadLibraryCalls(hinstDLL); if (ODBC_LoadDriverManager()) + { ODBC_LoadDMFunctions(); + ODBC_ReplicateToRegistry(); + } } else if (fdwReason == DLL_PROCESS_DETACH) { @@ -197,18 +489,16 @@ gProxyHandle.functions[i].func = SQLDummyFunc; } } -#ifndef __REACTOS__ + if (gProxyHandle.dmHandle) { wine_dlclose(gProxyHandle.dmHandle,NULL,0); gProxyHandle.dmHandle = NULL; } -#endif } return TRUE; } - /*********************************************************************** * ODBC_LoadDriverManager [Internal] Load ODBC library. @@ -223,41 +513,28 @@ static BOOL ODBC_LoadDriverManager(void) { const char *s = getenv("LIB_ODBC_DRIVER_MANAGER"); -#ifndef __REACTOS__ char error[256]; + + TRACE("\n"); + + gProxyHandle.bFunctionReady = FALSE; + +#ifdef SONAME_LIBODBC + if (!s || !s[0]) s = SONAME_LIBODBC; #endif - - TRACE("\n"); - - gProxyHandle.bFunctionReady = FALSE; - gProxyHandle.nErrorType = ERROR_LIBRARY_NOT_FOUND; - - if (s!= NULL && strlen (s) >= sizeof(gProxyHandle.dmLibName)) - { - ERR("Driver name too long (%s)\n",s); - return FALSE; - } - if (s == NULL || strlen(s) == 0) - s = "libodbc.so"; - strcpy(gProxyHandle.dmLibName, s); -#ifndef __REACTOS__ - gProxyHandle.dmHandle = wine_dlopen(gProxyHandle.dmLibName, RTLD_LAZY, error, sizeof(error)); - - if (gProxyHandle.dmHandle == NULL) /* fail to load unixODBC driver manager */ - { - WARN("failed to open library %s: %s\n", gProxyHandle.dmLibName, error); - gProxyHandle.dmLibName[0] = '\0'; - gProxyHandle.nErrorType = ERROR_LIBRARY_NOT_FOUND; - return FALSE; - } - else + if (!s || !s[0]) goto failed; + + gProxyHandle.dmHandle = wine_dlopen(s, RTLD_LAZY | RTLD_GLOBAL, error, sizeof(error)); + + if (gProxyHandle.dmHandle != NULL) { gProxyHandle.nErrorType = ERROR_FREE; return TRUE; } -#else +failed: + WARN("failed to open library %s: %s\n", debugstr_a(s), error); + gProxyHandle.nErrorType = ERROR_LIBRARY_NOT_FOUND; return FALSE; -#endif } @@ -273,16 +550,16 @@ static BOOL ODBC_LoadDMFunctions(void) { -#ifndef __REACTOS__ int i; char error[256]; -#endif if (gProxyHandle.dmHandle == NULL) return FALSE; -#ifndef __REACTOS__ + for ( i = 0; i < NUM_SQLFUNC; i ++ ) { + char * pFuncNameW; + gProxyHandle.functions[i] = template_func[i]; gProxyHandle.functions[i].func = wine_dlsym(gProxyHandle.dmHandle, gProxyHandle.functions[i].name, error, sizeof(error)); @@ -292,10 +569,27 @@ ERR("Failed to load function %s\n",gProxyHandle.functions[i].name); gProxyHandle.functions[i].func = SQLDummyFunc; } + else + { + /* Build Unicode function name for this function */ + pFuncNameW = HeapAlloc(GetProcessHeap(), 0, strlen(gProxyHandle.functions[i].name) + 2); + strcpy(pFuncNameW, gProxyHandle.functions[i].name); + pFuncNameW[strlen(gProxyHandle.functions[i].name) + 1] = '\0'; + pFuncNameW[strlen(gProxyHandle.functions[i].name)] = 'W'; + + gProxyHandle.functions[i].funcW = wine_dlsym(gProxyHandle.dmHandle, + pFuncNameW, error, sizeof(error)); + if (error[0]) + { +/* TRACE("Failed to load function %s, possibly no Unicode version is required\n", pFuncNameW); */ + gProxyHandle.functions[i].funcW = NULL; + } + HeapFree(GetProcessHeap(), 0, pFuncNameW); + } } gProxyHandle.bFunctionReady = TRUE; -#endif + return TRUE; } @@ -356,7 +650,7 @@ if (!gProxyHandle.bFunctionReady || gProxyHandle.dmHandle == NULL) { if (gProxyHandle.nErrorType == ERROR_LIBRARY_NOT_FOUND) - WARN("ProxyODBC: Can not load ODBC driver manager library.\n"); + WARN("ProxyODBC: Cannot load ODBC driver manager library.\n"); if (HandleType == SQL_HANDLE_ENV) *OutputHandle = SQL_NULL_HENV; @@ -409,12 +703,12 @@ SQLRETURN WINAPI SQLAllocHandleStd( SQLSMALLINT HandleType, SQLHANDLE InputHandle, SQLHANDLE *OutputHandle) { - TRACE("ProxyODBC: SQLAllocHandelStd.\n"); + TRACE("ProxyODBC: SQLAllocHandleStd.\n"); if (!gProxyHandle.bFunctionReady || gProxyHandle.dmHandle == NULL) { if (gProxyHandle.nErrorType == ERROR_LIBRARY_NOT_FOUND) - WARN("ProxyODBC: Can not load ODBC driver manager library.\n"); + WARN("ProxyODBC: Cannot load ODBC driver manager library.\n"); if (HandleType == SQL_HANDLE_ENV) *OutputHandle = SQL_NULL_HENV; @@ -560,8 +854,8 @@ CHECK_READY_AND_dmHandle(); - strcpy(gProxyHandle.ServerName, (const char*)ServerName); - strcpy(gProxyHandle.UserName, (const char*)UserName); + strcpy( (LPSTR)gProxyHandle.ServerName, (LPSTR)ServerName ); + strcpy( (LPSTR)gProxyHandle.UserName, (LPSTR)UserName ); assert(gProxyHandle.functions[SQLAPI_INDEX_SQLCONNECT].func); ret=(gProxyHandle.functions[SQLAPI_INDEX_SQLCONNECT].func) @@ -612,7 +906,7 @@ (EnvironmentHandle, Direction, ServerName, BufferLength1, NameLength1, Description, BufferLength2, NameLength2); - if (WINE_TRACE_ON(odbc)) + if (TRACE_ON(odbc)) { TRACE("returns: %d \t", ret); if (*NameLength1 > 0) @@ -1804,4 +2098,832 @@ (statement_handle, f_concurrency, crow_keyset, crow_rowset); } +static int SQLColAttributes_KnownStringAttribute(SQLUSMALLINT fDescType) +{ + static const SQLUSMALLINT attrList[] = + { + SQL_COLUMN_OWNER_NAME, + SQL_COLUMN_QUALIFIER_NAME, + SQL_COLUMN_LABEL, + SQL_COLUMN_NAME, + SQL_COLUMN_TABLE_NAME, + SQL_COLUMN_TYPE_NAME, + SQL_DESC_BASE_COLUMN_NAME, + SQL_DESC_BASE_TABLE_NAME, + SQL_DESC_CATALOG_NAME, + SQL_DESC_LABEL, + SQL_DESC_LITERAL_PREFIX, + SQL_DESC_LITERAL_SUFFIX, + SQL_DESC_LOCAL_TYPE_NAME, + SQL_DESC_NAME, + SQL_DESC_SCHEMA_NAME, + SQL_DESC_TABLE_NAME, + SQL_DESC_TYPE_NAME, + }; + unsigned int i; + + for (i = 0; i < sizeof(attrList) / sizeof(SQLUSMALLINT); i++) { + if (attrList[i] == fDescType) return 1; + } + return 0; +} + +/************************************************************************* + * SQLColAttributesW [ODBC32.106] + */ +SQLRETURN WINAPI SQLColAttributesW( + SQLHSTMT hstmt, + SQLUSMALLINT icol, + SQLUSMALLINT fDescType, + SQLPOINTER rgbDesc, + SQLSMALLINT cbDescMax, + SQLSMALLINT *pcbDesc, + SQLINTEGER *pfDesc) +{ + SQLRETURN iResult; + + TRACE("hstmt=0x%08lx icol=%d fDescType=%d rgbDesc=%p cbDescMax=%d pcbDesc=%p pfDesc=%p\n", + hstmt, icol, fDescType, rgbDesc, cbDescMax, pcbDesc, pfDesc); + + CHECK_dmHandle(); + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLCOLATTRIBUTES].funcW); + iResult = (gProxyHandle.functions[SQLAPI_INDEX_SQLCOLATTRIBUTES].funcW) + (hstmt, icol, fDescType, rgbDesc, cbDescMax, pcbDesc, pfDesc); + if (iResult == SQL_SUCCESS && rgbDesc != NULL && SQLColAttributes_KnownStringAttribute(fDescType)) { + /* + TRACE("Dumping values fetched via SQLColAttributesW:\n"); + TRACE(" Attribute name : %s\n", debugstr_w(rgbDesc)); + TRACE(" Declared length: %d\n", *pcbDesc); + */ + if (*pcbDesc != lstrlenW(rgbDesc) * 2) { + TRACE("CHEAT: resetting name length for ADO\n"); + *pcbDesc = lstrlenW(rgbDesc) * 2; + } + } + return iResult; +} + +/************************************************************************* + * SQLConnectW [ODBC32.107] + */ +SQLRETURN WINAPI SQLConnectW(SQLHDBC ConnectionHandle, + WCHAR *ServerName, SQLSMALLINT NameLength1, + WCHAR *UserName, SQLSMALLINT NameLength2, + WCHAR *Authentication, SQLSMALLINT NameLength3) +{ + SQLRETURN ret; + TRACE("(Server=%.*s)\n",NameLength1+3, debugstr_w(ServerName)); + + CHECK_READY_AND_dmHandle(); + + WideCharToMultiByte( + CP_UTF8, 0, + ServerName, NameLength1, + gProxyHandle.ServerName, sizeof(gProxyHandle.ServerName), + NULL, NULL); + WideCharToMultiByte( + CP_UTF8, 0, + UserName, NameLength2, + gProxyHandle.UserName, sizeof(gProxyHandle.UserName), + NULL, NULL); + + assert(gProxyHandle.functions[SQLAPI_INDEX_SQLCONNECT].funcW); + ret=(gProxyHandle.functions[SQLAPI_INDEX_SQLCONNECT].funcW) + (ConnectionHandle, ServerName, NameLength1, + UserName, NameLength2, Authentication, NameLength3); + + TRACE("returns %d\n",ret); + return ret; +} + +/************************************************************************* + * SQLDescribeColW [ODBC32.108] + */ +SQLRETURN WINAPI SQLDescribeColW(SQLHSTMT StatementHandle, + SQLUSMALLINT ColumnNumber, WCHAR *ColumnName, + SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, + SQLSMALLINT *DataType, SQLUINTEGER *ColumnSize, + SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable) +{ + SQLRETURN iResult; + TRACE("\n"); + + CHECK_READY_AND_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLDESCRIBECOL].funcW); + iResult = (gProxyHandle.functions[SQLAPI_INDEX_SQLDESCRIBECOL].funcW) + (StatementHandle, ColumnNumber, ColumnName, + BufferLength, NameLength, DataType, ColumnSize, DecimalDigits, Nullable); + if (iResult >= 0) { + TRACE("Successfully recovered the following column information:\n"); + TRACE("\tRequested column index: %d\n", ColumnNumber); + TRACE("\tAvailable length for column name: %d\n", BufferLength); + if (NameLength != NULL) + TRACE("\tActual length for column name: %d\n", *NameLength); + else TRACE("\tActual length for column name: (null)\n"); + TRACE("\tReturned column name: %s\n", debugstr_w(ColumnName)); + } + return iResult; +} + +/************************************************************************* + * SQLErrorW [ODBC32.110] + */ +SQLRETURN WINAPI SQLErrorW(SQLHENV EnvironmentHandle, + SQLHDBC ConnectionHandle, SQLHSTMT StatementHandle, + WCHAR *Sqlstate, SQLINTEGER *NativeError, + WCHAR *MessageText, SQLSMALLINT BufferLength, + SQLSMALLINT *TextLength) +{ + TRACE("\n"); + + CHECK_READY_AND_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLERROR].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLERROR].funcW) + (EnvironmentHandle, ConnectionHandle, StatementHandle, + Sqlstate, NativeError, MessageText, BufferLength, TextLength); +} + +/************************************************************************* + * SQLExecDirectW [ODBC32.111] + */ +SQLRETURN WINAPI SQLExecDirectW(SQLHSTMT StatementHandle, + WCHAR *StatementText, SQLINTEGER TextLength) +{ + TRACE("\n"); + + CHECK_READY_AND_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLEXECDIRECT].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLEXECDIRECT].funcW) + (StatementHandle, StatementText, TextLength); +} + +/************************************************************************* + * SQLGetCursorNameW [ODBC32.117] + */ +SQLRETURN WINAPI SQLGetCursorNameW(SQLHSTMT StatementHandle, + WCHAR *CursorName, SQLSMALLINT BufferLength, + SQLSMALLINT *NameLength) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLGETCURSORNAME].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLGETCURSORNAME].funcW) + (StatementHandle, CursorName, BufferLength, NameLength); +} + +/************************************************************************* + * SQLPrepareW [ODBC32.119] + */ +SQLRETURN WINAPI SQLPrepareW(SQLHSTMT StatementHandle, + WCHAR *StatementText, SQLINTEGER TextLength) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLPREPARE].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLPREPARE].funcW) + (StatementHandle, StatementText, TextLength); +} + +/************************************************************************* + * SQLSetCursorNameW [ODBC32.121] + */ +SQLRETURN WINAPI SQLSetCursorNameW(SQLHSTMT StatementHandle, WCHAR *CursorName, SQLSMALLINT NameLength) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLSETCURSORNAME].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLSETCURSORNAME].funcW) + (StatementHandle, CursorName, NameLength); +} + +/************************************************************************* + * SQLColAttributeW [ODBC32.127] + */ +SQLRETURN WINAPI SQLColAttributeW (SQLHSTMT StatementHandle, + SQLUSMALLINT ColumnNumber, SQLUSMALLINT FieldIdentifier, + SQLPOINTER CharacterAttribute, SQLSMALLINT BufferLength, + SQLSMALLINT *StringLength, SQLPOINTER NumericAttribute) +{ + SQLRETURN iResult; + + TRACE("StatementHandle=0x%08lx ColumnNumber=%d FieldIdentifier=%d CharacterAttribute=%p BufferLength=%d StringLength=%p NumericAttribute=%p\n", + StatementHandle, ColumnNumber, FieldIdentifier, + CharacterAttribute, BufferLength, StringLength, NumericAttribute); + + CHECK_READY_AND_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLCOLATTRIBUTE].funcW); + iResult = (gProxyHandle.functions[SQLAPI_INDEX_SQLCOLATTRIBUTE].funcW) + (StatementHandle, ColumnNumber, FieldIdentifier, + CharacterAttribute, BufferLength, StringLength, NumericAttribute); + if (iResult == SQL_SUCCESS && CharacterAttribute != NULL && SQLColAttributes_KnownStringAttribute(FieldIdentifier)) { + /* + TRACE("Dumping values fetched via SQLColAttributeW:\n"); + TRACE(" Attribute name : %s\n", debugstr_w(rgbDesc)); + TRACE(" Declared length: %d\n", *pcbDesc); + */ + if (*StringLength != lstrlenW(CharacterAttribute) * 2) { + TRACE("CHEAT: resetting name length for ADO\n"); + *StringLength = lstrlenW(CharacterAttribute) * 2; + } + } + return iResult; +} + +/************************************************************************* + * SQLGetConnectAttrW [ODBC32.132] + */ +SQLRETURN WINAPI SQLGetConnectAttrW(SQLHDBC ConnectionHandle, + SQLINTEGER Attribute, SQLPOINTER Value, + SQLINTEGER BufferLength, SQLINTEGER *StringLength) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLGETCONNECTATTR].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLGETCONNECTATTR].funcW) + (ConnectionHandle, Attribute, Value, + BufferLength, StringLength); +} + +/************************************************************************* + * SQLGetDescFieldW [ODBC32.133] + */ +SQLRETURN WINAPI SQLGetDescFieldW(SQLHDESC DescriptorHandle, + SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier, + SQLPOINTER Value, SQLINTEGER BufferLength, + SQLINTEGER *StringLength) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLGETDESCFIELD].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLGETDESCFIELD].funcW) + (DescriptorHandle, RecNumber, FieldIdentifier, + Value, BufferLength, StringLength); +} + +/************************************************************************* + * SQLGetDescRecW [ODBC32.134] + */ +SQLRETURN WINAPI SQLGetDescRecW(SQLHDESC DescriptorHandle, + SQLSMALLINT RecNumber, WCHAR *Name, + SQLSMALLINT BufferLength, SQLSMALLINT *StringLength, + SQLSMALLINT *Type, SQLSMALLINT *SubType, + SQLINTEGER *Length, SQLSMALLINT *Precision, + SQLSMALLINT *Scale, SQLSMALLINT *Nullable) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLGETDESCREC].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLGETDESCREC].funcW) + (DescriptorHandle, RecNumber, Name, BufferLength, + StringLength, Type, SubType, Length, Precision, Scale, Nullable); +} + +/************************************************************************* + * SQLGetDiagFieldW [ODBC32.135] + */ +SQLRETURN WINAPI SQLGetDiagFieldW(SQLSMALLINT HandleType, SQLHANDLE Handle, + SQLSMALLINT RecNumber, SQLSMALLINT DiagIdentifier, + SQLPOINTER DiagInfo, SQLSMALLINT BufferLength, + SQLSMALLINT *StringLength) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLGETDIAGFIELD].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLGETDIAGFIELD].funcW) + (HandleType, Handle, RecNumber, DiagIdentifier, + DiagInfo, BufferLength, StringLength); +} + +/************************************************************************* + * SQLGetDiagRecW [ODBC32.136] + */ +SQLRETURN WINAPI SQLGetDiagRecW(SQLSMALLINT HandleType, SQLHANDLE Handle, + SQLSMALLINT RecNumber, WCHAR *Sqlstate, + SQLINTEGER *NativeError, WCHAR *MessageText, + SQLSMALLINT BufferLength, SQLSMALLINT *TextLength) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLGETDIAGREC].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLGETDIAGREC].funcW) + (HandleType, Handle, RecNumber, Sqlstate, NativeError, + MessageText, BufferLength, TextLength); +} + +/************************************************************************* + * SQLGetStmtAttrW [ODBC32.138] + */ +SQLRETURN WINAPI SQLGetStmtAttrW(SQLHSTMT StatementHandle, + SQLINTEGER Attribute, SQLPOINTER Value, + SQLINTEGER BufferLength, SQLINTEGER *StringLength) +{ + SQLRETURN iResult; + + TRACE("Attribute = (%02ld) Value = %p BufferLength = (%ld) StringLength = %p\n", + Attribute, Value, BufferLength, StringLength); + + if (Value == NULL) { + WARN("Unexpected NULL in Value return address\n"); + iResult = SQL_ERROR; +/* + } else if (StringLength == NULL) { + WARN("Unexpected NULL in StringLength return address\n"); + iResult = SQL_ERROR; +*/ + } else { + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLGETSTMTATTR].funcW); + iResult = (gProxyHandle.functions[SQLAPI_INDEX_SQLGETSTMTATTR].funcW) + (StatementHandle, Attribute, Value, BufferLength, StringLength); + TRACE("returning %d...\n", iResult); + } + return iResult; +} + +/************************************************************************* + * SQLSetConnectAttrW [ODBC32.139] + */ +SQLRETURN WINAPI SQLSetConnectAttrW(SQLHDBC ConnectionHandle, SQLINTEGER Attribute, + SQLPOINTER Value, SQLINTEGER StringLength) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLSETCONNECTATTR].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLSETCONNECTATTR].funcW) + (ConnectionHandle, Attribute, Value, StringLength); +} + +/************************************************************************* + * SQLColumnsW [ODBC32.140] + */ +SQLRETURN WINAPI SQLColumnsW(SQLHSTMT StatementHandle, + WCHAR *CatalogName, SQLSMALLINT NameLength1, + WCHAR *SchemaName, SQLSMALLINT NameLength2, + WCHAR *TableName, SQLSMALLINT NameLength3, + WCHAR *ColumnName, SQLSMALLINT NameLength4) +{ + TRACE("\n"); + + CHECK_READY_AND_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLCOLUMNS].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLCOLUMNS].funcW) + (StatementHandle, CatalogName, NameLength1, + SchemaName, NameLength2, TableName, NameLength3, ColumnName, NameLength4); +} + +/************************************************************************* + * SQLDriverConnectW [ODBC32.141] + */ +SQLRETURN WINAPI SQLDriverConnectW( + SQLHDBC hdbc, + SQLHWND hwnd, + WCHAR *conn_str_in, + SQLSMALLINT len_conn_str_in, + WCHAR *conn_str_out, + SQLSMALLINT conn_str_out_max, + SQLSMALLINT *ptr_conn_str_out, + SQLUSMALLINT driver_completion ) +{ + TRACE("ConnStrIn (%d bytes) --> %s\n", len_conn_str_in, debugstr_w(conn_str_in)); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLDRIVERCONNECT].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLDRIVERCONNECT].funcW) + (hdbc, hwnd, conn_str_in, len_conn_str_in, conn_str_out, + conn_str_out_max, ptr_conn_str_out, driver_completion); +} + +/************************************************************************* + * SQLGetConnectOptionW [ODBC32.142] + */ +SQLRETURN WINAPI SQLGetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLPOINTER Value) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLGETCONNECTOPTION].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLGETCONNECTOPTION].funcW) + (ConnectionHandle, Option, Value); +} + +/************************************************************************* + * SQLGetInfoW [ODBC32.145] + */ +SQLRETURN WINAPI SQLGetInfoW(SQLHDBC ConnectionHandle, + SQLUSMALLINT InfoType, SQLPOINTER InfoValue, + SQLSMALLINT BufferLength, SQLSMALLINT *StringLength) +{ + SQLRETURN iResult; + + TRACE("InfoType = (%02u), InfoValue = %p, BufferLength = %d bytes\n", InfoType, InfoValue, BufferLength); + if (InfoValue == NULL) { + WARN("Unexpected NULL in InfoValue address\n"); + iResult = SQL_ERROR; + } else { + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLGETINFO].funcW); + iResult = (gProxyHandle.functions[SQLAPI_INDEX_SQLGETINFO].funcW) + (ConnectionHandle, InfoType, InfoValue, BufferLength, StringLength); + TRACE("returning %d...\n", iResult); + } + return iResult; +} + +/************************************************************************* + * SQLGetTypeInfoW [ODBC32.147] + */ +SQLRETURN WINAPI SQLGetTypeInfoW(SQLHSTMT StatementHandle, SQLSMALLINT DataType) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLGETTYPEINFO].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLGETTYPEINFO].funcW) + (StatementHandle, DataType); +} + +/************************************************************************* + * SQLSetConnectOptionW [ODBC32.150] + */ +SQLRETURN WINAPI SQLSetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLUINTEGER Value) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLSETCONNECTOPTION].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLSETCONNECTOPTION].funcW) + (ConnectionHandle, Option, Value); +} + +/************************************************************************* + * SQLSpecialColumnsW [ODBC32.152] + */ +SQLRETURN WINAPI SQLSpecialColumnsW(SQLHSTMT StatementHandle, + SQLUSMALLINT IdentifierType, SQLCHAR *CatalogName, + SQLSMALLINT NameLength1, SQLCHAR *SchemaName, + SQLSMALLINT NameLength2, SQLCHAR *TableName, + SQLSMALLINT NameLength3, SQLUSMALLINT Scope, + SQLUSMALLINT Nullable) +{ + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLSPECIALCOLUMNS].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLSPECIALCOLUMNS].funcW) + (StatementHandle, IdentifierType, CatalogName, NameLength1, SchemaName, + NameLength2, TableName, NameLength3, Scope, Nullable); +} + +/************************************************************************* + * SQLStatisticsW [ODBC32.153] + */ +SQLRETURN WINAPI SQLStatisticsW(SQLHSTMT StatementHandle, + SQLCHAR *CatalogName, SQLSMALLINT NameLength1, + SQLCHAR *SchemaName, SQLSMALLINT NameLength2, + SQLCHAR *TableName, SQLSMALLINT NameLength3, + SQLUSMALLINT Unique, SQLUSMALLINT Reserved) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLSTATISTICS].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLSTATISTICS].funcW) + (StatementHandle, CatalogName, NameLength1, SchemaName, NameLength2, + TableName, NameLength3, Unique, Reserved); +} + +/************************************************************************* + * SQLTablesW [ODBC32.154] + */ +SQLRETURN WINAPI SQLTablesW(SQLHSTMT StatementHandle, + SQLCHAR *CatalogName, SQLSMALLINT NameLength1, + SQLCHAR *SchemaName, SQLSMALLINT NameLength2, + SQLCHAR *TableName, SQLSMALLINT NameLength3, + SQLCHAR *TableType, SQLSMALLINT NameLength4) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLTABLES].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLTABLES].funcW) + (StatementHandle, CatalogName, NameLength1, + SchemaName, NameLength2, TableName, NameLength3, TableType, NameLength4); +} + +/************************************************************************* + * SQLBrowseConnectW [ODBC32.155] + */ +SQLRETURN WINAPI SQLBrowseConnectW( + SQLHDBC hdbc, + SQLCHAR *szConnStrIn, + SQLSMALLINT cbConnStrIn, + SQLCHAR *szConnStrOut, + SQLSMALLINT cbConnStrOutMax, + SQLSMALLINT *pcbConnStrOut) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLBROWSECONNECT].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLBROWSECONNECT].funcW) + (hdbc, szConnStrIn, cbConnStrIn, szConnStrOut, cbConnStrOutMax, pcbConnStrOut); +} + +/************************************************************************* + * SQLColumnPrivilegesW [ODBC32.156] + */ +SQLRETURN WINAPI SQLColumnPrivilegesW( + SQLHSTMT hstmt, + SQLCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLCHAR *szTableName, + SQLSMALLINT cbTableName, + SQLCHAR *szColumnName, + SQLSMALLINT cbColumnName) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLCOLUMNPRIVILEGES].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLCOLUMNPRIVILEGES].funcW) + (hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, + szTableName, cbTableName, szColumnName, cbColumnName); +} + +/************************************************************************* + * SQLDataSourcesW [ODBC32.157] + */ +SQLRETURN WINAPI SQLDataSourcesW(SQLHENV EnvironmentHandle, + SQLUSMALLINT Direction, WCHAR *ServerName, + SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1, + WCHAR *Description, SQLSMALLINT BufferLength2, + SQLSMALLINT *NameLength2) +{ + SQLRETURN ret; + + TRACE("EnvironmentHandle = %p\n", (LPVOID)EnvironmentHandle); + + if (!gProxyHandle.bFunctionReady || gProxyHandle.dmHandle == NULL) + { + ERR("Error: empty dm handle (gProxyHandle.dmHandle == NULL)\n"); + return SQL_ERROR; + } + + assert(gProxyHandle.functions[SQLAPI_INDEX_SQLDATASOURCES].funcW); + ret = (gProxyHandle.functions[SQLAPI_INDEX_SQLDATASOURCES].funcW) + (EnvironmentHandle, Direction, ServerName, + BufferLength1, NameLength1, Description, BufferLength2, NameLength2); + + if (TRACE_ON(odbc)) + { + TRACE("returns: %d \t", ret); + if (*NameLength1 > 0) + TRACE("DataSource = %s,", debugstr_w(ServerName)); + if (*NameLength2 > 0) + TRACE(" Description = %s", debugstr_w(Description)); + TRACE("\n"); + } + + return ret; +} + +/************************************************************************* + * SQLForeignKeysW [ODBC32.160] + */ +SQLRETURN WINAPI SQLForeignKeysW( + SQLHSTMT hstmt, + SQLCHAR *szPkCatalogName, + SQLSMALLINT cbPkCatalogName, + SQLCHAR *szPkSchemaName, + SQLSMALLINT cbPkSchemaName, + SQLCHAR *szPkTableName, + SQLSMALLINT cbPkTableName, + SQLCHAR *szFkCatalogName, + SQLSMALLINT cbFkCatalogName, + SQLCHAR *szFkSchemaName, + SQLSMALLINT cbFkSchemaName, + SQLCHAR *szFkTableName, + SQLSMALLINT cbFkTableName) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLFOREIGNKEYS].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLFOREIGNKEYS].funcW) + (hstmt, szPkCatalogName, cbPkCatalogName, szPkSchemaName, cbPkSchemaName, + szPkTableName, cbPkTableName, szFkCatalogName, cbFkCatalogName, szFkSchemaName, + cbFkSchemaName, szFkTableName, cbFkTableName); +} + +/************************************************************************* + * SQLNativeSqlW [ODBC32.162] + */ +SQLRETURN WINAPI SQLNativeSqlW( + SQLHDBC hdbc, + SQLCHAR *szSqlStrIn, + SQLINTEGER cbSqlStrIn, + SQLCHAR *szSqlStr, + SQLINTEGER cbSqlStrMax, + SQLINTEGER *pcbSqlStr) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLNATIVESQL].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLNATIVESQL].funcW) + (hdbc, szSqlStrIn, cbSqlStrIn, szSqlStr, cbSqlStrMax, pcbSqlStr); +} + +/************************************************************************* + * SQLPrimaryKeysW [ODBC32.165] + */ +SQLRETURN WINAPI SQLPrimaryKeysW( + SQLHSTMT hstmt, + SQLCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLCHAR *szTableName, + SQLSMALLINT cbTableName) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLPRIMARYKEYS].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLPRIMARYKEYS].funcW) + (hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, + szTableName, cbTableName); +} + +/************************************************************************* + * SQLProcedureColumnsW [ODBC32.166] + */ +SQLRETURN WINAPI SQLProcedureColumnsW( + SQLHSTMT hstmt, + SQLCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLCHAR *szProcName, + SQLSMALLINT cbProcName, + SQLCHAR *szColumnName, + SQLSMALLINT cbColumnName) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLPROCEDURECOLUMNS].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLPROCEDURECOLUMNS].funcW) + (hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, + szProcName, cbProcName, szColumnName, cbColumnName); +} + +/************************************************************************* + * SQLProceduresW [ODBC32.167] + */ +SQLRETURN WINAPI SQLProceduresW( + SQLHSTMT hstmt, + SQLCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLCHAR *szProcName, + SQLSMALLINT cbProcName) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLPROCEDURES].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLPROCEDURES].funcW) + (hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, + szProcName, cbProcName); +} + +/************************************************************************* + * SQLTablePrivilegesW [ODBC32.170] + */ +SQLRETURN WINAPI SQLTablePrivilegesW( + SQLHSTMT hstmt, + SQLCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLCHAR *szTableName, + SQLSMALLINT cbTableName) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLTABLEPRIVILEGES].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLTABLEPRIVILEGES].funcW) + (hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, + szTableName, cbTableName); +} + +/************************************************************************* + * SQLDriversW [ODBC32.171] + */ +SQLRETURN WINAPI SQLDriversW( + SQLHENV henv, + SQLUSMALLINT fDirection, + SQLCHAR *szDriverDesc, + SQLSMALLINT cbDriverDescMax, + SQLSMALLINT *pcbDriverDesc, + SQLCHAR *szDriverAttributes, + SQLSMALLINT cbDriverAttrMax, + SQLSMALLINT *pcbDriverAttr) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLDRIVERS].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLDRIVERS].funcW) + (henv, fDirection, szDriverDesc, cbDriverDescMax, pcbDriverDesc, + szDriverAttributes, cbDriverAttrMax, pcbDriverAttr); +} + +/************************************************************************* + * SQLSetDescFieldW [ODBC32.173] + */ +SQLRETURN WINAPI SQLSetDescFieldW(SQLHDESC DescriptorHandle, + SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier, + SQLPOINTER Value, SQLINTEGER BufferLength) +{ + TRACE("\n"); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLSETDESCFIELD].funcW); + return (gProxyHandle.functions[SQLAPI_INDEX_SQLSETDESCFIELD].funcW) + (DescriptorHandle, RecNumber, FieldIdentifier, Value, BufferLength); +} + +/************************************************************************* + * SQLSetStmtAttrW [ODBC32.176] + */ +SQLRETURN WINAPI SQLSetStmtAttrW(SQLHSTMT StatementHandle, + SQLINTEGER Attribute, SQLPOINTER Value, + SQLINTEGER StringLength) +{ + SQLRETURN iResult; + TRACE("Attribute = (%02ld) Value = %p StringLength = (%ld)\n", + Attribute, Value, StringLength); + + CHECK_dmHandle(); + + assert (gProxyHandle.functions[SQLAPI_INDEX_SQLSETSTMTATTR].funcW); + iResult = (gProxyHandle.functions[SQLAPI_INDEX_SQLSETSTMTATTR].funcW) + (StatementHandle, Attribute, Value, StringLength); + if (iResult == SQL_ERROR && (Attribute == SQL_ROWSET_SIZE || Attribute == SQL_ATTR_ROW_ARRAY_SIZE)) { + TRACE("CHEAT: returning SQL_SUCCESS to ADO...\n"); + iResult = SQL_SUCCESS; + } else { + TRACE("returning %d...\n", iResult); + } + return iResult; +} + + /* End of file */ Modified: branches/ros-amd64-bringup/reactos/dll/win32/odbc32/proxyodbc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/odbc32/proxyodbc.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/odbc32/proxyodbc.h [iso-8859-1] Thu May 21 21:32:41 2009 @@ -13,7 +13,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef _PROXYMANAGER_H @@ -33,6 +33,7 @@ const char *name; void *d_func; SQLRETURN (*func)(); + SQLRETURN (*funcW)(); } DM_FUNC; typedef struct proxyhandle @@ -44,7 +45,6 @@ int nErrorType; DM_FUNC functions[NUM_SQLFUNC]; /* entry point for driver manager functions */ char driverLibName[200]; /* ODBC driver SO name */ - char dmLibName[200]; /* driver manager library name */ char ServerName[200]; /* keep server name */ char UserName[50]; /* keep username */ } PROXYHANDLE;

1 0

[spetreolle] 41026: fix log2lines build
by spetreolle＠svn.reactos.org 21 May '09

21 May '09

Author: spetreolle Date: Thu May 21 18:15:51 2009 New Revision: 41026 URL: http://svn.reactos.org/svn/reactos?rev=41026&view=rev Log: fix log2lines build Modified: trunk/reactos/tools/rsym/rsym.h Modified: trunk/reactos/tools/rsym/rsym.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/rsym.h?rev=4102… ============================================================================== --- trunk/reactos/tools/rsym/rsym.h [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/rsym.h [iso-8859-1] Thu May 21 18:15:51 2009 @@ -2,6 +2,9 @@ #ifndef RSYM_H #define RSYM_H + +#define IMAGE_NT_OPTIONAL_HDR32_MAGIC 0x010b +#define IMAGE_NT_OPTIONAL_HDR64_MAGIC 0x020b #define IMAGE_DOS_MAGIC 0x5a4d #define IMAGE_PE_MAGIC 0x00004550

1 0

[dreimer] 41025: IMO RosBE Windows is ready for Version 1.4.3 now. It will be released on May 26th if some more ppl test it. Test Installer will be released today. - Updated changelog and Readme to include latest changes.
by dreimer＠svn.reactos.org 21 May '09

21 May '09

Author: dreimer Date: Thu May 21 18:09:30 2009 New Revision: 41025 URL: http://svn.reactos.org/svn/reactos?rev=41025&view=rev Log: IMO RosBE Windows is ready for Version 1.4.3 now. It will be released on May 26th if some more ppl test it. Test Installer will be released today. - Updated changelog and Readme to include latest changes. Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/README.odt Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Thu May 21 18:09:30 2009 @@ -1,5 +1,9 @@ -*** May XXth, 2009 - RosBE 1.4.3 Released - +*** May 26th, 2009 - RosBE 1.4.3 Released + +- GCC is now optimized for Pentium3. Thus it uses MMX and SSE Optimizations (Colin Finck) +- Bison fixed for REAL. (Daniel Reimer) +- Updated SVN to 1.6.2 (Daniel Reimer) +- Updated yasm to 0.8.0 (Daniel Reimer) RosBE-Windows spring cleaning: - Rewrite most of the RosBE-Windows CMD scripts resulting in more compact and cleaner code. (Colin Finck) - Remove the Standard MinGW Build Environment. We don't need it any longer since we have a new GCC. (Colin Finck) Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available.

1 0

[cgutman] 41024: - The slot number passed directly to NdisImmediateReadPciSlotInformation/NdisImmediateWritePciSlotInformation is ignored according to MSDN so store a valid slot number in the wrapper context to use instead
by cgutman＠svn.reactos.org 21 May '09

21 May '09

Author: cgutman Date: Thu May 21 04:54:10 2009 New Revision: 41024 URL: http://svn.reactos.org/svn/reactos?rev=41024&view=rev Log: - The slot number passed directly to NdisImmediateReadPciSlotInformation/NdisImmediateWritePciSlotInformation is ignored according to MSDN so store a valid slot number in the wrapper context to use instead Modified: trunk/reactos/drivers/network/ndis/include/miniport.h trunk/reactos/drivers/network/ndis/ndis/hardware.c trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/include/miniport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] Thu May 21 04:54:10 2009 @@ -80,6 +80,7 @@ HANDLE RegistryHandle; PDEVICE_OBJECT DeviceObject; ULONG BusNumber; + ULONG SlotNumber; } NDIS_WRAPPER_CONTEXT, *PNDIS_WRAPPER_CONTEXT; #define GET_MINIPORT_DRIVER(Handle)((PNDIS_M_DRIVER_BLOCK)Handle) Modified: trunk/reactos/drivers/network/ndis/ndis/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/hardware.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/hardware.c [iso-8859-1] Thu May 21 04:54:10 2009 @@ -28,8 +28,9 @@ IN ULONG Length) { PNDIS_WRAPPER_CONTEXT WrapperContext = (PNDIS_WRAPPER_CONTEXT)WrapperConfigurationContext; + /* Slot number is ignored. */ return HalGetBusDataByOffset(PCIConfiguration, WrapperContext->BusNumber, - SlotNumber, Buffer, Offset, Length); + WrapperContext->SlotNumber, Buffer, Offset, Length); } @@ -46,8 +47,9 @@ IN ULONG Length) { PNDIS_WRAPPER_CONTEXT WrapperContext = (PNDIS_WRAPPER_CONTEXT)WrapperConfigurationContext; + /* Slot number is ignored. */ return HalSetBusDataByOffset(PCIConfiguration, WrapperContext->BusNumber, - SlotNumber, Buffer, Offset, Length); + WrapperContext->SlotNumber, Buffer, Offset, Length); } Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Thu May 21 04:54:10 2009 @@ -1817,6 +1817,8 @@ Adapter->NdisMiniportBlock.SlotNumber = SlotNumber.u.AsULONG; } + WrapperContext.SlotNumber = Adapter->NdisMiniportBlock.SlotNumber; + NdisCloseConfiguration(ConfigHandle); /* Set handlers (some NDIS macros require these) */

1 0

[zguo] 41023: Add missing parameter to readme.
by zguo＠svn.reactos.org 20 May '09

20 May '09

Author: zguo Date: Thu May 21 00:03:53 2009 New Revision: 41023 URL: http://svn.reactos.org/svn/reactos?rev=41023&view=rev Log: Add missing parameter to readme. Modified: trunk/reactos/tools/cdmake/readme.txt Modified: trunk/reactos/tools/cdmake/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/readme.txt?re… ============================================================================== --- trunk/reactos/tools/cdmake/readme.txt [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/readme.txt [iso-8859-1] Thu May 21 00:03:53 2009 @@ -40,7 +40,7 @@ The utility is called up by a command line of the following form: - CDMAKE [-q] [-v] [-p] [-s N] [-m] [-b bootimage] source volume image + CDMAKE [-q] [-v] [-p] [-s N] [-m] [-j] [-b bootimage] source volume image source specifications of base directory containing all files to be written to CD-ROM image @@ -61,6 +61,8 @@ -m accept punctuation marks other than underscores in names and extensions + + -j generates Joliet filename records -b bootimage create bootable ElTorito CD-ROM using 'no emulation' mode

1 0

[cwittich] 41022: sync fusion with wine 1.1.21
by cwittich＠svn.reactos.org 20 May '09

20 May '09

Author: cwittich Date: Wed May 20 18:43:24 2009 New Revision: 41022 URL: http://svn.reactos.org/svn/reactos?rev=41022&view=rev Log: sync fusion with wine 1.1.21 Added: trunk/reactos/dll/win32/fusion/asmenum.c (with props) Modified: trunk/reactos/dll/win32/fusion/asmcache.c trunk/reactos/dll/win32/fusion/asmname.c trunk/reactos/dll/win32/fusion/assembly.c trunk/reactos/dll/win32/fusion/fusion.c trunk/reactos/dll/win32/fusion/fusion.rbuild trunk/reactos/dll/win32/fusion/fusionpriv.h Modified: trunk/reactos/dll/win32/fusion/asmcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmcache.… ============================================================================== --- trunk/reactos/dll/win32/fusion/asmcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/asmcache.c [iso-8859-1] Wed May 20 18:43:24 2009 @@ -41,24 +41,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(fusion); -static BOOL create_full_path(LPCSTR path) -{ - LPSTR new_path; +static BOOL create_full_path(LPCWSTR path) +{ + LPWSTR new_path; BOOL ret = TRUE; int len; - new_path = HeapAlloc(GetProcessHeap(), 0, lstrlenA(path) + 1); + new_path = HeapAlloc(GetProcessHeap(), 0, (strlenW(path) + 1) * sizeof(WCHAR)); if (!new_path) return FALSE; - lstrcpyA(new_path, path); - - while ((len = lstrlenA(new_path)) && new_path[len - 1] == '\\') + strcpyW(new_path, path); + + while ((len = strlenW(new_path)) && new_path[len - 1] == '\\') new_path[len - 1] = 0; - while (!CreateDirectoryA(new_path, NULL)) - { - LPSTR slash; + while (!CreateDirectoryW(new_path, NULL)) + { + LPWSTR slash; DWORD last_error = GetLastError(); if(last_error == ERROR_ALREADY_EXISTS) @@ -70,7 +70,7 @@ break; } - if(!(slash = strrchr(new_path, '\\'))) + if(!(slash = strrchrW(new_path, '\\'))) { ret = FALSE; break; @@ -91,6 +91,18 @@ return ret; } +static BOOL get_assembly_directory(LPWSTR dir, DWORD size) +{ + static const WCHAR gac[] = + {'\\','a','s','s','e','m','b','l','y','\\','G','A','C','_','M','S','I','L',0}; + + FIXME("Ignoring assembly architecture\n"); + + GetWindowsDirectoryW(dir, size); + strcatW(dir, gac); + return TRUE; +} + /* IAssemblyCache */ typedef struct { @@ -160,10 +172,48 @@ LPCWSTR pszAssemblyName, ASSEMBLY_INFO *pAsmInfo) { - FIXME("(%p, %d, %s, %p) stub!\n", iface, dwFlags, + IAssemblyName *asmname, *next = NULL; + IAssemblyEnum *asmenum = NULL; + HRESULT hr; + + TRACE("(%p, %d, %s, %p)\n", iface, dwFlags, debugstr_w(pszAssemblyName), pAsmInfo); - return E_NOTIMPL; + if (pAsmInfo) + { + if (pAsmInfo->cbAssemblyInfo == 0) + pAsmInfo->cbAssemblyInfo = sizeof(ASSEMBLY_INFO); + else if (pAsmInfo->cbAssemblyInfo != sizeof(ASSEMBLY_INFO)) + return E_INVALIDARG; + } + + hr = CreateAssemblyNameObject(&asmname, pszAssemblyName, + CANOF_PARSE_DISPLAY_NAME, NULL); + if (FAILED(hr)) + return hr; + + hr = CreateAssemblyEnum(&asmenum, NULL, asmname, ASM_CACHE_GAC, NULL); + if (FAILED(hr)) + goto done; + + hr = IAssemblyEnum_GetNextAssembly(asmenum, NULL, &next, 0); + if (hr == S_FALSE) + { + hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + goto done; + } + + if (!pAsmInfo) + goto done; + + pAsmInfo->dwAssemblyFlags = ASSEMBLYINFO_FLAG_INSTALLED; + +done: + IAssemblyName_Release(asmname); + if (next) IAssemblyName_Release(next); + if (asmenum) IAssemblyEnum_Release(asmenum); + + return hr; } static HRESULT WINAPI IAssemblyCacheImpl_CreateAssemblyCacheItem(IAssemblyCache *iface, @@ -190,14 +240,17 @@ LPCWSTR pszManifestFilePath, LPCFUSION_INSTALL_REFERENCE pRefData) { + static const WCHAR format[] = + {'%','s','\\','%','s','\\','%','s','_','_','%','s','\\',0}; + ASSEMBLY *assembly; - LPSTR filename; - LPSTR name = NULL; - LPSTR token = NULL; - LPSTR version = NULL; - LPSTR asmpath = NULL; - CHAR path[MAX_PATH]; - CHAR windir[MAX_PATH]; + LPWSTR filename; + LPWSTR name = NULL; + LPWSTR token = NULL; + LPWSTR version = NULL; + LPWSTR asmpath = NULL; + WCHAR path[MAX_PATH]; + WCHAR asmdir[MAX_PATH]; LPWSTR ext; HRESULT hr; @@ -238,12 +291,9 @@ if (FAILED(hr)) goto done; - GetWindowsDirectoryA(windir, MAX_PATH); - - FIXME("Ignoring assembly architecture!\n"); - - sprintf(path, "%s\\assembly\\GAC_MSIL\\%s\\%s__%s\\", windir, name, - version, token); + get_assembly_directory(asmdir, MAX_PATH); + + sprintfW(path, format, asmdir, name, version, token); create_full_path(path); @@ -251,10 +301,10 @@ if (FAILED(hr)) goto done; - filename = PathFindFileNameA(asmpath); - - lstrcatA(path, filename); - if (!CopyFileA(asmpath, path, FALSE)) + filename = PathFindFileNameW(asmpath); + + strcatW(path, filename); + if (!CopyFileW(asmpath, path, FALSE)) hr = HRESULT_FROM_WIN32(GetLastError()); done: @@ -391,86 +441,3 @@ IAssemblyCacheItemImpl_Commit, IAssemblyCacheItemImpl_AbortItem }; - -/* IAssemblyEnum */ - -typedef struct { - const IAssemblyEnumVtbl *lpIAssemblyEnumVtbl; - - LONG ref; -} IAssemblyEnumImpl; - -static HRESULT WINAPI IAssemblyEnumImpl_QueryInterface(IAssemblyEnum *iface, - REFIID riid, LPVOID *ppobj) -{ - IAssemblyEnumImpl *This = (IAssemblyEnumImpl *)iface; - - TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppobj); - - *ppobj = NULL; - - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IAssemblyEnum)) - { - IUnknown_AddRef(iface); - *ppobj = This; - return S_OK; - } - - WARN("(%p, %s, %p): not found\n", This, debugstr_guid(riid), ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI IAssemblyEnumImpl_AddRef(IAssemblyEnum *iface) -{ - IAssemblyEnumImpl *This = (IAssemblyEnumImpl *)iface; - ULONG refCount = InterlockedIncrement(&This->ref); - - TRACE("(%p)->(ref before = %u)\n", This, refCount - 1); - - return refCount; -} - -static ULONG WINAPI IAssemblyEnumImpl_Release(IAssemblyEnum *iface) -{ - IAssemblyEnumImpl *This = (IAssemblyEnumImpl *)iface; - ULONG refCount = InterlockedDecrement(&This->ref); - - TRACE("(%p)->(ref before = %u)\n", This, refCount + 1); - - if (!refCount) - HeapFree(GetProcessHeap(), 0, This); - - return refCount; -} - -static HRESULT WINAPI IAssemblyEnumImpl_GetNextAssembly(IAssemblyEnum *iface, - LPVOID pvReserved, - IAssemblyName **ppName, - DWORD dwFlags) -{ - FIXME("(%p, %p, %p, %d) stub!\n", iface, pvReserved, ppName, dwFlags); - return E_NOTIMPL; -} - -static HRESULT WINAPI IAssemblyEnumImpl_Reset(IAssemblyEnum *iface) -{ - FIXME("(%p) stub!\n", iface); - return E_NOTIMPL; -} - -static HRESULT WINAPI IAssemblyEnumImpl_Clone(IAssemblyEnum *iface, - IAssemblyEnum **ppEnum) -{ - FIXME("(%p, %p) stub!\n", iface, ppEnum); - return E_NOTIMPL; -} - -static const IAssemblyEnumVtbl AssemblyEnumVtbl = { - IAssemblyEnumImpl_QueryInterface, - IAssemblyEnumImpl_AddRef, - IAssemblyEnumImpl_Release, - IAssemblyEnumImpl_GetNextAssembly, - IAssemblyEnumImpl_Reset, - IAssemblyEnumImpl_Clone -}; Added: trunk/reactos/dll/win32/fusion/asmenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmenum.c… ============================================================================== --- trunk/reactos/dll/win32/fusion/asmenum.c (added) +++ trunk/reactos/dll/win32/fusion/asmenum.c [iso-8859-1] Wed May 20 18:43:24 2009 @@ -1,0 +1,443 @@ +/* + * IAssemblyEnum implementation + * + * Copyright 2008 James Hawkins + * + * 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 + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "guiddef.h" +#include "fusion.h" +#include "corerror.h" +#include "fusionpriv.h" + +#include "wine/debug.h" +#include "wine/unicode.h" +#include "wine/list.h" + +WINE_DEFAULT_DEBUG_CHANNEL(fusion); + +typedef struct _tagASMNAME +{ + struct list entry; + IAssemblyName *name; +} ASMNAME; + +typedef struct +{ + const IAssemblyEnumVtbl *lpIAssemblyEnumVtbl; + + struct list assemblies; + struct list *iter; + LONG ref; +} IAssemblyEnumImpl; + +static HRESULT WINAPI IAssemblyEnumImpl_QueryInterface(IAssemblyEnum *iface, + REFIID riid, LPVOID *ppobj) +{ + IAssemblyEnumImpl *This = (IAssemblyEnumImpl *)iface; + + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppobj); + + *ppobj = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IAssemblyEnum)) + { + IUnknown_AddRef(iface); + *ppobj = This; + return S_OK; + } + + WARN("(%p, %s, %p): not found\n", This, debugstr_guid(riid), ppobj); + return E_NOINTERFACE; +} + +static ULONG WINAPI IAssemblyEnumImpl_AddRef(IAssemblyEnum *iface) +{ + IAssemblyEnumImpl *This = (IAssemblyEnumImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(ref before = %u)\n", This, refCount - 1); + + return refCount; +} + +static ULONG WINAPI IAssemblyEnumImpl_Release(IAssemblyEnum *iface) +{ + IAssemblyEnumImpl *This = (IAssemblyEnumImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + struct list *item, *cursor; + + TRACE("(%p)->(ref before = %u)\n", This, refCount + 1); + + if (!refCount) + { + LIST_FOR_EACH_SAFE(item, cursor, &This->assemblies) + { + ASMNAME *asmname = LIST_ENTRY(item, ASMNAME, entry); + + list_remove(&asmname->entry); + IAssemblyName_Release(asmname->name); + HeapFree(GetProcessHeap(), 0, asmname); + } + + HeapFree(GetProcessHeap(), 0, This); + } + + return refCount; +} + +static HRESULT WINAPI IAssemblyEnumImpl_GetNextAssembly(IAssemblyEnum *iface, + LPVOID pvReserved, + IAssemblyName **ppName, + DWORD dwFlags) +{ + IAssemblyEnumImpl *asmenum = (IAssemblyEnumImpl *)iface; + ASMNAME *asmname; + + TRACE("(%p, %p, %p, %d)\n", iface, pvReserved, ppName, dwFlags); + + if (!ppName) + return E_INVALIDARG; + + asmname = LIST_ENTRY(asmenum->iter, ASMNAME, entry); + if (!asmname) + return S_FALSE; + + *ppName = asmname->name; + IAssemblyName_AddRef(*ppName); + + asmenum->iter = list_next(&asmenum->assemblies, asmenum->iter); + + return S_OK; +} + +static HRESULT WINAPI IAssemblyEnumImpl_Reset(IAssemblyEnum *iface) +{ + IAssemblyEnumImpl *asmenum = (IAssemblyEnumImpl *)iface; + + TRACE("(%p)\n", iface); + + asmenum->iter = list_head(&asmenum->assemblies); + return S_OK; +} + +static HRESULT WINAPI IAssemblyEnumImpl_Clone(IAssemblyEnum *iface, + IAssemblyEnum **ppEnum) +{ + FIXME("(%p, %p) stub!\n", iface, ppEnum); + return E_NOTIMPL; +} + +static const IAssemblyEnumVtbl AssemblyEnumVtbl = { + IAssemblyEnumImpl_QueryInterface, + IAssemblyEnumImpl_AddRef, + IAssemblyEnumImpl_Release, + IAssemblyEnumImpl_GetNextAssembly, + IAssemblyEnumImpl_Reset, + IAssemblyEnumImpl_Clone +}; + +static void parse_name(IAssemblyName *name, int depth, LPWSTR path, LPWSTR buf) +{ + WCHAR disp[MAX_PATH]; + LPCWSTR verptr, pubkeyptr; + HRESULT hr; + DWORD size, major_size, minor_size, build_size, revision_size; + WORD major, minor, build, revision; + + static const WCHAR star[] = {'*',0}; + static const WCHAR ss_fmt[] = {'%','s','\\','%','s',0}; + static const WCHAR verpubkey[] = {'%','s','\\','%','s','_','_','%','s',0}; + static const WCHAR ver_fmt[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; + + WCHAR version[24]; /* strlen("65535") * 4 + 3 + 1 */ + WCHAR token_str[TOKEN_LENGTH + 1]; + BYTE token[BYTES_PER_TOKEN]; + + if (depth == 0) + { + size = MAX_PATH; + *disp = '\0'; + hr = IAssemblyName_GetName(name, &size, disp); + if (SUCCEEDED(hr)) + sprintfW(buf, ss_fmt, path, disp); + else + sprintfW(buf, ss_fmt, path, star); + } + else if (depth == 1) + { + major_size = sizeof(major); + IAssemblyName_GetProperty(name, ASM_NAME_MAJOR_VERSION, &major, &major_size); + + minor_size = sizeof(minor); + IAssemblyName_GetProperty(name, ASM_NAME_MINOR_VERSION, &minor, &minor_size); + + build_size = sizeof(build); + IAssemblyName_GetProperty(name, ASM_NAME_BUILD_NUMBER, &build, &build_size); + + revision_size = sizeof(revision); + IAssemblyName_GetProperty(name, ASM_NAME_REVISION_NUMBER, &revision, &revision_size); + + if (!major_size || !minor_size || !build_size || !revision_size) verptr = star; + else + { + sprintfW(version, ver_fmt, major, minor, build, revision); + verptr = version; + } + + size = sizeof(token); + IAssemblyName_GetProperty(name, ASM_NAME_PUBLIC_KEY_TOKEN, token, &size); + + if (!size) pubkeyptr = star; + else + { + token_to_str(token, token_str); + pubkeyptr = token_str; + } + + sprintfW(buf, verpubkey, path, verptr, pubkeyptr); + } +} + +static int compare_assembly_names(ASMNAME *asmname1, ASMNAME *asmname2) +{ + int ret; + WORD version1, version2; + WCHAR name1[MAX_PATH], name2[MAX_PATH]; + WCHAR token_str1[TOKEN_LENGTH + 1], token_str2[TOKEN_LENGTH + 1]; + BYTE token1[BYTES_PER_TOKEN], token2[BYTES_PER_TOKEN]; + DWORD size, i; + + size = sizeof(name1); + IAssemblyName_GetProperty(asmname1->name, ASM_NAME_NAME, &name1, &size); + size = sizeof(name2); + IAssemblyName_GetProperty(asmname2->name, ASM_NAME_NAME, &name2, &size); + + if ((ret = strcmpiW(name1, name2))) return ret; + + for (i = ASM_NAME_MAJOR_VERSION; i < ASM_NAME_CULTURE; i++) + { + size = sizeof(version1); + IAssemblyName_GetProperty(asmname1->name, i, &version1, &size); + size = sizeof(version2); + IAssemblyName_GetProperty(asmname2->name, i, &version2, &size); + + if (version1 < version2) return -1; + if (version1 > version2) return 1; + } + + /* FIXME: compare cultures */ + + size = sizeof(token1); + IAssemblyName_GetProperty(asmname1->name, ASM_NAME_PUBLIC_KEY_TOKEN, token1, &size); + size = sizeof(token2); + IAssemblyName_GetProperty(asmname2->name, ASM_NAME_PUBLIC_KEY_TOKEN, token2, &size); + + token_to_str(token1, token_str1); + token_to_str(token2, token_str2); + + if ((ret = strcmpiW(token_str1, token_str2))) return ret; + + return 0; +} + +/* insert assembly in list preserving sort order */ +static void insert_assembly(struct list *assemblies, ASMNAME *to_insert) +{ + struct list *item; + + LIST_FOR_EACH(item, assemblies) + { + ASMNAME *name = LIST_ENTRY(item, ASMNAME, entry); + + if (compare_assembly_names(name, to_insert) > 0) + { + list_add_before(&name->entry, &to_insert->entry); + return; + } + } + list_add_tail(assemblies, &to_insert->entry); +} + +static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, + int depth, LPWSTR path) +{ + WIN32_FIND_DATAW ffd; + WCHAR buf[MAX_PATH]; + WCHAR disp[MAX_PATH]; + ASMNAME *asmname; + HANDLE hfind; + LPWSTR ptr; + HRESULT hr = S_OK; + + static WCHAR parent[MAX_PATH]; + + static const WCHAR dot[] = {'.',0}; + static const WCHAR dotdot[] = {'.','.',0}; + static const WCHAR search_fmt[] = {'%','s','\\','*',0}; + static const WCHAR parent_fmt[] = {'%','s',',',' ',0}; + static const WCHAR dblunder[] = {'_','_',0}; + static const WCHAR fmt[] = {'V','e','r','s','i','o','n','=','%','s',',',' ', + 'C','u','l','t','u','r','e','=','n','e','u','t','r','a','l',',',' ', + 'P','u','b','l','i','c','K','e','y','T','o','k','e','n','=','%','s',0}; + static const WCHAR ss_fmt[] = {'%','s','\\','%','s',0}; + + if (name) + parse_name(name, depth, path, buf); + else + sprintfW(buf, search_fmt, path); + + hfind = FindFirstFileW(buf, &ffd); + if (hfind == INVALID_HANDLE_VALUE) + return S_OK; + + do + { + if (!lstrcmpW(ffd.cFileName, dot) || !lstrcmpW(ffd.cFileName, dotdot)) + continue; + + if (depth == 0) + { + if (name) + ptr = strrchrW(buf, '\\') + 1; + else + ptr = ffd.cFileName; + + sprintfW(parent, parent_fmt, ptr); + } + else if (depth == 1) + { + ptr = strstrW(ffd.cFileName, dblunder); + *ptr = '\0'; + ptr += 2; + sprintfW(buf, fmt, ffd.cFileName, ptr); + + lstrcpyW(disp, parent); + lstrcatW(disp, buf); + + asmname = HeapAlloc(GetProcessHeap(), 0, sizeof(ASMNAME)); + if (!asmname) + { + hr = E_OUTOFMEMORY; + break; + } + + hr = CreateAssemblyNameObject(&asmname->name, disp, + CANOF_PARSE_DISPLAY_NAME, NULL); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, asmname); + break; + } + + insert_assembly(assemblies, asmname); + continue; + } + + sprintfW(buf, ss_fmt, path, ffd.cFileName); + hr = enum_gac_assemblies(assemblies, name, depth + 1, buf); + if (FAILED(hr)) + break; + } while (FindNextFileW(hfind, &ffd) != 0); + + FindClose(hfind); + return hr; +} + +static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) +{ + WCHAR path[MAX_PATH]; + WCHAR buf[MAX_PATH]; + HRESULT hr; + DWORD size; + + static WCHAR under32[] = {'_','3','2',0}; + static WCHAR msil[] = {'_','M','S','I','L',0}; + + size = MAX_PATH; + hr = GetCachePath(ASM_CACHE_GAC, buf, &size); + if (FAILED(hr)) + return hr; + + lstrcpyW(path, buf); + lstrcatW(path, under32); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); + if (FAILED(hr)) + return hr; + + lstrcpyW(path, buf); + lstrcatW(path, msil); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); + if (FAILED(hr)) + return hr; + + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, buf); + if (FAILED(hr)) + return hr; + + return S_OK; +} + +/****************************************************************** + * CreateAssemblyEnum (FUSION.@) + */ +HRESULT WINAPI CreateAssemblyEnum(IAssemblyEnum **pEnum, IUnknown *pUnkReserved, + IAssemblyName *pName, DWORD dwFlags, LPVOID pvReserved) +{ + IAssemblyEnumImpl *asmenum; + HRESULT hr; + + TRACE("(%p, %p, %p, %08x, %p)\n", pEnum, pUnkReserved, + pName, dwFlags, pvReserved); + + if (!pEnum) + return E_INVALIDARG; + + if (dwFlags == 0 || dwFlags == ASM_CACHE_ROOT) + return E_INVALIDARG; + + asmenum = HeapAlloc(GetProcessHeap(), 0, sizeof(IAssemblyEnumImpl)); + if (!asmenum) + return E_OUTOFMEMORY; + + asmenum->lpIAssemblyEnumVtbl = &AssemblyEnumVtbl; + asmenum->ref = 1; + list_init(&asmenum->assemblies); + + if (dwFlags & ASM_CACHE_GAC) + { + hr = enumerate_gac(asmenum, pName); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, asmenum); + return hr; + } + } + + asmenum->iter = list_head(&asmenum->assemblies); + *pEnum = (IAssemblyEnum *)asmenum; + + return S_OK; +} Propchange: trunk/reactos/dll/win32/fusion/asmenum.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/fusion/asmname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmname.c… ============================================================================== --- trunk/reactos/dll/win32/fusion/asmname.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/asmname.c [iso-8859-1] Wed May 20 18:43:24 2009 @@ -33,22 +33,9 @@ #include "wine/debug.h" #include "wine/unicode.h" +#include "fusionpriv.h" WINE_DEFAULT_DEBUG_CHANNEL(fusion); - -static inline LPWSTR strdupW(LPCWSTR src) -{ - LPWSTR dest; - - if (!src) - return NULL; - - dest = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(src) + 1) * sizeof(WCHAR)); - if (dest) - lstrcpyW(dest, src); - - return dest; -} typedef struct { const IAssemblyNameVtbl *lpIAssemblyNameVtbl; @@ -57,7 +44,7 @@ LPWSTR name; LPWSTR culture; - BYTE version[4]; + WORD version[4]; DWORD versize; BYTE pubkey[8]; @@ -157,28 +144,28 @@ case ASM_NAME_MAJOR_VERSION: *pcbProperty = 0; - *((LPDWORD)pvProperty) = name->version[0]; + *((WORD *)pvProperty) = name->version[0]; if (name->versize >= 1) *pcbProperty = sizeof(WORD); break; case ASM_NAME_MINOR_VERSION: *pcbProperty = 0; - *((LPDWORD)pvProperty) = name->version[1]; + *((WORD *)pvProperty) = name->version[1]; if (name->versize >= 2) *pcbProperty = sizeof(WORD); break; case ASM_NAME_BUILD_NUMBER: *pcbProperty = 0; - *((LPDWORD)pvProperty) = name->version[2]; + *((WORD *)pvProperty) = name->version[2]; if (name->versize >= 3) *pcbProperty = sizeof(WORD); break; case ASM_NAME_REVISION_NUMBER: *pcbProperty = 0; - *((LPDWORD)pvProperty) = name->version[3]; + *((WORD *)pvProperty) = name->version[3]; if (name->versize >= 4) *pcbProperty = sizeof(WORD); break; @@ -222,7 +209,7 @@ { IAssemblyNameImpl *name = (IAssemblyNameImpl *)iface; - TRACE("(%p, %s, %p, %d)\n", iface, debugstr_w(szDisplayName), + TRACE("(%p, %p, %p, %d)\n", iface, szDisplayName, pccDisplayName, dwDisplayFlags); if (!name->displayname || !*name->displayname) @@ -467,6 +454,8 @@ *ptr2 = '\0'; + while (*str == ' ') str++; + if (!lstrcmpW(str, version)) hr = parse_version(name, ptr); else if (!lstrcmpW(str, culture)) Modified: trunk/reactos/dll/win32/fusion/assembly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/assembly.… ============================================================================== --- trunk/reactos/dll/win32/fusion/assembly.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/assembly.c [iso-8859-1] Wed May 20 18:43:24 2009 @@ -52,7 +52,7 @@ struct tagASSEMBLY { - LPSTR path; + LPWSTR path; HANDLE hfile; HANDLE hmap; @@ -75,22 +75,6 @@ BYTE *strings; BYTE *blobs; }; - -static LPSTR strdupWtoA(LPCWSTR str) -{ - LPSTR ret = NULL; - DWORD len; - - if (!str) - return ret; - - len = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); - ret = HeapAlloc(GetProcessHeap(), 0, len); - if (ret) - WideCharToMultiByte(CP_ACP, 0, str, -1, ret, len, NULL, NULL); - - return ret; -} static DWORD rva_to_offset(IMAGE_NT_HEADERS *nthdrs, DWORD rva) { @@ -647,14 +631,18 @@ if (!assembly->nthdr) return E_FAIL; - if (assembly->nthdr->FileHeader.Machine == IMAGE_FILE_MACHINE_AMD64) + if (assembly->nthdr->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) { IMAGE_OPTIONAL_HEADER64 *opthdr = (IMAGE_OPTIONAL_HEADER64 *)&assembly->nthdr->OptionalHeader; datadirs = opthdr->DataDirectory; } else - datadirs = assembly->nthdr->OptionalHeader.DataDirectory; + { + IMAGE_OPTIONAL_HEADER32 *opthdr = + (IMAGE_OPTIONAL_HEADER32 *)&assembly->nthdr->OptionalHeader; + datadirs = opthdr->DataDirectory; + } if (!datadirs) return E_FAIL; @@ -684,7 +672,7 @@ if (!assembly) return E_OUTOFMEMORY; - assembly->path = strdupWtoA(file); + assembly->path = strdupW(file); if (!assembly->path) { hr = E_OUTOFMEMORY; @@ -743,16 +731,21 @@ return S_OK; } -static LPSTR assembly_dup_str(ASSEMBLY *assembly, DWORD index) -{ +static LPWSTR assembly_dup_str(ASSEMBLY *assembly, DWORD index) +{ + int len; + LPWSTR cpy; LPSTR str = (LPSTR)&assembly->strings[index]; - LPSTR cpy = HeapAlloc(GetProcessHeap(), 0, strlen(str)+1); - if (cpy) - strcpy(cpy, str); + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + + if ((cpy = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) + MultiByteToWideChar(CP_ACP, 0, str, -1, cpy, len); + return cpy; } -HRESULT assembly_get_name(ASSEMBLY *assembly, LPSTR *name) +HRESULT assembly_get_name(ASSEMBLY *assembly, LPWSTR *name) { BYTE *ptr; LONG offset; @@ -779,59 +772,43 @@ return S_OK; } -HRESULT assembly_get_path(ASSEMBLY *assembly, LPSTR *path) -{ - LPSTR cpy = HeapAlloc(GetProcessHeap(), 0, strlen(assembly->path)+1); +HRESULT assembly_get_path(ASSEMBLY *assembly, LPWSTR *path) +{ + LPWSTR cpy = HeapAlloc(GetProcessHeap(), 0, (strlenW(assembly->path) + 1) * sizeof(WCHAR)); *path = cpy; if (cpy) - strcpy(cpy, assembly->path); + strcpyW(cpy, assembly->path); else return E_OUTOFMEMORY; return S_OK; } -HRESULT assembly_get_version(ASSEMBLY *assembly, LPSTR *version) -{ - LPSTR verdata; - VS_FIXEDFILEINFO *ffi; - HRESULT hr = S_OK; - DWORD size; - - size = GetFileVersionInfoSizeA(assembly->path, NULL); - if (!size) - return HRESULT_FROM_WIN32(GetLastError()); - - verdata = HeapAlloc(GetProcessHeap(), 0, size); - if (!verdata) +HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version) +{ + static const WCHAR format[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; + + ASSEMBLYTABLE *asmtbl; + LONG offset; + + *version = NULL; + + offset = assembly->tables[TableFromToken(mdtAssembly)].offset; + if (offset == -1) + return E_FAIL; + + asmtbl = assembly_data_offset(assembly, offset); + if (!asmtbl) + return E_FAIL; + + *version = HeapAlloc(GetProcessHeap(), 0, sizeof(format) + 4 * strlen("65535") * sizeof(WCHAR)); + if (!*version) return E_OUTOFMEMORY; - if (!GetFileVersionInfoA(assembly->path, 0, size, verdata)) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto done; - } - - if (!VerQueryValueA(verdata, "\\", (LPVOID *)&ffi, &size)) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto done; - } - - *version = HeapAlloc(GetProcessHeap(), 0, MAX_PATH); - if (!*version) - { - hr = E_OUTOFMEMORY; - goto done; - } - - sprintf(*version, "%d.%d.%d.%d", HIWORD(ffi->dwFileVersionMS), - LOWORD(ffi->dwFileVersionMS), HIWORD(ffi->dwFileVersionLS), - LOWORD(ffi->dwFileVersionLS)); - -done: - HeapFree(GetProcessHeap(), 0, verdata); - return hr; + sprintfW(*version, format, asmtbl->MajorVersion, asmtbl->MinorVersion, + asmtbl->BuildNumber, asmtbl->RevisionNumber); + + return S_OK; } HRESULT assembly_get_architecture(ASSEMBLY *assembly, DWORD fixme) @@ -845,26 +822,7 @@ return GetData(&assembly->blobs[index], size); } -static void bytes_to_str(BYTE *bytes, DWORD len, LPSTR str) -{ - DWORD i; - - static const char hexval[16] = { - '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f' - }; - - for(i = 0; i < len; i++) - { - str[i * 2] = hexval[((bytes[i] >> 4) & 0xF)]; - str[i * 2 + 1] = hexval[(bytes[i]) & 0x0F]; - } -} - -#define BYTES_PER_TOKEN 8 -#define CHARS_PER_BYTE 2 -#define TOKEN_LENGTH (BYTES_PER_TOKEN * CHARS_PER_BYTE + 1) - -HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPSTR *token) +HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) { ASSEMBLYTABLE *asmtbl; ULONG i, size; @@ -875,7 +833,7 @@ BYTE *pubkey; BYTE tokbytes[BYTES_PER_TOKEN]; HRESULT hr = E_FAIL; - LPSTR tok; + LPWSTR tok; *token = NULL; @@ -916,15 +874,14 @@ for (i = size - 1; i >= size - 8; i--) tokbytes[size - i - 1] = hashdata[i]; - tok = HeapAlloc(GetProcessHeap(), 0, TOKEN_LENGTH); + tok = HeapAlloc(GetProcessHeap(), 0, (TOKEN_LENGTH + 1) * sizeof(WCHAR)); if (!tok) { hr = E_OUTOFMEMORY; goto done; } - bytes_to_str(tokbytes, BYTES_PER_TOKEN, tok); - tok[TOKEN_LENGTH - 1] = '\0'; + token_to_str(tokbytes, tok); *token = tok; hr = S_OK; Modified: trunk/reactos/dll/win32/fusion/fusion.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusion.c?… ============================================================================== --- trunk/reactos/dll/win32/fusion/fusion.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/fusion.c [iso-8859-1] Wed May 20 18:43:24 2009 @@ -50,18 +50,6 @@ { FIXME("(%s, %d, %s, %d, %p, %p) stub!\n", debugstr_w(pwzAssemblyIdentity1), fUnified1, debugstr_w(pwzAssemblyIdentity2), fUnified2, pfEquivalent, pResult); - - return E_NOTIMPL; -} - -/****************************************************************** - * CreateAssemblyEnum (FUSION.@) - */ -HRESULT WINAPI CreateAssemblyEnum(IAssemblyEnum **pEnum, IUnknown *pUnkReserved, - IAssemblyName *pName, DWORD dwFlags, LPVOID pvReserved) -{ - FIXME("(%p, %p, %p, %08x, %p) stub!\n", pEnum, pUnkReserved, - pName, dwFlags, pvReserved); return E_NOTIMPL; } @@ -129,8 +117,11 @@ static const WCHAR gac[] = {'G','A','C',0}; static const WCHAR nativeimg[] = { 'N','a','t','i','v','e','I','m','a','g','e','s','_',0}; - static const WCHAR zapfmt[] = { - '%','s','\\','%','s','\\','%','s','%','s','_','3','2',0}; +#ifdef _WIN64 + static const WCHAR zapfmt[] = {'%','s','\\','%','s','\\','%','s','%','s','_','6','4',0}; +#else + static const WCHAR zapfmt[] = {'%','s','\\','%','s','\\','%','s','%','s','_','3','2',0}; +#endif TRACE("(%08x, %p, %p)\n", dwCacheFlags, pwzCachePath, pcchPath); Modified: trunk/reactos/dll/win32/fusion/fusion.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusion.rb… ============================================================================== --- trunk/reactos/dll/win32/fusion/fusion.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/fusion.rbuild [iso-8859-1] Wed May 20 18:43:24 2009 @@ -10,6 +10,7 @@ <library>advapi32</library> <library>dbghelp</library> <file>asmcache.c</file> + <file>asmenum.c</file> <file>asmname.c</file> <file>assembly.c</file> <file>fusion.c</file> Modified: trunk/reactos/dll/win32/fusion/fusionpriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusionpri… ============================================================================== --- trunk/reactos/dll/win32/fusion/fusionpriv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/fusionpriv.h [iso-8859-1] Wed May 20 18:43:24 2009 @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" +#include "winver.h" #include <pshpack1.h> @@ -429,10 +430,44 @@ HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file); HRESULT assembly_release(ASSEMBLY *assembly); -HRESULT assembly_get_name(ASSEMBLY *assembly, LPSTR *name); -HRESULT assembly_get_path(ASSEMBLY *assembly, LPSTR *path); -HRESULT assembly_get_version(ASSEMBLY *assembly, LPSTR *version); +HRESULT assembly_get_name(ASSEMBLY *assembly, LPWSTR *name); +HRESULT assembly_get_path(ASSEMBLY *assembly, LPWSTR *path); +HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version); HRESULT assembly_get_architecture(ASSEMBLY *assembly, DWORD fixme); -HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPSTR *token); +HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token); + +static inline LPWSTR strdupW(LPCWSTR src) +{ + LPWSTR dest; + + if (!src) + return NULL; + + dest = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(src) + 1) * sizeof(WCHAR)); + if (dest) + lstrcpyW(dest, src); + + return dest; +} + +#define BYTES_PER_TOKEN 8 +#define CHARS_PER_BYTE 2 +#define TOKEN_LENGTH (BYTES_PER_TOKEN * CHARS_PER_BYTE + 1) + +static inline void token_to_str(BYTE *bytes, LPWSTR str) +{ + DWORD i; + + static const WCHAR hexval[16] = { + '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f' + }; + + for(i = 0; i < BYTES_PER_TOKEN; i++) + { + str[i * 2] = hexval[((bytes[i] >> 4) & 0xF)]; + str[i * 2 + 1] = hexval[(bytes[i]) & 0x0F]; + } + str[i * 2] = 0; +} #endif /* __WINE_FUSION_PRIVATE__ */

1 0

[cwittich] 41021: sync wintrust with wine 1.1.21
by cwittich＠svn.reactos.org 20 May '09

20 May '09

Author: cwittich Date: Wed May 20 18:35:44 2009 New Revision: 41021 URL: http://svn.reactos.org/svn/reactos?rev=41021&view=rev Log: sync wintrust with wine 1.1.21 Modified: trunk/reactos/dll/win32/wintrust/asn.c trunk/reactos/dll/win32/wintrust/wintrust_main.c trunk/reactos/dll/win32/wintrust/wintrust_priv.h Modified: trunk/reactos/dll/win32/wintrust/asn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/asn.c?r… ============================================================================== --- trunk/reactos/dll/win32/wintrust/asn.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/asn.c [iso-8859-1] Wed May 20 18:35:44 2009 @@ -969,7 +969,7 @@ return ret; } -BOOL WINAPI CRYPT_AsnEncodeInt(DWORD dwCertEncodingType, +static BOOL WINAPI CRYPT_AsnEncodeInt(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded, DWORD *pcbEncoded) { Modified: trunk/reactos/dll/win32/wintrust/wintrust_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… ============================================================================== --- trunk/reactos/dll/win32/wintrust/wintrust_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/wintrust_main.c [iso-8859-1] Wed May 20 18:35:44 2009 @@ -40,6 +40,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(wintrust); + +/* Utility functions */ +void * WINAPI WINTRUST_Alloc(DWORD cb) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cb); +} + +static void* WINTRUST_ReAlloc(void *ptr, DWORD cb) __WINE_ALLOC_SIZE(2); +static void* WINTRUST_ReAlloc(void *ptr, DWORD cb) +{ + return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ptr, cb); +} + +void WINAPI WINTRUST_Free(void *p) +{ + HeapFree(GetProcessHeap(), 0, p); +} /*********************************************************************** * DllMain (WINTRUST.@) @@ -888,20 +905,6 @@ } /* Utility functions */ -void * WINAPI WINTRUST_Alloc(DWORD cb) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cb); -} - -void * WINAPI WINTRUST_ReAlloc(void *ptr, DWORD cb) -{ - return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ptr, cb); -} - -void WINAPI WINTRUST_Free(void *p) -{ - HeapFree(GetProcessHeap(), 0, p); -} BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store) { Modified: trunk/reactos/dll/win32/wintrust/wintrust_priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… ============================================================================== --- trunk/reactos/dll/win32/wintrust/wintrust_priv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/wintrust_priv.h [iso-8859-1] Wed May 20 18:35:44 2009 @@ -19,7 +19,6 @@ #define __WINTRUST_PRIV_H__ void * WINAPI WINTRUST_Alloc(DWORD cb) __WINE_ALLOC_SIZE(1); -void * WINAPI WINTRUST_ReAlloc(void *ptr, DWORD cb) __WINE_ALLOC_SIZE(2); void WINAPI WINTRUST_Free(void *p); BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store); BOOL WINAPI WINTRUST_AddSgnr(CRYPT_PROVIDER_DATA *data,

1 0

[cwittich] 41020: add a parameter check to GetAdaptersAddresses stub (fixes a winetest)
by cwittich＠svn.reactos.org 20 May '09

20 May '09

Author: cwittich Date: Wed May 20 18:23:16 2009 New Revision: 41020 URL: http://svn.reactos.org/svn/reactos?rev=41020&view=rev Log: add a parameter check to GetAdaptersAddresses stub (fixes a winetest) Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Wed May 20 18:23:16 2009 @@ -2178,6 +2178,8 @@ */ DWORD WINAPI GetAdaptersAddresses(ULONG Family,ULONG Flags,PVOID Reserved,PIP_ADAPTER_ADDRESSES pAdapterAddresses,PULONG pOutBufLen) { + if (!pOutBufLen) return ERROR_INVALID_PARAMETER; + FIXME(":stub\n"); return 0L; }

1 0

[cwittich] 41019: sync jscript with wine 1.1.21
by cwittich＠svn.reactos.org 20 May '09

20 May '09

Author: cwittich Date: Wed May 20 17:12:23 2009 New Revision: 41019 URL: http://svn.reactos.org/svn/reactos?rev=41019&view=rev Log: sync jscript with wine 1.1.21 Modified: trunk/reactos/dll/win32/jscript/engine.h trunk/reactos/dll/win32/jscript/global.c trunk/reactos/dll/win32/jscript/jscript.c trunk/reactos/dll/win32/jscript/lex.c trunk/reactos/dll/win32/jscript/math.c trunk/reactos/dll/win32/jscript/parser.tab.c trunk/reactos/dll/win32/jscript/parser.tab.h trunk/reactos/dll/win32/jscript/parser.y trunk/reactos/dll/win32/jscript/regexp.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/jscript/engine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/engine.h… Modified: trunk/reactos/dll/win32/jscript/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/global.c… Modified: trunk/reactos/dll/win32/jscript/jscript.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.… Modified: trunk/reactos/dll/win32/jscript/lex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lex.c?re… Modified: trunk/reactos/dll/win32/jscript/math.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/math.c?r… Modified: trunk/reactos/dll/win32/jscript/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/parser.t… Modified: trunk/reactos/dll/win32/jscript/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/parser.t… Modified: trunk/reactos/dll/win32/jscript/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/parser.y… Modified: trunk/reactos/dll/win32/jscript/regexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/regexp.c…

1 0

[mjmartin] 41018: - eventlog.h: Add CurrentRecord to EventSource struct as each EventLog handle must keep track of current record. - LogfInitializeNew/LogfInitializeExisting: Set LogFile MaxSize to just under 5k and add a FIXME to read value from registry. TODO. - LogfReadEvent: Change return value to DWORD so that errors can be passed back and last error can be set from caller(advapi32). Change RecordNumber parameter to pointer so that it can be returned and saved in rpc's handle for the EventL
by mjmartin＠svn.reactos.org 20 May '09

20 May '09

Author: mjmartin Date: Wed May 20 17:07:19 2009 New Revision: 41018 URL: http://svn.reactos.org/svn/reactos?rev=41018&view=rev Log: - eventlog.h: Add CurrentRecord to EventSource struct as each EventLog handle must keep track of current record. - LogfInitializeNew/LogfInitializeExisting: Set LogFile MaxSize to just under 5k and add a FIXME to read value from registry. TODO. - LogfReadEvent: Change return value to DWORD so that errors can be passed back and last error can be set from caller(advapi32). Change RecordNumber parameter to pointer so that it can be returned and saved in rpc's handle for the EventLog. RecordNumber of 0 can only be used with flag EVENTLOG_SEQUENTIAL READ. Set BytesRead and BytesNeeded to 0 as caller expects those values for any failure. - LogfWriteData: Implement record overwriting when the LogFile has reached MaxSize. - Implement LogfGetCurrentRecord. - Code not active yet, will be with upcoming changes to base\services\eventlog\rpc.c. Modified: trunk/reactos/base/services/eventlog/eventlog.h trunk/reactos/base/services/eventlog/file.c Modified: trunk/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] Wed May 20 17:07:19 2009 @@ -94,6 +94,7 @@ typedef struct { PLOGFILE LogFile; + ULONG CurrentRecord; WCHAR *Name; } EVENTSOURCE, *PEVENTSOURCE; @@ -114,9 +115,9 @@ VOID LogfListRemoveItem(PLOGFILE Item); -BOOL LogfReadEvent(PLOGFILE LogFile, +DWORD LogfReadEvent(PLOGFILE LogFile, DWORD Flags, - DWORD RecordNumber, + DWORD * RecordNumber, DWORD BufSize, PBYTE Buffer, DWORD * BytesRead, @@ -138,6 +139,8 @@ BOOL LogfInitializeExisting(PLOGFILE LogFile); DWORD LogfGetOldestRecord(PLOGFILE LogFile); + +DWORD LogfGetCurrentRecord(PLOGFILE LogFile); ULONG LogfOffsetByNumber(PLOGFILE LogFile, DWORD RecordNumber); Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Wed May 20 17:07:19 2009 @@ -33,7 +33,9 @@ LogFile->Header.MajorVersion = MAJORVER; LogFile->Header.MinorVersion = MINORVER; LogFile->Header.CurrentRecordNumber = 1; - + /* FIXME: Read MaxSize from registry for this LogFile. + But for now limit EventLog size to just under 5K. */ + LogFile->Header.MaxSize = 5000; LogFile->Header.Signature = LOGFILE_SIGNATURE; if (!WriteFile(LogFile->hFile, &LogFile->Header, @@ -227,6 +229,10 @@ LogFile->Header.CurrentRecordNumber = dwRecordsNumber + 1; LogFile->Header.OldestRecordNumber = dwRecordsNumber ? 1 : 0; // FIXME + /* FIXME: Read MaxSize from registry for this LogFile. + But for now limit EventLog size to just under 5K. */ + LogFile->Header.MaxSize = 5000; + if (!SetFilePointer(LogFile->hFile, 0, NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER) { @@ -509,9 +515,9 @@ LeaveCriticalSection(&LogFileListCs); } -BOOL LogfReadEvent(PLOGFILE LogFile, +DWORD LogfReadEvent(PLOGFILE LogFile, DWORD Flags, - DWORD RecordNumber, + DWORD * RecordNumber, DWORD BufSize, PBYTE Buffer, DWORD * BytesRead, @@ -521,46 +527,51 @@ DWORD dwBufferUsage = 0, dwRecNum; if (Flags & EVENTLOG_FORWARDS_READ && Flags & EVENTLOG_BACKWARDS_READ) - return FALSE; + return ERROR_INVALID_PARAMETER; if (!(Flags & EVENTLOG_FORWARDS_READ) && !(Flags & EVENTLOG_BACKWARDS_READ)) - return FALSE; + return ERROR_INVALID_PARAMETER; if (!Buffer || !BytesRead || !BytesNeeded) - return FALSE; - - dwRecNum = RecordNumber; + return ERROR_INVALID_PARAMETER; + + if ((*RecordNumber==0) && !(EVENTLOG_SEQUENTIAL_READ)) + { + return ERROR_INVALID_PARAMETER; + } + + dwRecNum = *RecordNumber; EnterCriticalSection(&LogFile->cs); + + *BytesRead = 0; + *BytesNeeded = 0; + dwOffset = LogfOffsetByNumber(LogFile, dwRecNum); if (!dwOffset) { LeaveCriticalSection(&LogFile->cs); - return FALSE; + return ERROR_HANDLE_EOF; } if (SetFilePointer(LogFile->hFile, dwOffset, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) { - DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); + DPRINT1("SetFilePointer() failed!\n"); + goto Done; + } + + if (!ReadFile(LogFile->hFile, &dwRecSize, sizeof(DWORD), &dwRead, NULL)) + { + DPRINT1("ReadFile() failed!\n"); + goto Done; + } + + if (dwRecSize > BufSize) + { + *BytesNeeded = dwRecSize; LeaveCriticalSection(&LogFile->cs); - return FALSE; - } - - if (!ReadFile(LogFile->hFile, &dwRecSize, sizeof(DWORD), &dwRead, NULL)) - { - DPRINT1("ReadFile() failed! %d\n", GetLastError()); - LeaveCriticalSection(&LogFile->cs); - return FALSE; - } - - if (dwRecSize > BufSize) - { - *BytesRead = 0; - *BytesNeeded = dwRecSize; - SetLastError(ERROR_INSUFFICIENT_BUFFER); - LeaveCriticalSection(&LogFile->cs); - return FALSE; + return ERROR_INSUFFICIENT_BUFFER; } if (SetFilePointer(LogFile->hFile, @@ -568,21 +579,19 @@ NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER) { - DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); - LeaveCriticalSection(&LogFile->cs); - return FALSE; + DPRINT1("SetFilePointer() failed!\n"); + goto Done; } if (!ReadFile(LogFile->hFile, Buffer, dwRecSize, &dwRead, NULL)) { - DPRINT1("ReadFile() failed! %d\n", GetLastError()); - LeaveCriticalSection(&LogFile->cs); - return FALSE; + DPRINT1("ReadFile() failed!\n"); + goto Done; } dwBufferUsage += dwRead; - while (dwBufferUsage < BufSize) + while (dwBufferUsage <= BufSize) { if (Flags & EVENTLOG_FORWARDS_READ) dwRecNum++; @@ -596,9 +605,8 @@ if (SetFilePointer(LogFile->hFile, dwOffset, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) { - DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); - LeaveCriticalSection(&LogFile->cs); - return FALSE; + DPRINT1("SetFilePointer() failed!\n"); + goto Done; } if (!ReadFile(LogFile->hFile, @@ -607,9 +615,8 @@ &dwRead, NULL)) { - DPRINT1("ReadFile() failed! %d\n", GetLastError()); - LeaveCriticalSection(&LogFile->cs); - return FALSE; + DPRINT1("ReadFile() failed!\n"); + goto Done; } if (dwBufferUsage + dwRecSize > BufSize) @@ -620,9 +627,8 @@ NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER) { - DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); - LeaveCriticalSection(&LogFile->cs); - return FALSE; + DPRINT1("SetFilePointer() failed!\n"); + goto Done; } if (!ReadFile(LogFile->hFile, @@ -631,25 +637,33 @@ &dwRead, NULL)) { - DPRINT1("ReadFile() failed! %d\n", GetLastError()); - LeaveCriticalSection(&LogFile->cs); - return FALSE; + DPRINT1("ReadFile() failed!\n"); + goto Done; } dwBufferUsage += dwRead; } *BytesRead = dwBufferUsage; + * RecordNumber = dwRecNum; LeaveCriticalSection(&LogFile->cs); - return TRUE; + return ERROR_SUCCESS; + +Done: + DPRINT1("LogfReadEvent failed with %x\n",GetLastError()); + LeaveCriticalSection(&LogFile->cs); + return GetLastError(); } BOOL LogfWriteData(PLOGFILE LogFile, DWORD BufSize, PBYTE Buffer) { DWORD dwWritten; + DWORD dwRead; SYSTEMTIME st; EVENTLOGEOF EofRec; - + PEVENTLOGRECORD RecBuf; + LARGE_INTEGER logFileSize; + ULONG RecOffSet; if (!Buffer) return FALSE; @@ -657,6 +671,72 @@ SystemTimeToEventTime(&st, &((PEVENTLOGRECORD) Buffer)->TimeWritten); EnterCriticalSection(&LogFile->cs); + + if (!GetFileSizeEx(LogFile->hFile, &logFileSize)) + { + return FALSE; + } + + /* If the size of the file is over MaxSize */ + if ((logFileSize.QuadPart + BufSize)> LogFile->Header.MaxSize) + { + RecBuf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(EVENTLOGRECORD)); + /* Determine how many records need to be overwritten */ + while (TRUE) + { + DPRINT("EventLogFile has reached maximume size\n"); + + if (!RecBuf) + { + DPRINT1("Failed to allocate buffer for OldestRecord!\n"); + HeapFree(GetProcessHeap(), 0, RecBuf); + LeaveCriticalSection(&LogFile->cs); + return FALSE; + } + + /* Get the oldest record data */ + RecOffSet = LogfOffsetByNumber(LogFile, LogFile->Header.OldestRecordNumber); + if (SetFilePointer(LogFile->hFile, + RecOffSet, + NULL, + FILE_BEGIN) == INVALID_SET_FILE_POINTER) + { + DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, RecBuf); + LeaveCriticalSection(&LogFile->cs); + return FALSE; + } + + if (!ReadFile(LogFile->hFile, RecBuf, sizeof(EVENTLOGRECORD), &dwRead, NULL)) + { + DPRINT1("ReadFile() failed!\n"); + HeapFree(GetProcessHeap(), 0, RecBuf); + LeaveCriticalSection(&LogFile->cs); + return FALSE; + } + + if (RecBuf->Reserved != LOGFILE_SIGNATURE) + { + DPRINT1("LogFile corrupt!\n"); + return FALSE; + } + + LogFile->Header.OldestRecordNumber++; + + /* Check the size of the record as the record adding may be larger */ + if (RecBuf->Length >= BufSize) + { + DPRINT1("Record will fit\n"); + LogFile->Header.StartOffset = LogfOffsetByNumber(LogFile, LogFile->Header.OldestRecordNumber); + break; + } + else + { + DPRINT1("Record wont fit\n"); + } + } + HeapFree(GetProcessHeap(), 0, RecBuf); + } if (SetFilePointer(LogFile->hFile, LogFile->Header.EndOffset, @@ -758,6 +838,11 @@ DWORD LogfGetOldestRecord(PLOGFILE LogFile) { return LogFile->Header.OldestRecordNumber; +} + +DWORD LogfGetCurrentRecord(PLOGFILE LogFile) +{ + return LogFile->Header.CurrentRecordNumber; } BOOL LogfAddOffsetInformation(PLOGFILE LogFile, ULONG ulNumber, ULONG ulOffset)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs