Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[cwittich] 38892: re enable pipe tests
by cwittich＠svn.reactos.org 18 Jan '09

18 Jan '09

Author: cwittich Date: Sun Jan 18 08:10:28 2009 New Revision: 38892 URL: http://svn.reactos.org/svn/reactos?rev=38892&view=rev Log: re enable pipe tests Modified: trunk/rostests/winetests/kernel32/pipe.c Modified: trunk/rostests/winetests/kernel32/pipe.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/pipe.c… ============================================================================== --- trunk/rostests/winetests/kernel32/pipe.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/pipe.c [iso-8859-1] Sun Jan 18 08:10:28 2009 @@ -1327,9 +1327,6 @@ { HMODULE hmod; - skip("ROS-HACK: Skipping pipe tests -- ros' npfs is in a sorry state\n"); - return; - hmod = GetModuleHandle("advapi32.dll"); pDuplicateTokenEx = (void *) GetProcAddress(hmod, "DuplicateTokenEx");

1 0

[cwittich] 38891: fix kernel32 comm crash If lpOverlapped is NULL, lpBytesReturned cannot be NULL.
by cwittich＠svn.reactos.org 18 Jan '09

18 Jan '09

Author: cwittich Date: Sun Jan 18 07:56:09 2009 New Revision: 38891 URL: http://svn.reactos.org/svn/reactos?rev=38891&view=rev Log: fix kernel32 comm crash If lpOverlapped is NULL, lpBytesReturned cannot be NULL. Modified: trunk/reactos/dll/win32/kernel32/misc/comm.c Modified: trunk/reactos/dll/win32/kernel32/misc/comm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/comm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/comm.c [iso-8859-1] Sun Jan 18 07:56:09 2009 @@ -354,13 +354,13 @@ } if (!DeviceIoControl(hFile, IOCTL_SERIAL_GET_BAUD_RATE, - NULL, 0, &BaudRate, sizeof(BaudRate), NULL, NULL) || + NULL, 0, &BaudRate, sizeof(BaudRate), &dwBytesReturned, NULL) || !DeviceIoControl(hFile, IOCTL_SERIAL_GET_LINE_CONTROL, - NULL, 0, &LineControl, sizeof(LineControl), NULL, NULL) || + NULL, 0, &LineControl, sizeof(LineControl), &dwBytesReturned, NULL) || !DeviceIoControl(hFile, IOCTL_SERIAL_GET_HANDFLOW, - NULL, 0, &HandFlow, sizeof(HandFlow), NULL, NULL) || + NULL, 0, &HandFlow, sizeof(HandFlow), &dwBytesReturned, NULL) || !DeviceIoControl(hFile, IOCTL_SERIAL_GET_CHARS, - NULL, 0, &SpecialChars, sizeof(SpecialChars), NULL, NULL)) + NULL, 0, &SpecialChars, sizeof(SpecialChars), &dwBytesReturned, NULL)) return FALSE; memset(lpDCB, 0, sizeof(*lpDCB));

1 0

[dchapyshev] 38890: - Partly sync with Wine head
by dchapyshev＠svn.reactos.org 18 Jan '09

18 Jan '09

Author: dchapyshev Date: Sun Jan 18 07:13:31 2009 New Revision: 38890 URL: http://svn.reactos.org/svn/reactos?rev=38890&view=rev Log: - Partly sync with Wine head Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] Sun Jan 18 07:13:31 2009 @@ -1622,6 +1622,11 @@ case LOCALE_ITLZERO: return L"iTLZero"; case LOCALE_SCOUNTRY: return L"sCountry"; case LOCALE_SLANGUAGE: return L"sLanguage"; + + /* The following are used in XP and later */ + case LOCALE_IDIGITSUBSTITUTION: return L"NumShape"; + case LOCALE_SNATIVEDIGITS: return L"sNativeDigits"; + case LOCALE_ITIMEMARKPOSN: return L"iTimePrefix"; } return NULL; } @@ -1670,7 +1675,6 @@ } ntStatus = NtQueryValueKey( hKey, &usNameW, KeyValuePartialInformation, kvpiInfo, dwSize, &dwSize ); - if (ntStatus == STATUS_BUFFER_OVERFLOW && !lpBuffer) ntStatus = 0; if (!ntStatus) { @@ -1691,14 +1695,18 @@ lpBuffer[nRet - 1] = 0; } } + else if (ntStatus == STATUS_BUFFER_OVERFLOW && !lpBuffer) + { + nRet = (dwSize - nInfoSize) / sizeof(WCHAR) + 1; + } + else if (ntStatus == STATUS_OBJECT_NAME_NOT_FOUND) + { + nRet = -1; + } else { - if (ntStatus == STATUS_OBJECT_NAME_NOT_FOUND) nRet = -1; - else - { - SetLastError( RtlNtStatusToDosError(ntStatus) ); - nRet = 0; - } + SetLastError( RtlNtStatusToDosError(ntStatus) ); + nRet = 0; } NtClose( hKey ); HeapFree( GetProcessHeap(), 0, kvpiInfo );

1 0

[cwittich] 38889: sync msi to wine 1.1.13
by cwittich＠svn.reactos.org 18 Jan '09

18 Jan '09

Author: cwittich Date: Sun Jan 18 06:52:01 2009 New Revision: 38889 URL: http://svn.reactos.org/svn/reactos?rev=38889&view=rev Log: sync msi to wine 1.1.13 Modified: trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/appsearch.c trunk/reactos/dll/win32/msi/automation.c trunk/reactos/dll/win32/msi/classes.c trunk/reactos/dll/win32/msi/database.c trunk/reactos/dll/win32/msi/dialog.c trunk/reactos/dll/win32/msi/files.c trunk/reactos/dll/win32/msi/font.c trunk/reactos/dll/win32/msi/format.c trunk/reactos/dll/win32/msi/handle.c trunk/reactos/dll/win32/msi/install.c trunk/reactos/dll/win32/msi/media.c trunk/reactos/dll/win32/msi/msi.c trunk/reactos/dll/win32/msi/msi_main.c trunk/reactos/dll/win32/msi/msipriv.h trunk/reactos/dll/win32/msi/msiquery.c trunk/reactos/dll/win32/msi/package.c trunk/reactos/dll/win32/msi/preview.c trunk/reactos/dll/win32/msi/record.c trunk/reactos/dll/win32/msi/registry.c trunk/reactos/dll/win32/msi/string.c trunk/reactos/dll/win32/msi/suminfo.c trunk/reactos/dll/win32/msi/table.c trunk/reactos/dll/win32/msi/upgrade.c Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/action.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/action.c [iso-8859-1] Sun Jan 18 06:52:01 2009 @@ -887,7 +887,7 @@ static UINT ITERATE_Actions(MSIRECORD *row, LPVOID param) { - iterate_action_param *iap= (iterate_action_param*)param; + iterate_action_param *iap = param; UINT rc; LPCWSTR cond, action; @@ -1125,7 +1125,7 @@ static UINT ITERATE_CreateFolders(MSIRECORD *row, LPVOID param) { - MSIPACKAGE *package = (MSIPACKAGE*)param; + MSIPACKAGE *package = param; LPCWSTR dir; LPWSTR full_path; MSIRECORD *uirow; @@ -1307,7 +1307,7 @@ static UINT iterate_load_featurecomponents(MSIRECORD *row, LPVOID param) { - _ilfs* ilfs= (_ilfs*)param; + _ilfs* ilfs = param; LPCWSTR component; MSICOMPONENT *comp; @@ -1345,7 +1345,7 @@ static UINT load_feature(MSIRECORD * row, LPVOID param) { - MSIPACKAGE* package = (MSIPACKAGE*)param; + MSIPACKAGE* package = param; MSIFEATURE* feature; static const WCHAR Query1[] = {'S','E','L','E','C','T',' ', @@ -1404,7 +1404,7 @@ static UINT find_feature_children(MSIRECORD * row, LPVOID param) { - MSIPACKAGE* package = (MSIPACKAGE*)param; + MSIPACKAGE* package = param; MSIFEATURE *parent, *child; child = find_feature_by_name( package, MSI_RecordGetString( row, 1 ) ); @@ -1497,7 +1497,7 @@ static UINT load_file(MSIRECORD *row, LPVOID param) { - MSIPACKAGE* package = (MSIPACKAGE*)param; + MSIPACKAGE* package = param; LPCWSTR component; MSIFILE *file; @@ -2033,7 +2033,7 @@ static UINT ITERATE_CostFinalizeDirectories(MSIRECORD *row, LPVOID param) { - MSIPACKAGE *package = (MSIPACKAGE*)param; + MSIPACKAGE *package = param; LPCWSTR name; LPWSTR path; MSIFOLDER *f; @@ -2058,7 +2058,7 @@ static UINT ITERATE_CostFinalizeConditions(MSIRECORD *row, LPVOID param) { - MSIPACKAGE *package = (MSIPACKAGE*)param; + MSIPACKAGE *package = param; LPCWSTR name; MSIFEATURE *feature; @@ -2391,7 +2391,7 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) { - MSIPACKAGE *package = (MSIPACKAGE*)param; + MSIPACKAGE *package = param; static const WCHAR szHCR[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_', 'R','O','O','T','\\',0}; @@ -2640,7 +2640,7 @@ static UINT ITERATE_LaunchConditions(MSIRECORD *row, LPVOID param) { - MSIPACKAGE* package = (MSIPACKAGE*)param; + MSIPACKAGE* package = param; LPCWSTR cond = NULL; LPCWSTR message = NULL; UINT r; @@ -3052,7 +3052,7 @@ static UINT ITERATE_RegisterTypeLibraries(MSIRECORD *row, LPVOID param) { - MSIPACKAGE* package = (MSIPACKAGE*)param; + MSIPACKAGE* package = param; LPCWSTR component; MSICOMPONENT *comp; MSIFILE *file; @@ -3168,7 +3168,7 @@ static UINT ITERATE_CreateShortcuts(MSIRECORD *row, LPVOID param) { - MSIPACKAGE *package = (MSIPACKAGE*)param; + MSIPACKAGE *package = param; LPWSTR target_file, target_folder, filename; LPCWSTR buffer, extension; MSICOMPONENT *comp; @@ -3338,7 +3338,7 @@ static UINT ITERATE_PublishIcon(MSIRECORD *row, LPVOID param) { - MSIPACKAGE* package = (MSIPACKAGE*)param; + MSIPACKAGE* package = param; HANDLE the_file; LPWSTR FilePath; LPCWSTR FileName; @@ -3708,7 +3708,7 @@ static UINT ITERATE_WriteIniValues(MSIRECORD *row, LPVOID param) { - MSIPACKAGE *package = (MSIPACKAGE*)param; + MSIPACKAGE *package = param; LPCWSTR component, section, key, value, identifier, dirproperty; LPWSTR deformated_section, deformated_key, deformated_value; LPWSTR folder, filename, fullname = NULL; @@ -3834,7 +3834,7 @@ static UINT ITERATE_SelfRegModules(MSIRECORD *row, LPVOID param) { - MSIPACKAGE *package = (MSIPACKAGE*)param; + MSIPACKAGE *package = param; LPCWSTR filename; LPWSTR FullName; MSIFILE *file; @@ -4544,7 +4544,7 @@ static UINT ITERATE_PublishComponent(MSIRECORD *rec, LPVOID param) { - MSIPACKAGE *package = (MSIPACKAGE*)param; + MSIPACKAGE *package = param; LPCWSTR compgroupid=NULL; LPCWSTR feature=NULL; LPCWSTR text = NULL; @@ -4640,7 +4640,7 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) { - MSIPACKAGE *package = (MSIPACKAGE*)param; + MSIPACKAGE *package = param; MSIRECORD *row; MSIFILE *file; SC_HANDLE hscm, service = NULL; @@ -4781,7 +4781,7 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) { - MSIPACKAGE *package = (MSIPACKAGE *)param; + MSIPACKAGE *package = param; MSICOMPONENT *comp; SC_HANDLE scm, service = NULL; LPCWSTR name, *vector = NULL; @@ -4894,7 +4894,7 @@ static UINT ITERATE_StopService(MSIRECORD *rec, LPVOID param) { - MSIPACKAGE *package = (MSIPACKAGE *)param; + MSIPACKAGE *package = param; MSICOMPONENT *comp; SERVICE_STATUS status; SERVICE_STATUS_PROCESS ssp; @@ -4991,7 +4991,7 @@ static UINT ITERATE_InstallODBCDriver( MSIRECORD *rec, LPVOID param ) { - MSIPACKAGE *package = (MSIPACKAGE*)param; + MSIPACKAGE *package = param; LPWSTR driver, driver_path, ptr; WCHAR outpath[MAX_PATH]; MSIFILE *driver_file, *setup_file; @@ -5057,7 +5057,7 @@ static UINT ITERATE_InstallODBCTranslator( MSIRECORD *rec, LPVOID param ) { - MSIPACKAGE *package = (MSIPACKAGE*)param; + MSIPACKAGE *package = param; LPWSTR translator, translator_path, ptr; WCHAR outpath[MAX_PATH]; MSIFILE *translator_file, *setup_file; @@ -5606,7 +5606,7 @@ { file = LIST_ENTRY(list_head(&files.entry), FILE_LIST, entry); - msi_move_file((LPCWSTR)file->source, (LPCWSTR)file->dest, options); + msi_move_file(file->source, file->dest, options); list_remove(&file->entry); free_file_entry(file); @@ -5866,7 +5866,7 @@ static UINT parse_assembly_name(MSIRECORD *rec, LPVOID param) { - ASSEMBLY_NAME *asmname = (ASSEMBLY_NAME *)param; + ASSEMBLY_NAME *asmname = param; LPCWSTR name = MSI_RecordGetString(rec, 2); LPWSTR val = msi_dup_record_field(rec, 3); @@ -5986,7 +5986,7 @@ static UINT load_assembly(MSIRECORD *rec, LPVOID param) { - ASSEMBLY_LIST *list = (ASSEMBLY_LIST *)param; + ASSEMBLY_LIST *list = param; MSIASSEMBLY *assembly; assembly = msi_alloc_zero(sizeof(MSIASSEMBLY)); @@ -6091,7 +6091,7 @@ { MSIASSEMBLY *assembly; WCHAR temppath[MAX_PATH]; - struct list *assemblies = (struct list *)user; + struct list *assemblies = user; UINT r; if (!find_assembly(assemblies, file, &assembly)) Modified: trunk/reactos/dll/win32/msi/appsearch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/appsearch.c?… ============================================================================== --- trunk/reactos/dll/win32/msi/appsearch.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/appsearch.c [iso-8859-1] Sun Jan 18 06:52:01 2009 @@ -639,8 +639,7 @@ VerQueryValueW(buf, rootW, &subBlock, &versionLen); if (subBlock) { - VS_FIXEDFILEINFO *info = - (VS_FIXEDFILEINFO *)subBlock; + VS_FIXEDFILEINFO *info = subBlock; TRACE("Comparing file version %d.%d.%d.%d:\n", HIWORD(info->dwFileVersionMS), Modified: trunk/reactos/dll/win32/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/automation.c… ============================================================================== --- trunk/reactos/dll/win32/msi/automation.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/automation.c [iso-8859-1] Sun Jan 18 06:52:01 2009 @@ -1731,9 +1731,9 @@ if (V_I4(&varg0) >= REG_INDEX_CLASSES_ROOT && V_I4(&varg0) <= REG_INDEX_DYN_DATA) - V_I4(&varg0) |= (UINT)HKEY_CLASSES_ROOT; - - ret = RegOpenKeyW((HKEY)V_I4(&varg0), V_BSTR(&varg1), &hkey); + V_I4(&varg0) |= (UINT_PTR)HKEY_CLASSES_ROOT; + + ret = RegOpenKeyW((HKEY)(UINT_PTR)V_I4(&varg0), V_BSTR(&varg1), &hkey); /* Third parameter can be VT_EMPTY, VT_I4, or VT_BSTR */ switch (V_VT(&varg2)) Modified: trunk/reactos/dll/win32/msi/classes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/classes.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/classes.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/classes.c [iso-8859-1] Sun Jan 18 06:52:01 2009 @@ -486,7 +486,7 @@ static UINT iterate_load_verb(MSIRECORD *row, LPVOID param) { - MSIPACKAGE* package = (MSIPACKAGE*)param; + MSIPACKAGE* package = param; MSIVERB *verb; LPCWSTR buffer; MSIEXTENSION *extension; @@ -527,7 +527,7 @@ LPCWSTR clsid; LPCWSTR context; LPCWSTR buffer; - MSIPACKAGE* package =(MSIPACKAGE*)param; + MSIPACKAGE* package = param; MSICLASS *cls; BOOL match = FALSE; @@ -577,7 +577,7 @@ MSICOMPONENT *comp; LPCWSTR buffer; LPCWSTR extension; - MSIPACKAGE* package =(MSIPACKAGE*)param; + MSIPACKAGE* package = param; BOOL match = FALSE; MSIEXTENSION *ext; @@ -622,7 +622,7 @@ static UINT iterate_all_progids(MSIRECORD *rec, LPVOID param) { LPCWSTR buffer; - MSIPACKAGE* package =(MSIPACKAGE*)param; + MSIPACKAGE* package = param; buffer = MSI_RecordGetString(rec,1); load_given_progid(package,buffer); @@ -666,7 +666,7 @@ static UINT iterate_all_mimes(MSIRECORD *rec, LPVOID param) { LPCWSTR buffer; - MSIPACKAGE* package =(MSIPACKAGE*)param; + MSIPACKAGE* package = param; buffer = MSI_RecordGetString(rec,1); load_given_mime(package,buffer); Modified: trunk/reactos/dll/win32/msi/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/database.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/database.c [iso-8859-1] Sun Jan 18 06:52:01 2009 @@ -598,7 +598,7 @@ return r; } -UINT MSI_DatabaseImport(MSIDATABASE *db, LPCWSTR folder, LPCWSTR file) +static UINT MSI_DatabaseImport(MSIDATABASE *db, LPCWSTR folder, LPCWSTR file) { UINT r; DWORD len, i; @@ -692,7 +692,7 @@ MSIDATABASE *db; UINT r; - TRACE("%lx %s %s\n",handle,debugstr_w(szFolder), debugstr_w(szFilename)); + TRACE("%x %s %s\n",handle,debugstr_w(szFolder), debugstr_w(szFilename)); db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE ); if( !db ) @@ -720,7 +720,7 @@ LPWSTR path = NULL, file = NULL; UINT r = ERROR_OUTOFMEMORY; - TRACE("%lx %s %s\n", handle, debugstr_a(szFolder), debugstr_a(szFilename)); + TRACE("%x %s %s\n", handle, debugstr_a(szFolder), debugstr_a(szFilename)); if( szFolder ) { @@ -812,7 +812,7 @@ return ERROR_SUCCESS; } -UINT MSI_DatabaseExport( MSIDATABASE *db, LPCWSTR table, +static UINT MSI_DatabaseExport( MSIDATABASE *db, LPCWSTR table, LPCWSTR folder, LPCWSTR file ) { static const WCHAR query[] = { @@ -912,7 +912,7 @@ MSIDATABASE *db; UINT r; - TRACE("%lx %s %s %s\n", handle, debugstr_w(szTable), + TRACE("%x %s %s %s\n", handle, debugstr_w(szTable), debugstr_w(szFolder), debugstr_w(szFilename)); db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE ); @@ -941,7 +941,7 @@ LPWSTR path = NULL, file = NULL, table = NULL; UINT r = ERROR_OUTOFMEMORY; - TRACE("%lx %s %s %s\n", handle, debugstr_a(szTable), + TRACE("%x %s %s %s\n", handle, debugstr_a(szTable), debugstr_a(szFolder), debugstr_a(szFilename)); if( szTable ) @@ -981,7 +981,7 @@ UINT r; LPWSTR table; - TRACE("(%ld, %ld, %s)\n", hDatabase, hDatabaseMerge, + TRACE("(%d, %d, %s)\n", hDatabase, hDatabaseMerge, debugstr_a(szTableName)); table = strdupAtoW(szTableName); @@ -1202,7 +1202,7 @@ static UINT merge_diff_row(MSIRECORD *rec, LPVOID param) { - MERGEDATA *data = (MERGEDATA *)param; + MERGEDATA *data = param; MERGETABLE *table = data->curtable; MERGEROW *mergerow; MSIQUERY *dbview; @@ -1257,7 +1257,7 @@ static UINT merge_diff_tables(MSIRECORD *rec, LPVOID param) { - MERGEDATA *data = (MERGEDATA *)param; + MERGEDATA *data = param; MERGETABLE *table; MSIQUERY *dbview; MSIQUERY *mergeview = NULL; @@ -1426,7 +1426,7 @@ BOOL conflicts; UINT r; - TRACE("(%ld, %ld, %s)\n", hDatabase, hDatabaseMerge, + TRACE("(%d, %d, %s)\n", hDatabase, hDatabaseMerge, debugstr_w(szTableName)); if (szTableName && !*szTableName) @@ -1488,7 +1488,7 @@ MSIDBSTATE ret = MSIDBSTATE_READ; MSIDATABASE *db; - TRACE("%ld\n", handle); + TRACE("%d\n", handle); db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE ); if( !db ) @@ -1562,7 +1562,7 @@ BSTR table, MSICONDITION *persistent ) { msi_remote_database_impl *This = mrd_from_IWineMsiRemoteDatabase( iface ); - *persistent = MsiDatabaseIsTablePersistentW(This->database, (LPWSTR)table); + *persistent = MsiDatabaseIsTablePersistentW(This->database, table); return S_OK; } @@ -1570,7 +1570,7 @@ BSTR table, MSIHANDLE *keys ) { msi_remote_database_impl *This = mrd_from_IWineMsiRemoteDatabase( iface ); - UINT r = MsiDatabaseGetPrimaryKeysW(This->database, (LPWSTR)table, keys); + UINT r = MsiDatabaseGetPrimaryKeysW(This->database, table, keys); return HRESULT_FROM_WIN32(r); } @@ -1586,7 +1586,7 @@ BSTR query, MSIHANDLE *view ) { msi_remote_database_impl *This = mrd_from_IWineMsiRemoteDatabase( iface ); - UINT r = MsiDatabaseOpenViewW(This->database, (LPWSTR)query, view); + UINT r = MsiDatabaseOpenViewW(This->database, query, view); return HRESULT_FROM_WIN32(r); } Modified: trunk/reactos/dll/win32/msi/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/dialog.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/dialog.c [iso-8859-1] Sun Jan 18 06:52:01 2009 @@ -1725,7 +1725,7 @@ /* radio buttons are a bit different from normal controls */ static UINT msi_dialog_create_radiobutton( MSIRECORD *rec, LPVOID param ) { - radio_button_group_descr *group = (radio_button_group_descr *)param; + radio_button_group_descr *group = param; msi_dialog *dialog = group->dialog; msi_control *control; LPCWSTR prop, text, name; @@ -3032,7 +3032,7 @@ 'D','e','f','a','u','l','t','U','I','F','o','n','t',0 }; static const WCHAR dfv[] = { 'M','S',' ','S','h','e','l','l',' ','D','l','g',0 }; - msi_dialog *dialog = (msi_dialog*) cs->lpCreateParams; + msi_dialog *dialog = cs->lpCreateParams; MSIRECORD *rec = NULL; LPWSTR title = NULL; RECT pos; @@ -3152,7 +3152,7 @@ static UINT add_rec_to_list( MSIRECORD *rec, LPVOID param ) { struct rec_list *add_rec; - struct list *records = (struct list *)param; + struct list *records = param; msiobj_addref( &rec->hdr ); @@ -3478,6 +3478,38 @@ return DefWindowProcW( hwnd, msg, wParam, lParam ); } +static BOOL msi_dialog_register_class( void ) +{ + WNDCLASSW cls; + + ZeroMemory( &cls, sizeof cls ); + cls.lpfnWndProc = MSIDialog_WndProc; + cls.hInstance = NULL; + cls.hIcon = LoadIconW(0, (LPWSTR)IDI_APPLICATION); + cls.hCursor = LoadCursorW(0, (LPWSTR)IDC_ARROW); + cls.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1); + cls.lpszMenuName = NULL; + cls.lpszClassName = szMsiDialogClass; + + if( !RegisterClassW( &cls ) ) + return FALSE; + + cls.lpfnWndProc = MSIHiddenWindowProc; + cls.lpszClassName = szMsiHiddenWindow; + + if( !RegisterClassW( &cls ) ) + return FALSE; + + uiThreadId = GetCurrentThreadId(); + + hMsiHiddenWindow = CreateWindowW( szMsiHiddenWindow, NULL, WS_OVERLAPPED, + 0, 0, 100, 100, NULL, NULL, NULL, NULL ); + if( !hMsiHiddenWindow ) + return FALSE; + + return TRUE; +} + /* functions that interface to other modules within MSI */ msi_dialog *msi_dialog_create( MSIPACKAGE* package, @@ -3661,38 +3693,6 @@ msi_free( dialog ); } -BOOL msi_dialog_register_class( void ) -{ - WNDCLASSW cls; - - ZeroMemory( &cls, sizeof cls ); - cls.lpfnWndProc = MSIDialog_WndProc; - cls.hInstance = NULL; - cls.hIcon = LoadIconW(0, (LPWSTR)IDI_APPLICATION); - cls.hCursor = LoadCursorW(0, (LPWSTR)IDC_ARROW); - cls.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1); - cls.lpszMenuName = NULL; - cls.lpszClassName = szMsiDialogClass; - - if( !RegisterClassW( &cls ) ) - return FALSE; - - cls.lpfnWndProc = MSIHiddenWindowProc; - cls.lpszClassName = szMsiHiddenWindow; - - if( !RegisterClassW( &cls ) ) - return FALSE; - - uiThreadId = GetCurrentThreadId(); - - hMsiHiddenWindow = CreateWindowW( szMsiHiddenWindow, NULL, WS_OVERLAPPED, - 0, 0, 100, 100, NULL, NULL, NULL, NULL ); - if( !hMsiHiddenWindow ) - return FALSE; - - return TRUE; -} - void msi_dialog_unregister_class( void ) { DestroyWindow( hMsiHiddenWindow ); Modified: trunk/reactos/dll/win32/msi/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/files.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/files.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/files.c [iso-8859-1] Sun Jan 18 06:52:01 2009 @@ -323,7 +323,7 @@ static UINT ITERATE_DuplicateFiles(MSIRECORD *row, LPVOID param) { - MSIPACKAGE *package = (MSIPACKAGE*)param; + MSIPACKAGE *package = param; WCHAR dest_name[0x100]; LPWSTR dest_path, dest; LPCWSTR file_key, component; @@ -468,7 +468,7 @@ static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param) { - MSIPACKAGE *package = (MSIPACKAGE*)param; + MSIPACKAGE *package = param; MSICOMPONENT *comp; LPCWSTR component, filename, dirprop; UINT install_mode; Modified: trunk/reactos/dll/win32/msi/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/font.c?rev=3… ============================================================================== --- trunk/reactos/dll/win32/msi/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/font.c [iso-8859-1] Sun Jan 18 06:52:01 2009 @@ -170,7 +170,7 @@ static UINT ITERATE_RegisterFonts(MSIRECORD *row, LPVOID param) { - MSIPACKAGE *package = (MSIPACKAGE*)param; + MSIPACKAGE *package = param; LPWSTR name; LPCWSTR filename; MSIFILE *file; Modified: trunk/reactos/dll/win32/msi/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/format.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/format.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/format.c [iso-8859-1] Sun Jan 18 06:52:01 2009 @@ -913,7 +913,7 @@ MSIPACKAGE *package; MSIRECORD *record; - TRACE("%ld %ld %p %p\n", hInstall, hRecord, szResult, sz); + TRACE("%d %d %p %p\n", hInstall, hRecord, szResult, sz); package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE ); if (!package) @@ -978,7 +978,7 @@ DWORD len, save; LPWSTR value; - TRACE("%ld %ld %p %p\n", hInstall, hRecord, szResult, sz); + TRACE("%d %d %p %p\n", hInstall, hRecord, szResult, sz); if (!hRecord) return ERROR_INVALID_HANDLE; Modified: trunk/reactos/dll/win32/msi/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/handle.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/handle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/handle.c [iso-8859-1] Sun Jan 18 06:52:01 2009 @@ -123,7 +123,7 @@ LeaveCriticalSection( &MSI_handle_cs ); - TRACE("%p -> %ld\n", obj, ret ); + TRACE("%p -> %d\n", obj, ret ); return ret; } @@ -147,7 +147,7 @@ LeaveCriticalSection( &MSI_handle_cs ); - TRACE("%p -> %ld\n", unk, ret); + TRACE("%p -> %d\n", unk, ret); return ret; } @@ -174,7 +174,7 @@ out: LeaveCriticalSection( &MSI_handle_cs ); - return (void*) ret; + return ret; } IUnknown *msi_get_remote( MSIHANDLE handle ) @@ -270,7 +270,7 @@ MSIOBJECTHDR *info = NULL; UINT ret = ERROR_INVALID_HANDLE; - TRACE("%lx\n",handle); + TRACE("%x\n",handle); if (!handle) return ERROR_SUCCESS; @@ -304,7 +304,7 @@ ret = ERROR_SUCCESS; - TRACE("handle %lx destroyed\n", handle+1); + TRACE("handle %x destroyed\n", handle+1); out: LeaveCriticalSection( &MSI_handle_cs ); if( info ) Modified: trunk/reactos/dll/win32/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/install.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/install.c [iso-8859-1] Sun Jan 18 06:52:01 2009 @@ -707,7 +707,7 @@ break; default: - FIXME("%ld %d\n", hInstall, iRunMode); + FIXME("%d %d\n", hInstall, iRunMode); r = TRUE; } @@ -727,7 +727,7 @@ case MSIRUNMODE_RESERVED15: return FALSE; default: - FIXME("%ld %d %d\n", hInstall, iRunMode, fState); + FIXME("%d %d %d\n", hInstall, iRunMode, fState); } return TRUE; } @@ -886,7 +886,7 @@ MSIPACKAGE* package; UINT ret; - TRACE("%ld %s %p %p\n", hInstall, debugstr_w(szFeature), piInstalled, piAction); + TRACE("%d %s %p %p\n", hInstall, debugstr_w(szFeature), piInstalled, piAction); package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE); if (!package) @@ -934,7 +934,7 @@ UINT WINAPI MsiGetFeatureCostA(MSIHANDLE hInstall, LPCSTR szFeature, MSICOSTTREE iCostTree, INSTALLSTATE iState, LPINT piCost) { - FIXME("(%ld %s %i %i %p): stub\n", hInstall, debugstr_a(szFeature), + FIXME("(%d %s %i %i %p): stub\n", hInstall, debugstr_a(szFeature), iCostTree, iState, piCost); if (piCost) *piCost = 0; return ERROR_SUCCESS; @@ -946,7 +946,7 @@ UINT WINAPI MsiGetFeatureCostW(MSIHANDLE hInstall, LPCWSTR szFeature, MSICOSTTREE iCostTree, INSTALLSTATE iState, LPINT piCost) { - FIXME("(%ld %s %i %i %p): stub\n", hInstall, debugstr_w(szFeature), + FIXME("(%d %s %i %i %p): stub\n", hInstall, debugstr_w(szFeature), iCostTree, iState, piCost); if (piCost) *piCost = 0; return ERROR_SUCCESS; @@ -1082,7 +1082,7 @@ MSIPACKAGE* package; UINT ret; - TRACE("%ld %s %p %p\n", hInstall, debugstr_w(szComponent), + TRACE("%d %s %p %p\n", hInstall, debugstr_w(szComponent), piInstalled, piAction); package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE); @@ -1191,7 +1191,7 @@ MSIPACKAGE* package; UINT r; - TRACE("%ld %i\n", hInstall, iInstallLevel); + TRACE("%d %i\n", hInstall, iInstallLevel); package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE); if (!package) @@ -1232,7 +1232,7 @@ LPDWORD pInstallState) { if(pInstallState) *pInstallState = 1<<INSTALLSTATE_LOCAL; - FIXME("%ld %s %p stub returning %d\n", + FIXME("%d %s %p stub returning %d\n", hInstall, debugstr_w(szFeature), pInstallState, pInstallState ? *pInstallState : 0); return ERROR_SUCCESS; Modified: trunk/reactos/dll/win32/msi/media.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/media.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/media.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/media.c [iso-8859-1] Sun Jan 18 06:52:01 2009 @@ -145,17 +145,17 @@ return rc; } -static void *cabinet_alloc(ULONG cb) +static void CDECL *cabinet_alloc(ULONG cb) { return msi_alloc(cb); } -static void cabinet_free(void *pv) +static void CDECL cabinet_free(void *pv) { msi_free(pv); } -static INT_PTR cabinet_open(char *pszFile, int oflag, int pmode) +static INT_PTR CDECL cabinet_open(char *pszFile, int oflag, int pmode) { HANDLE handle; DWORD dwAccess = 0; @@ -191,7 +191,7 @@ return (INT_PTR)handle; } -static UINT cabinet_read(INT_PTR hf, void *pv, UINT cb) +static UINT CDECL cabinet_read(INT_PTR hf, void *pv, UINT cb) { HANDLE handle = (HANDLE)hf; DWORD read; @@ -202,7 +202,7 @@ return 0; } -static UINT cabinet_write(INT_PTR hf, void *pv, UINT cb) +static UINT CDECL cabinet_write(INT_PTR hf, void *pv, UINT cb) { HANDLE handle = (HANDLE)hf; DWORD written; @@ -213,20 +213,20 @@ return 0; } -static int cabinet_close(INT_PTR hf) +static int CDECL cabinet_close(INT_PTR hf) { HANDLE handle = (HANDLE)hf; return CloseHandle(handle) ? 0 : -1; } -static long cabinet_seek(INT_PTR hf, long dist, int seektype) +static LONG CDECL cabinet_seek(INT_PTR hf, LONG dist, int seektype) { HANDLE handle = (HANDLE)hf; /* flags are compatible and so are passed straight through */ return SetFilePointer(handle, dist, NULL, seektype); } -static UINT msi_media_get_disk_info(MSIPACKAGE *package, MSIMEDIAINFO *mi) +static UINT CDECL msi_media_get_disk_info(MSIPACKAGE *package, MSIMEDIAINFO *mi) { MSIRECORD *row; LPWSTR ptr; @@ -260,7 +260,7 @@ static INT_PTR cabinet_partial_file(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) { - MSICABDATA *data = (MSICABDATA *)pfdin->pv; + MSICABDATA *data = pfdin->pv; data->mi->is_continuous = FALSE; return 0; } @@ -268,7 +268,7 @@ static INT_PTR cabinet_next_cabinet(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) { - MSICABDATA *data = (MSICABDATA *)pfdin->pv; + MSICABDATA *data = pfdin->pv; MSIMEDIAINFO *mi = data->mi; LPWSTR cab = strdupAtoW(pfdin->psz1); INT_PTR res = -1; @@ -314,7 +314,7 @@ static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) { - MSICABDATA *data = (MSICABDATA*)pfdin->pv; + MSICABDATA *data = pfdin->pv; HANDLE handle = 0; LPWSTR path = NULL; DWORD attrs; @@ -349,7 +349,7 @@ static INT_PTR cabinet_close_file_info(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) { - MSICABDATA *data = (MSICABDATA*)pfdin->pv; + MSICABDATA *data = pfdin->pv; FILETIME ft; FILETIME ftLocal; HANDLE handle = (HANDLE)pfdin->hf; @@ -374,7 +374,7 @@ return 1; } -static INT_PTR cabinet_notify(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) +static INT_PTR CDECL cabinet_notify(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) { TRACE("(%d)\n", fdint); @@ -455,7 +455,7 @@ msi_free(mi); } -UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) +static UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) { MSIRECORD *row; LPWSTR source_dir; @@ -542,7 +542,7 @@ } /* FIXME: search NETWORK and URL sources as well */ -UINT find_published_source(MSIPACKAGE *package, MSIMEDIAINFO *mi) +static UINT find_published_source(MSIPACKAGE *package, MSIMEDIAINFO *mi) { WCHAR source[MAX_PATH]; WCHAR volume[MAX_PATH]; Modified: trunk/reactos/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=38… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] Sun Jan 18 06:52:01 2009 @@ -1443,7 +1443,7 @@ LPWSTR lpDriveBuf, DWORD *pcchDriveBuf, int *piCost, int *pTempCost) { - FIXME("(%ld, %s, %d, %d, %p, %p, %p %p): stub!\n", hInstall, + FIXME("(%d, %s, %d, %d, %p, %p, %p %p): stub!\n", hInstall, debugstr_w(szComponent), dwIndex, iState, lpDriveBuf, pcchDriveBuf, piCost, pTempCost); @@ -1743,10 +1743,10 @@ LPWSTR p; DWORD i, len; - TRACE("%ld %u %p %d %d\n", handle, id, lpBuffer, nBufferMax, lang); + TRACE("%d %u %p %d %d\n", handle, id, lpBuffer, nBufferMax, lang); if( handle != -1 ) - FIXME("don't know how to deal with handle = %08lx\n", handle); + FIXME("don't know how to deal with handle = %08x\n", handle); if( !lang ) lang = GetUserDefaultLangID(); @@ -1903,7 +1903,7 @@ DWORD len; UINT r; - TRACE("(%ld, %s, %p, %p)\n", hProduct, debugstr_a(szProperty), + TRACE("(%d, %s, %p, %p)\n", hProduct, debugstr_a(szProperty), szValue, pccbValue); if (szValue && !pccbValue) @@ -1972,7 +1972,7 @@ '`','P','r','o','p','e','r','t','y','`',' ','W','H','E','R','E',' ', '`','P','r','o','p','e','r','t','y','`','=','\'','%','s','\'',0}; - TRACE("(%ld, %s, %p, %p)\n", hProduct, debugstr_w(szProperty), + TRACE("(%d, %s, %p, %p)\n", hProduct, debugstr_w(szProperty), szValue, pccbValue); if (!szProperty) Modified: trunk/reactos/dll/win32/msi/msi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_main.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/msi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi_main.c [iso-8859-1] Sun Jan 18 06:52:01 2009 @@ -201,19 +201,19 @@ if ( IsEqualCLSID (rclsid, &CLSID_IMsiServerX2) ) { - *ppv = (LPVOID) &MsiServer_CF; + *ppv = &MsiServer_CF; return S_OK; } if ( IsEqualCLSID (rclsid, &CLSID_IWineMsiRemoteCustomAction) ) { - *ppv = (LPVOID) &WineMsiCustomRemote_CF; + *ppv = &WineMsiCustomRemote_CF; return S_OK; } if ( IsEqualCLSID (rclsid, &CLSID_IWineMsiRemotePackage) ) { - *ppv = (LPVOID) &WineMsiRemotePackage_CF; + *ppv = &WineMsiRemotePackage_CF; return S_OK; } Modified: trunk/reactos/dll/win32/msi/msipriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msipriv.h?re… ============================================================================== --- trunk/reactos/dll/win32/msi/msipriv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msipriv.h [iso-8859-1] Sun Jan 18 06:52:01 2009 @@ -656,10 +656,8 @@ extern BOOL msi_addstringW( string_table *st, UINT string_no, const WCHAR *data, int len, UINT refcount, enum StringPersistence persistence ); extern UINT msi_id2stringW( const string_table *st, UINT string_no, LPWSTR buffer, UINT *sz ); -extern UINT msi_id2stringA( const string_table *st, UINT string_no, LPSTR buffer, UINT *sz ); extern UINT msi_string2idW( const string_table *st, LPCWSTR buffer, UINT *id ); -extern UINT msi_string2idA( const string_table *st, LPCSTR str, UINT *id ); extern VOID msi_destroy_stringtable( string_table *st ); extern UINT msi_strcmp( const string_table *st, UINT lval, UINT rval, UINT *res ); extern const WCHAR *msi_string_lookup_id( const string_table *st, UINT id ); @@ -700,15 +698,12 @@ extern MSIRECORD *MSI_CreateRecord( UINT ); extern UINT MSI_RecordSetInteger( MSIRECORD *, UINT, int ); extern UINT MSI_RecordSetStringW( MSIRECORD *, UINT, LPCWSTR ); -extern UINT MSI_RecordSetStringA( MSIRECORD *, UINT, LPCSTR ); extern BOOL MSI_RecordIsNull( MSIRECORD *, UINT ); extern UINT MSI_RecordGetStringW( MSIRECORD * , UINT, LPWSTR, LPDWORD); extern UINT MSI_RecordGetStringA( MSIRECORD *, UINT, LPSTR, LPDWORD); extern int MSI_RecordGetInteger( MSIRECORD *, UINT ); extern UINT MSI_RecordReadStream( MSIRECORD *, UINT, char *, LPDWORD); extern UINT MSI_RecordGetFieldCount( const MSIRECORD *rec ); -extern UINT MSI_RecordSetStream( MSIRECORD *, UINT, IStream * ); -extern UINT MSI_RecordDataSize( MSIRECORD *, UINT ); extern UINT MSI_RecordStreamToFile( MSIRECORD *, UINT, LPCWSTR ); extern UINT MSI_RecordCopyField( MSIRECORD *, UINT, MSIRECORD *, UINT ); extern MSIRECORD *MSI_CloneRecord( MSIRECORD * ); @@ -716,10 +711,8 @@ /* stream internals */ extern UINT get_raw_stream( MSIHANDLE hdb, LPCWSTR stname, IStream **stm ); -extern UINT db_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm ); extern void enum_stream_names( IStorage *stg ); extern BOOL decode_streamname(LPCWSTR in, LPWSTR out); -extern LPWSTR encode_streamname(BOOL bTable, LPCWSTR in); /* database internals */ extern UINT MSI_OpenDatabaseW( LPCWSTR, LPCWSTR, MSIDATABASE ** ); @@ -728,8 +721,6 @@ typedef UINT (*record_func)( MSIRECORD *, LPVOID ); extern UINT MSI_IterateRecords( MSIQUERY *, LPDWORD, record_func, LPVOID ); extern MSIRECORD *MSI_QueryGetRecord( MSIDATABASE *db, LPCWSTR query, ... ); -extern UINT MSI_DatabaseImport( MSIDATABASE *, LPCWSTR, LPCWSTR ); -extern UINT MSI_DatabaseExport( MSIDATABASE *, LPCWSTR, LPCWSTR, LPCWSTR ); extern UINT MSI_DatabaseGetPrimaryKeys( MSIDATABASE *, LPCWSTR, MSIRECORD ** ); /* view internals */ @@ -776,7 +767,6 @@ extern UINT MSIREG_OpenFeaturesKey(LPCWSTR szProduct, MSIINSTALLCONTEXT context, HKEY *key, BOOL create); extern UINT MSIREG_OpenUserPatchesKey(LPCWSTR szPatch, HKEY* key, BOOL create); -extern UINT MSIREG_OpenInstallerFeaturesKey(LPCWSTR szProduct, HKEY* key, BOOL create); UINT MSIREG_OpenUserDataFeaturesKey(LPCWSTR szProduct, MSIINSTALLCONTEXT context, HKEY *key, BOOL create); extern UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create); @@ -820,7 +810,6 @@ extern void msi_dialog_check_messages( HANDLE ); extern void msi_dialog_do_preview( msi_dialog* ); extern void msi_dialog_destroy( msi_dialog* ); -extern BOOL msi_dialog_register_class( void ); extern void msi_dialog_unregister_class( void ); extern void msi_dialog_handle_event( msi_dialog*, LPCWSTR, LPCWSTR, MSIRECORD * ); extern UINT msi_dialog_reset( msi_dialog *dialog ); @@ -828,10 +817,6 @@ extern msi_dialog *msi_dialog_get_parent( msi_dialog *dialog ); extern LPWSTR msi_dialog_get_name( msi_dialog *dialog ); extern UINT msi_spawn_error_dialog( MSIPACKAGE*, LPWSTR, LPWSTR ); - -/* preview */ -extern MSIPREVIEW *MSI_EnableUIPreview( MSIDATABASE * ); -extern UINT MSI_PreviewDialogW( MSIPREVIEW *, LPCWSTR ); /* summary information */ extern MSISUMMARYINFO *MSI_GetSummaryInformationW( IStorage *stg, UINT uiUpdateCount ); @@ -1016,10 +1001,8 @@ } MSICABDATA; extern UINT ready_media(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi); -extern UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi); extern void msi_free_media_info(MSIMEDIAINFO *mi); extern BOOL msi_cabextract(MSIPACKAGE* package, MSIMEDIAINFO *mi, LPVOID data); -extern UINT find_published_source(MSIPACKAGE *package, MSIMEDIAINFO *mi); /* control event stuff */ extern VOID ControlEvent_FireSubscribedEvent(MSIPACKAGE *package, LPCWSTR event, Modified: trunk/reactos/dll/win32/msi/msiquery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiquery.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/msiquery.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msiquery.c [iso-8859-1] Sun Jan 18 06:52:01 2009 @@ -91,7 +91,7 @@ UINT r; LPWSTR szwQuery; - TRACE("%ld %s %p\n", hdb, debugstr_a(szQuery), phView); + TRACE("%d %s %p\n", hdb, debugstr_a(szQuery), phView); if( szQuery ) { @@ -388,7 +388,7 @@ MSIRECORD *rec = NULL; UINT ret; - TRACE("%ld %p\n", hView, record); + TRACE("%d %p\n", hView, record); if( !record ) return ERROR_INVALID_PARAMETER; @@ -429,7 +429,7 @@ MSIQUERY *query; UINT ret; - TRACE("%ld\n", hView ); + TRACE("%d\n", hView ); query = msihandle2msiinfo( hView, MSIHANDLETYPE_VIEW ); if( !query ) @@ -462,7 +462,7 @@ MSIRECORD *rec = NULL; UINT ret; - TRACE("%ld %ld\n", hView, hRec); + TRACE("%d %d\n", hView, hRec); query = msihandle2msiinfo( hView, MSIHANDLETYPE_VIEW ); if( !query ) @@ -559,7 +559,7 @@ MSIRECORD *rec = NULL; UINT r; - TRACE("%ld %d %p\n", hView, info, hRec); + TRACE("%d %d %p\n", hView, info, hRec); if( !hRec ) return ERROR_INVALID_PARAMETER; @@ -611,7 +611,7 @@ MSIRECORD *rec = NULL; UINT r = ERROR_FUNCTION_FAILED; - TRACE("%ld %x %ld\n", hView, eModifyMode, hRecord); + TRACE("%d %x %d\n", hView, eModifyMode, hRecord); query = msihandle2msiinfo( hView, MSIHANDLETYPE_VIEW ); if( !query ) @@ -635,7 +635,7 @@ MSIDBERROR r = MSIDBERROR_NOERROR; DWORD len; - FIXME("%ld %p %p - returns empty error string\n", + FIXME("%d %p %p - returns empty error string\n", handle, szColumnNameBuffer, pcchBuf ); if( !pcchBuf ) @@ -667,7 +667,7 @@ MSIDBERROR r = MSIDBERROR_NOERROR; DWORD len; - FIXME("%ld %p %p - returns empty error string\n", + FIXME("%d %p %p - returns empty error string\n", handle, szColumnNameBuffer, pcchBuf ); if( !pcchBuf ) @@ -764,7 +764,7 @@ LPWSTR wstr; UINT ret; - TRACE("%ld %s %d\n", hdb, debugstr_a(szTransformFile), iErrorCond); + TRACE("%d %s %d\n", hdb, debugstr_a(szTransformFile), iErrorCond); wstr = strdupAtoW( szTransformFile ); if( szTransformFile && !wstr ) @@ -780,7 +780,7 @@ UINT WINAPI MsiDatabaseGenerateTransformA( MSIHANDLE hdb, MSIHANDLE hdbref, LPCSTR szTransformFile, int iReserved1, int iReserved2 ) { - FIXME("%ld %ld %s %d %d\n", hdb, hdbref, + FIXME("%d %d %s %d %d\n", hdb, hdbref, debugstr_a(szTransformFile), iReserved1, iReserved2); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -788,7 +788,7 @@ UINT WINAPI MsiDatabaseGenerateTransformW( MSIHANDLE hdb, MSIHANDLE hdbref, LPCWSTR szTransformFile, int iReserved1, int iReserved2 ) { - FIXME("%ld %ld %s %d %d\n", hdb, hdbref, + FIXME("%d %d %s %d %d\n", hdb, hdbref, debugstr_w(szTransformFile), iReserved1, iReserved2); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -798,7 +798,7 @@ MSIDATABASE *db; UINT r; - TRACE("%ld\n", hdb); + TRACE("%d\n", hdb); db = msihandle2msiinfo( hdb, MSIHANDLETYPE_DATABASE ); if( !db ) @@ -904,7 +904,7 @@ MSIDATABASE *db; UINT r; - TRACE("%ld %s %p\n", hdb, debugstr_w(table), phRec); + TRACE("%d %s %p\n", hdb, debugstr_w(table), phRec); db = msihandle2msiinfo( hdb, MSIHANDLETYPE_DATABASE ); if( !db ) @@ -949,7 +949,7 @@ LPWSTR szwTable = NULL; UINT r; - TRACE("%ld %s %p\n", hdb, debugstr_a(table), phRec); + TRACE("%d %s %p\n", hdb, debugstr_a(table), phRec); if( table ) { @@ -969,7 +969,7 @@ LPWSTR szwTableName = NULL; MSICONDITION r; - TRACE("%lx %s\n", hDatabase, debugstr_a(szTableName)); + TRACE("%x %s\n", hDatabase, debugstr_a(szTableName)); if( szTableName ) { @@ -989,7 +989,7 @@ MSIDATABASE *db; MSICONDITION r; - TRACE("%lx %s\n", hDatabase, debugstr_w(szTableName)); + TRACE("%x %s\n", hDatabase, debugstr_w(szTableName)); db = msihandle2msiinfo( hDatabase, MSIHANDLETYPE_DATABASE ); if( !db ) Modified: trunk/reactos/dll/win32/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/package.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/package.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/package.c [iso-8859-1] Sun Jan 18 06:52:01 2009 @@ -1027,7 +1027,7 @@ MSIHANDLE handle = 0; IWineMsiRemotePackage *remote_package; - TRACE("(%ld)\n",hInstall); + TRACE("(%d)\n",hInstall); package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE); if( package) @@ -1486,7 +1486,7 @@ UINT r = ERROR_FUNCTION_FAILED; LPCWSTR val = NULL; - TRACE("%lu %s %p %p\n", handle, debugstr_w(name), + TRACE("%u %s %p %p\n", handle, debugstr_w(name), szValueBuf->str.w, pchValueBuf ); if (!name) @@ -1692,7 +1692,7 @@ static HRESULT WINAPI mrp_SetProperty( IWineMsiRemotePackage *iface, BSTR property, BSTR value ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); - UINT r = MsiSetPropertyW(This->package, (LPWSTR)property, (LPWSTR)value); + UINT r = MsiSetPropertyW(This->package, property, value); return HRESULT_FROM_WIN32(r); } @@ -1706,14 +1706,14 @@ static HRESULT WINAPI mrp_DoAction( IWineMsiRemotePackage *iface, BSTR action ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); - UINT r = MsiDoActionW(This->package, (LPWSTR)action); + UINT r = MsiDoActionW(This->package, action); return HRESULT_FROM_WIN32(r); } static HRESULT WINAPI mrp_Sequence( IWineMsiRemotePackage *iface, BSTR table, int sequence ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); - UINT r = MsiSequenceW(This->package, (LPWSTR)table, sequence); + UINT r = MsiSequenceW(This->package, table, sequence); return HRESULT_FROM_WIN32(r); } @@ -1727,7 +1727,7 @@ static HRESULT WINAPI mrp_SetTargetPath( IWineMsiRemotePackage *iface, BSTR folder, BSTR value) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); - UINT r = MsiSetTargetPathW(This->package, (LPWSTR)folder, (LPWSTR)value); + UINT r = MsiSetTargetPathW(This->package, folder, value); return HRESULT_FROM_WIN32(r); } @@ -1749,14 +1749,14 @@ INSTALLSTATE *installed, INSTALLSTATE *action ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); - UINT r = MsiGetFeatureStateW(This->package, (LPWSTR)feature, installed, action); + UINT r = MsiGetFeatureStateW(This->package, feature, installed, action); return HRESULT_FROM_WIN32(r); } static HRESULT WINAPI mrp_SetFeatureState( IWineMsiRemotePackage *iface, BSTR feature, INSTALLSTATE state ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); - UINT r = MsiSetFeatureStateW(This->package, (LPWSTR)feature, state); + UINT r = MsiSetFeatureStateW(This->package, feature, state); return HRESULT_FROM_WIN32(r); } @@ -1764,14 +1764,14 @@ INSTALLSTATE *installed, INSTALLSTATE *action ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); - UINT r = MsiGetComponentStateW(This->package, (LPWSTR)component, installed, action); + UINT r = MsiGetComponentStateW(This->package, component, installed, action); return HRESULT_FROM_WIN32(r); } static HRESULT WINAPI mrp_SetComponentState( IWineMsiRemotePackage *iface, BSTR component, INSTALLSTATE state ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); - UINT r = MsiSetComponentStateW(This->package, (LPWSTR)component, state); + UINT r = MsiSetComponentStateW(This->package, component, state); return HRESULT_FROM_WIN32(r); } @@ -1809,7 +1809,7 @@ static HRESULT WINAPI mrp_EvaluateCondition( IWineMsiRemotePackage *iface, BSTR condition ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); - UINT r = MsiEvaluateConditionW(This->package, (LPWSTR)condition); + UINT r = MsiEvaluateConditionW(This->package, condition); return HRESULT_FROM_WIN32(r); } Modified: trunk/reactos/dll/win32/msi/preview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/preview.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/preview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/preview.c [iso-8859-1] Sun Jan 18 06:52:01 2009 @@ -41,7 +41,7 @@ msiobj_release( &preview->package->hdr ); } -MSIPREVIEW *MSI_EnableUIPreview( MSIDATABASE *db ) +static MSIPREVIEW *MSI_EnableUIPreview( MSIDATABASE *db ) { MSIPREVIEW *preview = NULL; MSIPACKAGE *package; @@ -68,7 +68,7 @@ MSIPREVIEW *preview; UINT r = ERROR_FUNCTION_FAILED; - TRACE("%ld %p\n", hdb, phPreview); + TRACE("%d %p\n", hdb, phPreview); db = msihandle2msiinfo( hdb, MSIHANDLETYPE_DATABASE ); if( !db ) @@ -109,7 +109,7 @@ return ERROR_SUCCESS; } -UINT MSI_PreviewDialogW( MSIPREVIEW *preview, LPCWSTR szDialogName ) +static UINT MSI_PreviewDialogW( MSIPREVIEW *preview, LPCWSTR szDialogName ) { msi_dialog *dialog = NULL; UINT r = ERROR_SUCCESS; @@ -137,7 +137,7 @@ MSIPREVIEW *preview; UINT r; - TRACE("%ld %s\n", hPreview, debugstr_w(szDialogName)); + TRACE("%d %s\n", hPreview, debugstr_w(szDialogName)); preview = msihandle2msiinfo( hPreview, MSIHANDLETYPE_PREVIEW ); if( !preview ) @@ -155,7 +155,7 @@ UINT r; LPWSTR strW = NULL; - TRACE("%ld %s\n", hPreview, debugstr_a(szDialogName)); + TRACE("%d %s\n", hPreview, debugstr_a(szDialogName)); if( szDialogName ) { @@ -171,7 +171,7 @@ UINT WINAPI MsiPreviewBillboardW( MSIHANDLE hPreview, LPCWSTR szControlName, LPCWSTR szBillboard) { - FIXME("%ld %s %s\n", hPreview, debugstr_w(szControlName), + FIXME("%d %s %s\n", hPreview, debugstr_w(szControlName), debugstr_w(szBillboard)); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -179,7 +179,7 @@ UINT WINAPI MsiPreviewBillboardA( MSIHANDLE hPreview, LPCSTR szControlName, LPCSTR szBillboard) { - FIXME("%ld %s %s\n", hPreview, debugstr_a(szControlName), + FIXME("%d %s %s\n", hPreview, debugstr_a(szControlName), debugstr_a(szBillboard)); return ERROR_CALL_NOT_IMPLEMENTED; } Modified: trunk/reactos/dll/win32/msi/record.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/record.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/record.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/record.c [iso-8859-1] Sun Jan 18 06:52:01 2009 @@ -116,7 +116,7 @@ MSIRECORD *rec; UINT ret; - TRACE("%ld\n", handle ); + TRACE("%d\n", handle ); rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD ); if( !rec ) @@ -229,7 +229,7 @@ MSIRECORD *rec; UINT ret; - TRACE("%ld %d\n", handle, iField ); + TRACE("%d %d\n", handle, iField ); rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD ); if( !rec ) @@ -248,7 +248,7 @@ MSIRECORD *rec; UINT i; - TRACE("%ld\n", handle ); + TRACE("%d\n", handle ); rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD ); if( !rec ) @@ -286,7 +286,7 @@ MSIRECORD *rec; UINT ret; - TRACE("%ld %u %d\n", handle, iField, iVal); + TRACE("%d %u %d\n", handle, iField, iVal); rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD ); if( !rec ) @@ -316,7 +316,7 @@ MSIRECORD *rec; UINT ret; - TRACE("%ld %d\n", handle, iField ); + TRACE("%d %d\n", handle, iField ); rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD ); if( !rec ) @@ -388,7 +388,7 @@ MSIRECORD *rec; UINT ret; - TRACE("%ld %d %p %p\n", handle, iField, szValue, pcchValue); + TRACE("%d %d %p %p\n", handle, iField, szValue, pcchValue); rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD ); if( !rec ) @@ -464,7 +464,7 @@ MSIRECORD *rec; UINT ret; - TRACE("%ld %d %p %p\n", handle, iField, szValue, pcchValue); + TRACE("%d %d %p %p\n", handle, iField, szValue, pcchValue); rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD ); if( !rec ) @@ -488,7 +488,7 @@ return stat.cbSize.QuadPart; } -UINT MSI_RecordDataSize(MSIRECORD *rec, UINT iField) +static UINT MSI_RecordDataSize(MSIRECORD *rec, UINT iField) { TRACE("%p %d\n", rec, iField); @@ -514,7 +514,7 @@ MSIRECORD *rec; UINT ret; - TRACE("%ld %d\n", handle, iField); + TRACE("%d %d\n", handle, iField); rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD ); if( !rec ) @@ -526,7 +526,7 @@ return ret; } -UINT MSI_RecordSetStringA( MSIRECORD *rec, UINT iField, LPCSTR szValue ) +static UINT MSI_RecordSetStringA( MSIRECORD *rec, UINT iField, LPCSTR szValue ) { LPWSTR str; @@ -556,7 +556,7 @@ MSIRECORD *rec; UINT ret; - TRACE("%ld %d %s\n", handle, iField, debugstr_a(szValue)); + TRACE("%d %d %s\n", handle, iField, debugstr_a(szValue)); rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD ); if( !rec ) @@ -599,7 +599,7 @@ MSIRECORD *rec; UINT ret; - TRACE("%ld %d %s\n", handle, iField, debugstr_w(szValue)); + TRACE("%d %d %s\n", handle, iField, debugstr_w(szValue)); rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD ); if( !rec ) @@ -662,7 +662,7 @@ return ERROR_SUCCESS; } -UINT MSI_RecordSetStream(MSIRECORD *rec, UINT iField, IStream *stream) +static UINT MSI_RecordSetStream(MSIRECORD *rec, UINT iField, IStream *stream) { if ( (iField == 0) || (iField > rec->count) ) return ERROR_INVALID_PARAMETER; @@ -719,7 +719,7 @@ LPWSTR wstr = NULL; UINT ret; - TRACE("%ld %d %s\n", hRecord, iField, debugstr_a(szFilename)); + TRACE("%d %d %s\n", hRecord, iField, debugstr_a(szFilename)); if( szFilename ) { @@ -738,7 +738,7 @@ MSIRECORD *rec; UINT ret; - TRACE("%ld %d %s\n", handle, iField, debugstr_w(szFilename)); + TRACE("%d %d %s\n", handle, iField, debugstr_w(szFilename)); rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD ); if( !rec ) @@ -808,7 +808,7 @@ MSIRECORD *rec; UINT ret; - TRACE("%ld %d %p %p\n", handle, iField, buf, sz); + TRACE("%d %d %p %p\n", handle, iField, buf, sz); rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD ); if( !rec ) Modified: trunk/reactos/dll/win32/msi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/registry.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/registry.c [iso-8859-1] Sun Jan 18 06:52:01 2009 @@ -475,7 +475,7 @@ return ERROR_FUNCTION_FAILED; size = sizeof(buf); - if (!GetTokenInformation(token, TokenUser, (void *)buf, size, &size)) { + if (!GetTokenInformation(token, TokenUser, buf, size, &size)) { CloseHandle(token); return ERROR_FUNCTION_FAILED; } @@ -653,7 +653,7 @@ return RegDeleteTreeW(HKEY_CURRENT_USER, keypath); } -UINT MSIREG_OpenInstallerFeaturesKey(LPCWSTR szProduct, HKEY* key, BOOL create) +static UINT MSIREG_OpenInstallerFeaturesKey(LPCWSTR szProduct, HKEY* key, BOOL create) { UINT rc; WCHAR squished_pc[GUID_SIZE]; Modified: trunk/reactos/dll/win32/msi/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/string.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/string.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/string.c [iso-8859-1] Sun Jan 18 06:52:01 2009 @@ -179,6 +179,34 @@ st->freeslot = n + 1; } +static UINT msi_string2idA( const string_table *st, LPCSTR buffer, UINT *id ) +{ + DWORD sz; + UINT r = ERROR_INVALID_PARAMETER; + LPWSTR str; + + TRACE("Finding string %s in string table\n", debugstr_a(buffer) ); + + if( buffer[0] == 0 ) + { + *id = 0; + return ERROR_SUCCESS; + } + + sz = MultiByteToWideChar( st->codepage, 0, buffer, -1, NULL, 0 ); + if( sz <= 0 ) + return r; + str = msi_alloc( sz*sizeof(WCHAR) ); + if( !str ) + return ERROR_NOT_ENOUGH_MEMORY; + MultiByteToWideChar( st->codepage, 0, buffer, -1, str, sz ); + + r = msi_string2idW( st, str, id ); + msi_free( str ); + + return r; +} + static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, UINT refcount, enum StringPersistence persistence ) { LPWSTR str; @@ -350,7 +378,7 @@ * The size includes the terminating nul character. Short buffers * will be filled, but not nul terminated. */ -UINT msi_id2stringA( const string_table *st, UINT id, LPSTR buffer, UINT *sz ) +static UINT msi_id2stringA( const string_table *st, UINT id, LPSTR buffer, UINT *sz ) { UINT len; const WCHAR *str; @@ -407,34 +435,6 @@ } return ERROR_INVALID_PARAMETER; -} - -UINT msi_string2idA( const string_table *st, LPCSTR buffer, UINT *id ) -{ - DWORD sz; - UINT r = ERROR_INVALID_PARAMETER; - LPWSTR str; - - TRACE("Finding string %s in string table\n", debugstr_a(buffer) ); - - if( buffer[0] == 0 ) - { - *id = 0; - return ERROR_SUCCESS; - } - - sz = MultiByteToWideChar( st->codepage, 0, buffer, -1, NULL, 0 ); - if( sz <= 0 ) - return r; - str = msi_alloc( sz*sizeof(WCHAR) ); - if( !str ) - return ERROR_NOT_ENOUGH_MEMORY; - MultiByteToWideChar( st->codepage, 0, buffer, -1, str, sz ); - - r = msi_string2idW( st, str, id ); - msi_free( str ); - - return r; } UINT msi_strcmp( const string_table *st, UINT lval, UINT rval, UINT *res ) Modified: trunk/reactos/dll/win32/msi/suminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/suminfo.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/suminfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/suminfo.c [iso-8859-1] Sun Jan 18 06:52:01 2009 @@ -466,7 +466,7 @@ MSIDATABASE *db; UINT ret = ERROR_FUNCTION_FAILED; - TRACE("%ld %s %d %p\n", hDatabase, debugstr_w(szDatabase), + TRACE("%d %s %d %p\n", hDatabase, debugstr_w(szDatabase), uiUpdateCount, pHandle); if( !pHandle ) @@ -529,7 +529,7 @@ LPWSTR szwDatabase = NULL; UINT ret; - TRACE("%ld %s %d %p\n", hDatabase, debugstr_a(szDatabase), + TRACE("%d %s %d %p\n", hDatabase, debugstr_a(szDatabase), uiUpdateCount, pHandle); if( szDatabase ) @@ -550,7 +550,7 @@ { MSISUMMARYINFO *si; - TRACE("%ld %p\n", hSummaryInfo, pCount); + TRACE("%d %p\n", hSummaryInfo, pCount); si = msihandle2msiinfo( hSummaryInfo, MSIHANDLETYPE_SUMMARYINFO ); if( !si ) @@ -570,7 +570,7 @@ PROPVARIANT *prop; UINT ret = ERROR_SUCCESS; - TRACE("%ld %d %p %p %p %p %p\n", handle, uiProperty, puiDataType, + TRACE("%d %d %p %p %p %p %p\n", handle, uiProperty, puiDataType, piValue, pftValue, str, pcchValueBuf); if ( uiProperty >= MSI_MAX_PROPS ) @@ -668,7 +668,7 @@ { awstring str; - TRACE("%ld %d %p %p %p %p %p\n", handle, uiProperty, puiDataType, + TRACE("%d %d %p %p %p %p %p\n", handle, uiProperty, puiDataType, piValue, pftValue, szValueBuf, pcchValueBuf ); str.unicode = FALSE; @@ -684,7 +684,7 @@ { awstring str; - TRACE("%ld %d %p %p %p %p %p\n", handle, uiProperty, puiDataType, + TRACE("%d %d %p %p %p %p %p\n", handle, uiProperty, puiDataType, piValue, pftValue, szValueBuf, pcchValueBuf ); str.unicode = TRUE; @@ -701,7 +701,7 @@ PROPVARIANT *prop; UINT type, len, ret = ERROR_SUCCESS; - TRACE("%ld %u %u %i %p %p\n", handle, uiProperty, uiDataType, + TRACE("%d %u %u %i %p %p\n", handle, uiProperty, uiDataType, iValue, pftValue, str ); type = get_type( uiProperty ); @@ -773,7 +773,7 @@ { awcstring str; - TRACE("%ld %u %u %i %p %s\n", handle, uiProperty, uiDataType, + TRACE("%d %u %u %i %p %s\n", handle, uiProperty, uiDataType, iValue, pftValue, debugstr_w(szValue) ); str.unicode = TRUE; @@ -786,7 +786,7 @@ { awcstring str; - TRACE("%ld %u %u %i %p %s\n", handle, uiProperty, uiDataType, + TRACE("%d %u %u %i %p %s\n", handle, uiProperty, uiDataType, iValue, pftValue, debugstr_a(szValue) ); str.unicode = FALSE; @@ -802,7 +802,7 @@ HRESULT r; UINT ret = ERROR_FUNCTION_FAILED; - TRACE("%ld\n", handle ); + TRACE("%d\n", handle ); si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO ); if( !si ) Modified: trunk/reactos/dll/win32/msi/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/table.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/table.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/table.c [iso-8859-1] Sun Jan 18 06:52:01 2009 @@ -148,7 +148,7 @@ return -1; } -LPWSTR encode_streamname(BOOL bTable, LPCWSTR in) +static LPWSTR encode_streamname(BOOL bTable, LPCWSTR in) { DWORD count = MAX_STREAM_NAME; DWORD ch, next; @@ -326,7 +326,7 @@ return ret; } -UINT db_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm ) +static UINT db_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm ) { LPWSTR encname; HRESULT r; Modified: trunk/reactos/dll/win32/msi/upgrade.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/upgrade.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/upgrade.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/upgrade.c [iso-8859-1] Sun Jan 18 06:52:01 2009 @@ -101,7 +101,7 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param) { - MSIPACKAGE *package = (MSIPACKAGE*)param; + MSIPACKAGE *package = param; WCHAR product[GUID_SIZE]; DWORD index = 0; DWORD attributes = 0;

1 0

[dchapyshev] 38888: - Implement pSetupGuidFromString - Implement pSetupStringFromGuid - Implement pSetupIsGuidNull
by dchapyshev＠svn.reactos.org 18 Jan '09

18 Jan '09

Author: dchapyshev Date: Sun Jan 18 06:50:56 2009 New Revision: 38888 URL: http://svn.reactos.org/svn/reactos?rev=38888&view=rev Log: - Implement pSetupGuidFromString - Implement pSetupStringFromGuid - Implement pSetupIsGuidNull Modified: trunk/reactos/dll/win32/setupapi/misc.c trunk/reactos/dll/win32/setupapi/setupapi.spec Modified: trunk/reactos/dll/win32/setupapi/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/misc.c?… ============================================================================== --- trunk/reactos/dll/win32/setupapi/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/misc.c [iso-8859-1] Sun Jan 18 06:50:56 2009 @@ -1595,3 +1595,93 @@ TRACE("%s -> %s %d\n", debugstr_w(source), debugstr_w(target), comp); return ret; } + +/* + * implemented (used by pSetupGuidFromString) + */ +static BOOL TrimGuidString(PCWSTR szString, LPWSTR szNewString) +{ + WCHAR szBuffer[39]; + INT Index; + + if (wcslen(szString) == 38) + { + if ((szString[0] == L'{') && (szString[37] == L'}')) + { + for (Index = 0; Index < wcslen(szString); Index++) + szBuffer[Index] = szString[Index + 1]; + + szBuffer[36] = L'\0'; + wcscpy(szNewString, szBuffer); + return TRUE; + } + } + wcscpy(szNewString, L"\0"); + return FALSE; +} + +/* + * implemented + */ +DWORD +WINAPI +pSetupGuidFromString(PCWSTR pString, LPGUID lpGUID) +{ + RPC_STATUS Status; + WCHAR szBuffer[39]; + + if (!TrimGuidString(pString, szBuffer)) + { + return RPC_S_INVALID_STRING_UUID; + } + + Status = UuidFromStringW(szBuffer, lpGUID); + if (Status != RPC_S_OK) + { + return RPC_S_INVALID_STRING_UUID; + } + + return NO_ERROR; +} + +/* + * implemented + */ +DWORD +WINAPI +pSetupStringFromGuid(LPGUID lpGUID, PWSTR pString, DWORD dwStringLen) +{ + RPC_STATUS Status; + RPC_WSTR rpcBuffer; + WCHAR szBuffer[39]; + + if (dwStringLen < 39) + { + return ERROR_INSUFFICIENT_BUFFER; + } + + Status = UuidToStringW(lpGUID, &rpcBuffer); + if (Status != RPC_S_OK) + { + return Status; + } + + wcscpy(szBuffer, L"{"); + wcscat(szBuffer, rpcBuffer); + wcscat(szBuffer, L"}\0"); + + wcscpy(pString, szBuffer); + + RpcStringFreeW(&rpcBuffer); + return NO_ERROR; +} + +/* + * implemented + */ +BOOL +WINAPI +pSetupIsGuidNull(LPGUID lpGUID) +{ + return IsEqualGUID(lpGUID, &GUID_NULL); +} Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Sun Jan 18 06:50:56 2009 @@ -557,11 +557,11 @@ @ stub pSetupGetOsLoaderDriveAndPath @ stdcall pSetupGetQueueFlags(ptr) @ stub pSetupGetVersionDatum -@ stub pSetupGuidFromString -@ stub pSetupIsGuidNull +@ stdcall pSetupGuidFromString(wstr ptr) +@ stdcall pSetupIsGuidNull(ptr) @ stub pSetupMakeSurePathExists @ stdcall pSetupSetGlobalFlags(long) @ stdcall pSetupSetQueueFlags(ptr long) @ stub pSetupSetSystemSourceFlags -@ stub pSetupStringFromGuid +@ stdcall pSetupStringFromGuid(ptr wstr long) @ stub pSetupVerifyQueuedCatalogs

1 0

[sginsberg] 38887: - Fix warnings in ros' tests
by sginsberg＠svn.reactos.org 18 Jan '09

18 Jan '09

Author: sginsberg Date: Sun Jan 18 06:20:51 2009 New Revision: 38887 URL: http://svn.reactos.org/svn/reactos?rev=38887&view=rev Log: - Fix warnings in ros' tests Modified: trunk/rostests/dibtests/palbitblt/pal.c trunk/rostests/dibtests/palbitblt/palbitblt.rbuild trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c trunk/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild trunk/rostests/tests/regqueryvalue/regqueryvalue.c trunk/rostests/tests/regqueryvalue/regqueryvalue.rbuild trunk/rostests/tests/subclass/subclass.c trunk/rostests/tests/subclass/subclass.rbuild trunk/rostests/win32/kernel32/queuetest/queuetest.c trunk/rostests/win32/kernel32/queuetest/queuetest.rbuild Modified: trunk/rostests/dibtests/palbitblt/pal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/palbitblt/pal.c?… ============================================================================== --- trunk/rostests/dibtests/palbitblt/pal.c [iso-8859-1] (original) +++ trunk/rostests/dibtests/palbitblt/pal.c [iso-8859-1] Sun Jan 18 06:20:51 2009 @@ -77,7 +77,7 @@ DoBlt(hBM); } -void InitBitmap(HANDLE *hBM){ +void InitBitmap(HBITMAP *hBM){ HPALETTE PalHan; HWND ActiveWindow; HDC hDC; Modified: trunk/rostests/dibtests/palbitblt/palbitblt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/palbitblt/palbit… ============================================================================== --- trunk/rostests/dibtests/palbitblt/palbitblt.rbuild [iso-8859-1] (original) +++ trunk/rostests/dibtests/palbitblt/palbitblt.rbuild [iso-8859-1] Sun Jan 18 06:20:51 2009 @@ -1,4 +1,4 @@ -<module name="palbitblt" type="win32gui" installbase="bin" installname="palbitblt.exe" allowwarnings="true" stdlib="host"> +<module name="palbitblt" type="win32gui" installbase="bin" installname="palbitblt.exe" stdlib="host"> <define name="__USE_W32API" /> <library>kernel32</library> <library>user32</library> Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/NtGdi… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c [iso-8859-1] (original) +++ trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c [iso-8859-1] Sun Jan 18 06:20:51 2009 @@ -34,7 +34,7 @@ retValue = OsThunkDdCanCreateSurface(hDirectDrawLocal,(PDD_CANCREATESURFACEDATA)&pCanCreateSurface); testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"3. NtGdiDdCanCreateSurface(hDirectDrawLocal,pCanCreateSurface);\0"); - pCanCreateSurface.lpDDSurfaceDesc = &desc; + pCanCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&desc; desc.dwSize = sizeof(DDSURFACEDESC2); retValue = OsThunkDdCanCreateSurface(hDirectDrawLocal,(PDD_CANCREATESURFACEDATA)&pCanCreateSurface); Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/NtGdi… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c [iso-8859-1] (original) +++ trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c [iso-8859-1] Sun Jan 18 06:20:51 2009 @@ -54,10 +54,7 @@ D3DNTHAL_GLOBALDRIVERDATA D3dDriverData; DD_D3DBUFCALLBACKS D3dBufferCallbacks; DDSURFACEDESC2 D3dTextureFormats[100]; - DWORD NumHeaps = 0; VIDEOMEMORY vmList; - DWORD NumFourCC = 0; - DWORD FourCC = 0; /* clear data */ memset(&vmList,0,sizeof(VIDEOMEMORY)); Modified: trunk/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/win32… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild [iso-8859-1] (original) +++ trunk/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild [iso-8859-1] Sun Jan 18 06:20:51 2009 @@ -1,4 +1,4 @@ -<module name="win32kdxtest" type="win32cui" installbase="bin" installname="win32kdxtest.exe" allowwarnings ="true" > +<module name="win32kdxtest" type="win32cui" installbase="bin" installname="win32kdxtest.exe"> <include base="win32kdxtest">.</include> <library>kernel32</library> <library>user32</library> Modified: trunk/rostests/tests/regqueryvalue/regqueryvalue.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/regqueryvalue/regqu… ============================================================================== --- trunk/rostests/tests/regqueryvalue/regqueryvalue.c [iso-8859-1] (original) +++ trunk/rostests/tests/regqueryvalue/regqueryvalue.c [iso-8859-1] Sun Jan 18 06:20:51 2009 @@ -10,7 +10,7 @@ PWCHAR WcharResult; WCHAR ValueNameWC[100]; PCHAR CharResult; - HANDLE RegKey; + HKEY RegKey; int i; if( argc < 2 ) { @@ -56,7 +56,7 @@ return 7; } - RegQueryValueExA( RegKey, argv[2], NULL, NULL, CharResult, &ResultSize ); + RegQueryValueExA( RegKey, argv[2], NULL, NULL, (PBYTE)CharResult, &ResultSize ); printf( " char Value: %s\n", CharResult ); fflush( stdout ); Modified: trunk/rostests/tests/regqueryvalue/regqueryvalue.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/regqueryvalue/regqu… ============================================================================== --- trunk/rostests/tests/regqueryvalue/regqueryvalue.rbuild [iso-8859-1] (original) +++ trunk/rostests/tests/regqueryvalue/regqueryvalue.rbuild [iso-8859-1] Sun Jan 18 06:20:51 2009 @@ -1,4 +1,4 @@ -<module name="regqueryvalue" type="win32gui" installbase="bin" installname="regqueryvalue.exe" allowwarnings="true"> +<module name="regqueryvalue" type="win32gui" installbase="bin" installname="regqueryvalue.exe"> <define name="__USE_W32API" /> <library>kernel32</library> <library>user32</library> Modified: trunk/rostests/tests/subclass/subclass.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/subclass/subclass.c… ============================================================================== --- trunk/rostests/tests/subclass/subclass.c [iso-8859-1] (original) +++ trunk/rostests/tests/subclass/subclass.c [iso-8859-1] Sun Jan 18 06:20:51 2009 @@ -15,7 +15,6 @@ int nCmdShow) { WNDCLASSW wc; - MSG msg; HWND hWnd; WCHAR WindowTextW[256]; char WindowTextA[256]; @@ -32,11 +31,11 @@ wc.cbWndExtra = 0; if (RegisterClassW(&wc) == 0) { - fprintf(stderr, "RegisterClassW failed (last error 0x%X)\n", + fprintf(stderr, "RegisterClassW failed (last error 0x%lu)\n", GetLastError()); return 1; } - printf("Unicode class registered, WndProc = 0x%08x\n", wc.lpfnWndProc); + printf("Unicode class registered, WndProc = 0x%p\n", wc.lpfnWndProc); hWnd = CreateWindowA("UnicodeClass", "Unicode Window", @@ -51,7 +50,7 @@ NULL); if (hWnd == NULL) { - fprintf(stderr, "CreateWindowA failed (last error 0x%X)\n", + fprintf(stderr, "CreateWindowA failed (last error 0x%lu)\n", GetLastError()); return 1; } @@ -61,7 +60,7 @@ printf("Calling GetWindowTextW\n"); if (! GetWindowTextW(hWnd, WindowTextW, sizeof(WindowTextW) / sizeof(WindowTextW[0]))) { - fprintf(stderr, "GetWindowTextW failed (last error 0x%X)\n", GetLastError()); + fprintf(stderr, "GetWindowTextW failed (last error 0x%lu)\n", GetLastError()); return 1; } printf("GetWindowTextW returned Unicode string \"%S\"\n", WindowTextW); @@ -69,43 +68,43 @@ printf("Calling GetWindowTextA\n"); if (! GetWindowTextA(hWnd, WindowTextA, sizeof(WindowTextA) / sizeof(WindowTextA[0]))) { - fprintf(stderr, "GetWindowTextA failed (last error 0x%X)\n", GetLastError()); + fprintf(stderr, "GetWindowTextA failed (last error 0x%lu)\n", GetLastError()); return 1; } printf("GetWindowTextA returned Ansi string \"%s\"\n", WindowTextA); printf("\n"); SavedWndProcW = (WNDPROC) GetWindowLongW(hWnd, GWL_WNDPROC); - printf("GetWindowLongW returned 0x%08x\n", SavedWndProcW); + printf("GetWindowLongW returned 0x%p\n", SavedWndProcW); SavedWndProcA = (WNDPROC) GetWindowLongA(hWnd, GWL_WNDPROC); - printf("GetWindowLongA returned 0x%08x\n", SavedWndProcA); + printf("GetWindowLongA returned 0x%p\n", SavedWndProcA); printf("\n"); - printf("Subclassing window using SetWindowLongW, new WndProc 0x%08x\n", UnicodeSubclassProc); + printf("Subclassing window using SetWindowLongW, new WndProc 0x%p\n", UnicodeSubclassProc); SetWindowLongW(hWnd, GWL_WNDPROC, (LONG) UnicodeSubclassProc); - printf("After subclass, IsWindowUnicode %s, WndProcA 0x%08x, WndProcW 0x%08x\n", + printf("After subclass, IsWindowUnicode %s, WndProcA 0x%lx, WndProcW 0x%lx\n", IsWindowUnicode(hWnd) ? "TRUE" : "FALSE", GetWindowLongA(hWnd, GWL_WNDPROC), GetWindowLongW(hWnd, GWL_WNDPROC)); printf("Calling GetWindowTextW\n"); if (! GetWindowTextW(hWnd, WindowTextW, sizeof(WindowTextW) / sizeof(WindowTextW[0]))) { - fprintf(stderr, "GetWindowTextW failed (last error 0x%X)\n", GetLastError()); + fprintf(stderr, "GetWindowTextW failed (last error 0x%lu)\n", GetLastError()); return 1; } printf("GetWindowTextW returned Unicode string \"%S\"\n", WindowTextW); printf("\n"); - printf("Subclassing window using SetWindowLongA, new WndProc 0x%08x\n", AnsiSubclassProc); + printf("Subclassing window using SetWindowLongA, new WndProc 0x%p\n", AnsiSubclassProc); SetWindowLongA(hWnd, GWL_WNDPROC, (LONG) AnsiSubclassProc); - printf("After subclass, IsWindowUnicode %s, WndProcA 0x%08x, WndProcW 0x%08x\n", + printf("After subclass, IsWindowUnicode %s, WndProcA 0x%lx, WndProcW 0x%lx\n", IsWindowUnicode(hWnd) ? "TRUE" : "FALSE", GetWindowLongA(hWnd, GWL_WNDPROC), GetWindowLongW(hWnd, GWL_WNDPROC)); printf("Calling GetWindowTextW\n"); if (! GetWindowTextW(hWnd, WindowTextW, sizeof(WindowTextW) / sizeof(WindowTextW[0]))) { - fprintf(stderr, "GetWindowTextW failed (last error 0x%X)\n", GetLastError()); + fprintf(stderr, "GetWindowTextW failed (last error 0x%lu)\n", GetLastError()); return 1; } printf("GetWindowTextW returned Unicode string \"%S\"\n", WindowTextW); Modified: trunk/rostests/tests/subclass/subclass.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/subclass/subclass.r… ============================================================================== --- trunk/rostests/tests/subclass/subclass.rbuild [iso-8859-1] (original) +++ trunk/rostests/tests/subclass/subclass.rbuild [iso-8859-1] Sun Jan 18 06:20:51 2009 @@ -1,4 +1,4 @@ -<module name="subclass" type="win32gui" installbase="bin" installname="subclass.exe" allowwarnings="true"> +<module name="subclass" type="win32gui" installbase="bin" installname="subclass.exe"> <define name="__USE_W32API" /> <library>kernel32</library> <library>user32</library> Modified: trunk/rostests/win32/kernel32/queuetest/queuetest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/kernel32/queuetest/… ============================================================================== --- trunk/rostests/win32/kernel32/queuetest/queuetest.c [iso-8859-1] (original) +++ trunk/rostests/win32/kernel32/queuetest/queuetest.c [iso-8859-1] Sun Jan 18 06:20:51 2009 @@ -15,7 +15,7 @@ #define TestProc(n) \ DWORD CALLBACK TestProc##n(void *ctx)\ {\ - printf("TestProc%d thread 0x%x context 0x%p\n", n, GetCurrentThreadId(), ctx);\ + printf("TestProc%d thread 0x%lu context 0x%p\n", n, GetCurrentThreadId(), ctx);\ return 0;\ } Modified: trunk/rostests/win32/kernel32/queuetest/queuetest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/kernel32/queuetest/… ============================================================================== --- trunk/rostests/win32/kernel32/queuetest/queuetest.rbuild [iso-8859-1] (original) +++ trunk/rostests/win32/kernel32/queuetest/queuetest.rbuild [iso-8859-1] Sun Jan 18 06:20:51 2009 @@ -1,4 +1,4 @@ -<module name="queuetest" type="win32cui" installbase="system32" installname="queuetest.exe" allowwarnings="true"> +<module name="queuetest" type="win32cui" installbase="system32" installname="queuetest.exe"> <define name="__USE_W32API" /> <library>kernel32</library> <file>queuetest.c</file>

1 0

[arty] 38886: Prevent a null access when the first show-desktop is called. Hidden by low-memory mapped in csrss.
by arty＠svn.reactos.org 18 Jan '09

18 Jan '09

Author: arty Date: Sun Jan 18 06:11:32 2009 New Revision: 38886 URL: http://svn.reactos.org/svn/reactos?rev=38886&view=rev Log: Prevent a null access when the first show-desktop is called. Hidden by low-memory mapped in csrss. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Sun Jan 18 06:11:32 2009 @@ -885,6 +885,7 @@ HDC Dc; RECT CopyRect; RECT TempRect; + PWINDOW_OBJECT Ancestor; ASSERT_REFS_CO(Window); @@ -923,11 +924,10 @@ return FALSE; } + Ancestor = UserGetAncestor(Window, GA_PARENT); if ((WinPos.flags & (SWP_NOZORDER | SWP_HIDEWINDOW | SWP_SHOWWINDOW)) != SWP_NOZORDER && -// UserGetAncestor(WinPos.hwnd, GA_PARENT) == IntGetDesktopWindow()) -//faxme: is WinPos.hwnd constant?? (WinPos.hwnd = Window->hSelf above) - UserGetAncestor(Window, GA_PARENT)->hSelf == IntGetDesktopWindow()) + Ancestor && Ancestor->hSelf == IntGetDesktopWindow()) { WinPos.hwndInsertAfter = WinPosDoOwnedPopups(WinPos.hwnd, WinPos.hwndInsertAfter); }

1 0

[cwittich] 38885: remove allowwarnings=true
by cwittich＠svn.reactos.org 18 Jan '09

18 Jan '09

Author: cwittich Date: Sun Jan 18 06:09:55 2009 New Revision: 38885 URL: http://svn.reactos.org/svn/reactos?rev=38885&view=rev Log: remove allowwarnings=true Modified: trunk/reactos/base/services/rpcss/rpcss.rbuild Modified: trunk/reactos/base/services/rpcss/rpcss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss.… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/rpcss.rbuild [iso-8859-1] Sun Jan 18 06:09:55 2009 @@ -18,9 +18,9 @@ <file>irot.idl</file> <file>rpcss.rc</file> </module> -<module name="rpcss_epm_server" type="rpcserver" allowwarnings="true"> +<module name="rpcss_epm_server" type="rpcserver"> <file>epm.idl</file> </module> -<module name="rpcss_irot_server" type="rpcserver" allowwarnings="true"> +<module name="rpcss_irot_server" type="rpcserver"> <file>irot.idl</file> </module>

1 0

[cwittich] 38884: warning fixes
by cwittich＠svn.reactos.org 18 Jan '09

18 Jan '09

Author: cwittich Date: Sun Jan 18 06:08:55 2009 New Revision: 38884 URL: http://svn.reactos.org/svn/reactos?rev=38884&view=rev Log: warning fixes Modified: trunk/reactos/tools/widl/proxy.c trunk/reactos/tools/widl/server.c Modified: trunk/reactos/tools/widl/proxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/proxy.c?rev=388… ============================================================================== --- trunk/reactos/tools/widl/proxy.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/proxy.c [iso-8859-1] Sun Jan 18 06:08:55 2009 @@ -122,10 +122,12 @@ print_proxy( " void *This;\n"); print_proxy( "};\n"); print_proxy( "\n"); + print_proxy("#ifndef USE_COMPILER_EXCEPTIONS\n"); print_proxy("static int __proxy_filter( struct __proxy_frame *__frame )\n"); print_proxy( "{\n"); print_proxy( " return (__frame->_StubMsg.dwStubPhase != PROXY_SENDRECEIVE);\n"); print_proxy( "}\n"); + print_proxy("#endif /* USE_COMPILER_EXCEPTIONS */\n"); print_proxy( "\n"); } Modified: trunk/reactos/tools/widl/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/server.c?rev=38… ============================================================================== --- trunk/reactos/tools/widl/server.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/server.c [iso-8859-1] Sun Jan 18 06:08:55 2009 @@ -391,10 +391,12 @@ print_server(" MIDL_STUB_MESSAGE _StubMsg;\n"); print_server("};\n"); print_server("\n"); + print_server("#ifndef USE_COMPILER_EXCEPTIONS\n"); print_server("static int __server_filter( struct __server_frame *__frame )\n"); print_server( "{\n"); print_server( " return RPC_BAD_STUB_DATA_EXCEPTION_FILTER;\n"); print_server( "}\n"); + print_server( "#endif /* USE_COMPILER_EXCEPTIONS */\n"); print_server( "\n"); }

1 0

[dchapyshev] 38883: - Fix bug with addition of keyboard layouts
by dchapyshev＠svn.reactos.org 18 Jan '09

18 Jan '09

Author: dchapyshev Date: Sun Jan 18 05:20:32 2009 New Revision: 38883 URL: http://svn.reactos.org/svn/reactos?rev=38883&view=rev Log: - Fix bug with addition of keyboard layouts Modified: trunk/reactos/dll/cpl/input/add.c trunk/reactos/dll/cpl/input/settings.c Modified: trunk/reactos/dll/cpl/input/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/add.c?rev=38… ============================================================================== --- trunk/reactos/dll/cpl/input/add.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/add.c [iso-8859-1] Sun Jan 18 05:20:32 2009 @@ -106,14 +106,39 @@ return; } - if (GetLayoutName(LangID, Layout)) - { - if ((SendMessage(hLayoutList, CB_SELECTSTRING, (WPARAM) -1, (LPARAM)Layout) != CB_ERR)&& - (GetLayoutCount(Lang) >= 1)) - { - wsprintf(SubPath, _T("d%03d%s"), GetLayoutCount(Lang)-1, Lang); + if (_tcscmp(LangID, pts) != 0) + { + if (!GetLayoutName(pts, Layout)) + { + RegCloseKey(hKey); + return; + } + } + else + { + if (!GetLayoutName(LangID, Layout)) + { + RegCloseKey(hKey); + return; + } + } + + if (SendMessage(hLayoutList, CB_SELECTSTRING, (WPARAM) -1, (LPARAM)Layout) != CB_ERR) + { + if (GetLayoutCount(Lang) >= 1) + { + wsprintf(SubPath, _T("d%03d%s"), GetLayoutCount(Lang), Lang); + } + else if ((_tcscmp(LangID, pts) != 0) && (GetLayoutCount(Lang) == 0)) + { + wsprintf(SubPath, _T("d%03d%s"), 0, Lang); } else SubPath[0] = '\0'; + } + else + { + RegCloseKey(hKey); + return; } if (_tcslen(SubPath) != 0) Modified: trunk/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] Sun Jan 18 05:20:32 2009 @@ -64,7 +64,10 @@ GetLocaleInfo(langid, LOCALE_ILANGUAGE, szTmp, sizeof(szTmp) / sizeof(TCHAR)); wsprintf(szOldLangID, _T("0000%s"), szTmp); - if (_tcscmp(szOldLangID, szLangID) == 0) IsLangExists = TRUE; + if (_tcscmp(szOldLangID, szLangID) == 0) + IsLangExists = TRUE; + else + IsLangExists = FALSE; if (szPreload[0] == 'd') { @@ -84,7 +87,7 @@ } else { - if (_tcscmp(szPreload, szLayoutID) == 0) + if ((_tcscmp(szPreload, szLayoutID) == 0) && (IsLangExists)) { RegCloseKey(hKey); return TRUE;

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2009