Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[sginsberg] 43549: - Use DBG_STATUS_CONTROL_C instead of magic "1" - Add missing KdPollBreakIn + DbgBreakPointWithStatus to ARM initialization - Fix initialization of the D and I cache fields in the PCR -- it was always setting the second level

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sun Oct 18 13:50:34 2009 New Revision: 43549 URL: http://svn.reactos.org/svn/reactos?rev=43549&view=rev Log: - Use DBG_STATUS_CONTROL_C instead of magic "1" - Add missing KdPollBreakIn + DbgBreakPointWithStatus to ARM initialization - Fix initialization of the D and I cache fields in the PCR -- it was always setting the second level Modified: trunk/reactos/ntoskrnl/ke/arm/kiinit.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ke/powerpc/kiinit.c Modified: trunk/reactos/ntoskrnl/ke/arm/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/kiinit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] Sun Oct 18 13:50:34 2009 @@ -187,6 +187,11 @@ KdInitSystem(0, LoaderBlock); // + // Check for break-in + // + if (KdPollBreakIn()) DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); + + // // Cleanup the rest of the processor block array // for (i = 1; i < MAXIMUM_PROCESSORS; i++) KiProcessorBlock[i] = NULL; @@ -372,20 +377,20 @@ // // Set global d-cache fill and alignment values // - if (Pcr->SecondLevelDcacheSize) + if (!Pcr->SecondLevelDcacheSize) { // // Use the first level // + Pcr->DcacheFillSize = Pcr->FirstLevelDcacheSize; + } + else + { + // + // Use the second level + // Pcr->DcacheFillSize = Pcr->SecondLevelDcacheSize; } - else - { - // - // Use the second level - // - Pcr->DcacheFillSize = Pcr->SecondLevelDcacheSize; - } // // Set the alignment @@ -395,12 +400,12 @@ // // Set global i-cache fill and alignment values // - if (Pcr->SecondLevelIcacheSize) + if (!Pcr->SecondLevelIcacheSize) { // // Use the first level // - Pcr->IcacheFillSize = Pcr->SecondLevelIcacheSize; + Pcr->IcacheFillSize = Pcr->FirstLevelIcacheSize; } else { Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Sun Oct 18 13:50:34 2009 @@ -752,7 +752,7 @@ KdInitSystem(0, KeLoaderBlock); /* Check for break-in */ - if (KdPollBreakIn()) DbgBreakPointWithStatus(1); + if (KdPollBreakIn()) DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); } /* Raise to HIGH_LEVEL */ Modified: trunk/reactos/ntoskrnl/ke/powerpc/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/kiinit… ============================================================================== --- trunk/reactos/ntoskrnl/ke/powerpc/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/powerpc/kiinit.c [iso-8859-1] Sun Oct 18 13:50:34 2009 @@ -329,7 +329,7 @@ /* Check for break-in */ if (KdPollBreakIn()) { - DbgBreakPointWithStatus(1); + DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); } /* Raise to HIGH_LEVEL */

15 years, 2 months

[sginsberg] 43548: Patch from David "gigaherz" Quintana: Stub out EnumPrinterKeyA/W, minor fixes by me.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sun Oct 18 03:48:30 2009 New Revision: 43548 URL: http://svn.reactos.org/svn/reactos?rev=43548&view=rev Log: Patch from David "gigaherz" Quintana: Stub out EnumPrinterKeyA/W, minor fixes by me. Modified: trunk/reactos/dll/win32/winspool/stubs.c trunk/reactos/dll/win32/winspool/winspool.spec Modified: trunk/reactos/dll/win32/winspool/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winspool/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/winspool/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winspool/stubs.c [iso-8859-1] Sun Oct 18 03:48:30 2009 @@ -802,6 +802,35 @@ return FALSE; } +/* + * @unimplemented + */ +DWORD +WINAPI +EnumPrinterKeyA(HANDLE Printer, LPSTR KeyName, LPTSTR Subkey, DWORD SubkeySize, PDWORD SubkeyReturned) +{ + OutputDebugStringW(L"winspool EnumPrinterKeyA stub called\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + + *SubkeyReturned = 0; + + return 0; +} + +/* + * @unimplemented + */ +DWORD +WINAPI +EnumPrinterKeyW(HANDLE Printer, LPWSTR KeyName, LPTSTR Subkey, DWORD SubkeySize, PDWORD SubkeyReturned) +{ + OutputDebugStringW(L"winspool EnumPrinterKeyW stub called\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + + *SubkeyReturned = 0; + + return 0; +} /* * @unimplemented Modified: trunk/reactos/dll/win32/winspool/winspool.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winspool/winspoo… ============================================================================== --- trunk/reactos/dll/win32/winspool/winspool.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winspool/winspool.spec [iso-8859-1] Sun Oct 18 03:48:30 2009 @@ -124,6 +124,8 @@ @ stdcall EnumPrinterDriversW(wstr wstr long ptr long ptr ptr) @ stdcall EnumPrintersA(long ptr long ptr long ptr ptr) @ stdcall EnumPrintersW(long ptr long ptr long ptr ptr) +@ stdcall EnumPrinterKeyA(long str str long ptr) +@ stdcall EnumPrinterKeyW(long wstr wstr long ptr) @ stdcall ExtDeviceMode(long long ptr str str ptr str long) @ stdcall EnumPrintProcessorDatatypesA(str str long ptr long ptr ptr) @ stdcall EnumPrintProcessorDatatypesW(wstr wstr long ptr long ptr ptr)

15 years, 2 months

[hyperion] 43547: Update rbuild project file Fix linker flags

by hyperion＠svn.reactos.org

Author: hyperion Date: Sat Oct 17 23:30:01 2009 New Revision: 43547 URL: http://svn.reactos.org/svn/reactos?rev=43547&view=rev Log: Update rbuild project file Fix linker flags Modified: trunk/reactos/tools/rbuild/rbuild.vcproj Modified: trunk/reactos/tools/rbuild/rbuild.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.vcproj… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.vcproj [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.vcproj [iso-8859-1] Sat Oct 17 23:30:01 2009 @@ -161,7 +161,7 @@ <Tool Name="VCLinkerTool" OutputFile=".\Debug/rbuild.exe" - LinkIncremental="1" + LinkIncremental="2" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile=".\Debug/rbuild.pdb" @@ -396,6 +396,10 @@ > </File> <File + RelativePath=".\backend\mingw\mstools_detection.cpp" + > + </File> + <File RelativePath="backend\mingw\pch_detection.h" > </File>

15 years, 2 months

[cwittich] 43546: sync msi to wine 1.1.31

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Oct 17 23:16:57 2009 New Revision: 43546 URL: http://svn.reactos.org/svn/reactos?rev=43546&view=rev Log: sync msi to wine 1.1.31 Modified: trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/custom.c trunk/reactos/dll/win32/msi/files.c trunk/reactos/dll/win32/msi/media.c trunk/reactos/dll/win32/msi/msi.c trunk/reactos/dll/win32/msi/msipriv.h trunk/reactos/dll/win32/msi/msiserver.idl trunk/reactos/dll/win32/msi/package.c trunk/reactos/dll/win32/msi/suminfo.c trunk/reactos/dll/win32/msi/table.c trunk/reactos/include/psdk/msi.h 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] Sat Oct 17 23:16:57 2009 @@ -501,7 +501,7 @@ return ERROR_SUCCESS; } -static UINT msi_check_patch_applicable( MSIPACKAGE *package, MSISUMMARYINFO *si ) +UINT msi_check_patch_applicable( MSIPACKAGE *package, MSISUMMARYINFO *si ) { static const WCHAR szProdCode[] = { 'P','r','o','d','u','c','t','C','o','d','e',0 }; LPWSTR guid_list, *guids, product_code; @@ -789,6 +789,9 @@ static const WCHAR szUILevel[] = {'U','I','L','e','v','e','l',0}; static const WCHAR szAction[] = {'A','C','T','I','O','N',0}; static const WCHAR szInstall[] = {'I','N','S','T','A','L','L',0}; + static const WCHAR szReinstall[] = {'R','E','I','N','S','T','A','L','L',0}; + static const WCHAR szInstalled[] = {'I','n','s','t','a','l','l','e','d',0}; + static const WCHAR szAll[] = {'A','L','L',0}; MSI_SetPropertyW(package, szAction, szInstall); @@ -836,6 +839,12 @@ msi_apply_transforms( package ); msi_apply_patches( package ); + + if (!szCommandLine && msi_get_property_int( package, szInstalled, 0 )) + { + TRACE("setting reinstall property\n"); + MSI_SetPropertyW( package, szReinstall, szAll ); + } /* properties may have been added by a transform */ msi_clone_properties( package ); @@ -871,6 +880,9 @@ /* finish up running custom actions */ ACTION_FinishCustomActions(package); + if (rc == ERROR_SUCCESS && package->need_reboot) + return ERROR_SUCCESS_REBOOT_REQUIRED; + return rc; } @@ -3378,16 +3390,12 @@ return ERROR_SUCCESS; res = CoInitialize( NULL ); - if (FAILED (res)) - { - ERR("CoInitialize failed\n"); - return ERROR_FUNCTION_FAILED; - } rc = MSI_IterateRecords(view, NULL, ITERATE_CreateShortcuts, package); msiobj_release(&view->hdr); - CoUninitialize(); + if (SUCCEEDED(res)) + CoUninitialize(); return rc; } @@ -5308,8 +5316,7 @@ } } - if (!*flags || - check_flag_combo(*flags, ENV_ACT_SETALWAYS | ENV_ACT_SETABSENT) || + if (check_flag_combo(*flags, ENV_ACT_SETALWAYS | ENV_ACT_SETABSENT) || check_flag_combo(*flags, ENV_ACT_REMOVEMATCH | ENV_ACT_SETABSENT) || check_flag_combo(*flags, ENV_ACT_REMOVEMATCH | ENV_ACT_SETALWAYS) || check_flag_combo(*flags, ENV_ACT_SETABSENT | ENV_MOD_MASK)) @@ -5317,6 +5324,9 @@ ERR("Invalid flags: %08x\n", *flags); return ERROR_FUNCTION_FAILED; } + + if (!*flags) + *flags = ENV_ACT_SETALWAYS | ENV_ACT_REMOVE; return ERROR_SUCCESS; } @@ -5344,6 +5354,8 @@ name = MSI_RecordGetString(rec, 2); value = MSI_RecordGetString(rec, 3); + + TRACE("name %s value %s\n", debugstr_w(name), debugstr_w(value)); res = env_set_flags(&name, &value, &flags); if (res != ERROR_SUCCESS) Modified: trunk/reactos/dll/win32/msi/custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/custom.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/custom.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/custom.c [iso-8859-1] Sat Oct 17 23:16:57 2009 @@ -679,7 +679,7 @@ hModule = LoadLibraryW( dll ); if (!hModule) { - ERR("failed to load dll %s\n", debugstr_w( dll ) ); + ERR("failed to load dll %s (%u)\n", debugstr_w( dll ), GetLastError() ); return r; } @@ -1046,15 +1046,16 @@ if( row ) { LPCWSTR error = MSI_RecordGetString( row, 1 ); - MessageBoxW( NULL, error, NULL, MB_OK ); + if ((gUILevel & INSTALLUILEVEL_MASK) != INSTALLUILEVEL_NONE) + MessageBoxW( NULL, error, NULL, MB_OK ); msiobj_release( &row->hdr ); } - else + else if ((gUILevel & INSTALLUILEVEL_MASK) != INSTALLUILEVEL_NONE) MessageBoxW( NULL, deformated, NULL, MB_OK ); msi_free( deformated ); - return ERROR_FUNCTION_FAILED; + return ERROR_INSTALL_FAILURE; } static UINT HANDLE_CustomType50(MSIPACKAGE *package, LPCWSTR source, 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] Sat Oct 17 23:16:57 2009 @@ -139,7 +139,7 @@ return ERROR_SUCCESS; } -static UINT copy_install_file(MSIFILE *file, LPWSTR source) +static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source) { UINT gle; @@ -153,7 +153,7 @@ if (gle == ERROR_ALREADY_EXISTS && file->state == msifs_overwrite) { TRACE("overwriting existing file\n"); - gle = ERROR_SUCCESS; + return ERROR_SUCCESS; } else if (gle == ERROR_ACCESS_DENIED) { @@ -161,6 +161,39 @@ gle = copy_file(file, source); TRACE("Overwriting existing file: %d\n", gle); + } + if (gle == ERROR_SHARING_VIOLATION) + { + static const WCHAR msiW[] = {'m','s','i',0}; + static const WCHAR slashW[] = {'\\',0}; + WCHAR tmpfileW[MAX_PATH], *pathW, *p; + DWORD len; + + TRACE("file in use, scheduling rename operation\n"); + + GetTempFileNameW(slashW, msiW, 0, tmpfileW); + len = strlenW(file->TargetPath) + strlenW(tmpfileW) + 1; + if (!(pathW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) + return ERROR_OUTOFMEMORY; + + strcpyW(pathW, file->TargetPath); + if ((p = strrchrW(pathW, '\\'))) *p = 0; + strcatW(pathW, tmpfileW); + + if (CopyFileW(source, pathW, FALSE) && + MoveFileExW(file->TargetPath, NULL, MOVEFILE_DELAY_UNTIL_REBOOT) && + MoveFileExW(pathW, file->TargetPath, MOVEFILE_DELAY_UNTIL_REBOOT)) + { + file->state = msifs_installed; + package->need_reboot = 1; + gle = ERROR_SUCCESS; + } + else + { + gle = GetLastError(); + WARN("failed to schedule rename operation: %d)\n", gle); + } + HeapFree(GetProcessHeap(), 0, pathW); } return gle; @@ -296,7 +329,7 @@ debugstr_w(file->TargetPath)); msi_file_update_ui(package, file, szInstallFiles); - rc = copy_install_file(file, source); + rc = copy_install_file(package, file, source); if (rc != ERROR_SUCCESS) { ERR("Failed to copy %s to %s (%d)\n", debugstr_w(source), 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] Sat Oct 17 23:16:57 2009 @@ -49,11 +49,16 @@ #define _O_TEXT 0x4000 #define _O_BINARY 0x8000 -static BOOL source_matches_volume(MSIMEDIAINFO *mi, LPWSTR source_root) +static BOOL source_matches_volume(MSIMEDIAINFO *mi, LPCWSTR source_root) { WCHAR volume_name[MAX_PATH + 1]; - - if (!GetVolumeInformationW(source_root, volume_name, MAX_PATH + 1, + WCHAR root[MAX_PATH + 1]; + + strcpyW(root, source_root); + PathStripToRootW(root); + PathAddBackslashW(root); + + if (!GetVolumeInformationW(root, volume_name, MAX_PATH + 1, NULL, NULL, NULL, NULL, 0)) { ERR("Failed to get volume information\n"); @@ -80,7 +85,6 @@ error = generate_error_string(package, 1302, 1, mi->disk_prompt); error_dialog = msi_dup_property(package, error_prop); source_dir = msi_dup_property(package, cszSourceDir); - PathStripToRootW(source_dir); while (r == ERROR_SUCCESS && !source_matches_volume(mi, source_dir)) @@ -333,11 +337,56 @@ NULL, CREATE_ALWAYS, attrs, NULL); if (handle == INVALID_HANDLE_VALUE) { - if (GetFileAttributesW(path) == INVALID_FILE_ATTRIBUTES) - ERR("failed to create %s (error %d)\n", - debugstr_w(path), GetLastError()); - - goto done; + DWORD err = GetLastError(); + DWORD attrs2 = GetFileAttributesW(path); + + if (attrs2 == INVALID_FILE_ATTRIBUTES) + { + ERR("failed to create %s (error %d)\n", debugstr_w(path), err); + goto done; + } + else if (err == ERROR_ACCESS_DENIED && (attrs2 & FILE_ATTRIBUTE_READONLY)) + { + TRACE("removing read-only attribute on %s\n", debugstr_w(path)); + SetFileAttributesW( path, attrs2 & ~FILE_ATTRIBUTE_READONLY ); + handle = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, attrs2, NULL); + + if (handle != INVALID_HANDLE_VALUE) goto done; + err = GetLastError(); + } + if (err == ERROR_SHARING_VIOLATION) + { + static const WCHAR msiW[] = {'m','s','i',0}; + static const WCHAR slashW[] = {'\\',0}; + WCHAR tmpfileW[MAX_PATH], *tmppathW, *p; + DWORD len; + + TRACE("file in use, scheduling rename operation\n"); + + GetTempFileNameW(slashW, msiW, 0, tmpfileW); + len = strlenW(path) + strlenW(tmpfileW) + 1; + if (!(tmppathW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) + return ERROR_OUTOFMEMORY; + + strcpyW(tmppathW, path); + if ((p = strrchrW(tmppathW, '\\'))) *p = 0; + strcatW(tmppathW, tmpfileW); + + handle = CreateFileW(tmppathW, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, attrs, NULL); + + if (handle != INVALID_HANDLE_VALUE && + MoveFileExW(path, NULL, MOVEFILE_DELAY_UNTIL_REBOOT) && + MoveFileExW(tmppathW, path, MOVEFILE_DELAY_UNTIL_REBOOT)) + { + data->package->need_reboot = 1; + } + else + WARN("failed to schedule rename operation %s (error %d)\n", debugstr_w(path), GetLastError()); + + HeapFree(GetProcessHeap(), 0, tmppathW); + } + else + WARN("failed to create %s (error %d)\n", debugstr_w(path), err); } done: @@ -453,6 +502,17 @@ msi_free(mi->volume_label); msi_free(mi->first_volume); msi_free(mi); +} + +static UINT get_drive_type(const WCHAR *path) +{ + WCHAR root[MAX_PATH + 1]; + + strcpyW(root, path); + PathStripToRootW(root); + PathAddBackslashW(root); + + return GetDriveTypeW(root); } static UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) @@ -494,9 +554,7 @@ source_dir = msi_dup_property(package, cszSourceDir); lstrcpyW(mi->source, source_dir); - - PathStripToRootW(source_dir); - mi->type = GetDriveTypeW(source_dir); + mi->type = get_drive_type(source_dir); if (file->IsCompressed && mi->cabinet) { @@ -576,7 +634,6 @@ { /* FIXME: what about SourceDir */ lstrcpyW(mi->source, source); - lstrcatW(mi->source, mi->cabinet); return ERROR_SUCCESS; } } Modified: trunk/reactos/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=43… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] Sat Oct 17 23:16:57 2009 @@ -489,13 +489,86 @@ return ERROR_CALL_NOT_IMPLEMENTED; } +static UINT MSI_ApplicablePatchW( MSIPACKAGE *package, LPCWSTR patch ) +{ + MSISUMMARYINFO *si; + MSIDATABASE *patch_db; + UINT r = ERROR_SUCCESS; + + r = MSI_OpenDatabaseW( patch, MSIDBOPEN_READONLY, &patch_db ); + if (r != ERROR_SUCCESS) + { + WARN("failed to open patch file %s\n", debugstr_w(patch)); + return r; + } + + si = MSI_GetSummaryInformationW( patch_db->storage, 0 ); + if (!si) + { + r = ERROR_FUNCTION_FAILED; + goto done; + } + + r = msi_check_patch_applicable( package, si ); + if (r != ERROR_SUCCESS) + TRACE("patch not applicable\n"); + +done: + msiobj_release( &patch_db->hdr ); + msiobj_release( &si->hdr ); + return r; +} + UINT WINAPI MsiDetermineApplicablePatchesW(LPCWSTR szProductPackagePath, DWORD cPatchInfo, PMSIPATCHSEQUENCEINFOW pPatchInfo) { - FIXME("(%s, %d, %p): stub!\n", debugstr_w(szProductPackagePath), - cPatchInfo, pPatchInfo); - - return ERROR_CALL_NOT_IMPLEMENTED; + UINT i, r, ret = ERROR_FUNCTION_FAILED; + MSIPACKAGE *package; + + TRACE("(%s, %d, %p)\n", debugstr_w(szProductPackagePath), cPatchInfo, pPatchInfo); + + r = MSI_OpenPackageW( szProductPackagePath, &package ); + if (r != ERROR_SUCCESS) + { + ERR("failed to open package %u\n", r); + return r; + } + + for (i = 0; i < cPatchInfo; i++) + { + switch (pPatchInfo[i].ePatchDataType) + { + case MSIPATCH_DATATYPE_PATCHFILE: + { + FIXME("patch ordering not supported\n"); + r = MSI_ApplicablePatchW( package, pPatchInfo[i].szPatchData ); + if (r != ERROR_SUCCESS) + { + pPatchInfo[i].dwOrder = ~0u; + pPatchInfo[i].uStatus = ERROR_PATCH_TARGET_NOT_FOUND; + } + else + { + pPatchInfo[i].dwOrder = i; + pPatchInfo[i].uStatus = ret = ERROR_SUCCESS; + } + break; + } + default: + { + FIXME("patch data type %u not supported\n", pPatchInfo[i].ePatchDataType); + pPatchInfo[i].dwOrder = ~0u; + pPatchInfo[i].uStatus = ERROR_PATCH_TARGET_NOT_FOUND; + break; + } + } + + TRACE(" szPatchData: %s\n", debugstr_w(pPatchInfo[i].szPatchData)); + TRACE("ePatchDataType: %u\n", pPatchInfo[i].ePatchDataType); + TRACE(" dwOrder: %u\n", pPatchInfo[i].dwOrder); + TRACE(" uStatus: %u\n", pPatchInfo[i].uStatus); + } + return ret; } UINT WINAPI MsiDeterminePatchSequenceA(LPCSTR szProductCode, LPCSTR szUserSid, @@ -619,9 +692,6 @@ commandline[0] = 0; if (szCommandLine) lstrcpyW(commandline,szCommandLine); - - if (MsiQueryProductStateW(szProduct) != INSTALLSTATE_UNKNOWN) - lstrcatW(commandline,szInstalled); if (eInstallState == INSTALLSTATE_ABSENT) lstrcatW(commandline, szRemoveAll); 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] Sat Oct 17 23:16:57 2009 @@ -340,6 +340,7 @@ unsigned char scheduled_action_running : 1; unsigned char commit_action_running : 1; unsigned char rollback_action_running : 1; + unsigned char need_reboot : 1; } MSIPACKAGE; typedef struct tagMSIPREVIEW @@ -682,6 +683,8 @@ extern UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, LPCWSTR szTransformFile, int iErrorCond ); extern void append_storage_to_db( MSIDATABASE *db, IStorage *stg ); + +extern UINT msi_check_patch_applicable( MSIPACKAGE *package, MSISUMMARYINFO *si ); /* action internals */ extern UINT MSI_InstallPackage( MSIPACKAGE *, LPCWSTR, LPCWSTR ); Modified: trunk/reactos/dll/win32/msi/msiserver.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiserver.id… ============================================================================== --- trunk/reactos/dll/win32/msi/msiserver.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msiserver.idl [iso-8859-1] Sat Oct 17 23:16:57 2009 @@ -424,4 +424,4 @@ properties: methods: } -} +} 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] Sat Oct 17 23:16:57 2009 @@ -453,13 +453,14 @@ static const WCHAR szTime[] = {'T','i','m','e',0}; static const WCHAR szUserLangID[] = {'U','s','e','r','L','a','n','g','u','a','g','e','I','D',0}; static const WCHAR szSystemLangID[] = {'S','y','s','t','e','m','L','a','n','g','u','a','g','e','I','D',0}; + static const WCHAR szProductState[] = {'P','r','o','d','u','c','t','S','t','a','t','e',0}; /* * Other things that probably should be set: * * ComputerName LogonUser VirtualMemory * ShellAdvSupport DefaultUIFont PackagecodeChanging - * ProductState CaptionHeight BorderTop BorderSide TextHeight + * CaptionHeight BorderTop BorderSide TextHeight * RedirectedDllSupport */ @@ -658,6 +659,9 @@ sprintfW(bufstr, szIntFormat, langid); MSI_SetPropertyW( package, szSystemLangID, bufstr ); + + sprintfW(bufstr, szIntFormat, MsiQueryProductStateW(package->ProductCode)); + MSI_SetPropertyW( package, szProductState, bufstr ); } static UINT msi_load_summary_properties( MSIPACKAGE *package ) @@ -804,12 +808,14 @@ create_temp_property_table( package ); msi_clone_properties( package ); - set_installer_properties(package); + + package->ProductCode = msi_dup_property( package, szProductCode ); + set_installed_prop( package ); + set_installer_properties( package ); + sprintfW(uilevel,szpi,gUILevel); MSI_SetPropertyW(package, szLevel, uilevel); - package->ProductCode = msi_dup_property( package, szProductCode ); - set_installed_prop( package ); r = msi_load_summary_properties( package ); if (r != ERROR_SUCCESS) { 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] Sat Oct 17 23:16:57 2009 @@ -475,7 +475,9 @@ if( szDatabase ) { - ret = MSI_OpenDatabaseW( szDatabase, NULL, &db ); + LPCWSTR persist = uiUpdateCount ? MSIDBOPEN_TRANSACT : MSIDBOPEN_READONLY; + + ret = MSI_OpenDatabaseW( szDatabase, persist, &db ); if( ret != ERROR_SUCCESS ) return ret; } 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] Sat Oct 17 23:16:57 2009 @@ -2777,7 +2777,7 @@ r = TABLE_insert_row( &tv->view, rec, -1, FALSE ); if (r != ERROR_SUCCESS) - ERR("insert row failed\n"); + WARN("insert row failed\n"); if ( number != MSI_NULL_INTEGER && !lstrcmpW(name, szColumns) ) msi_update_table_columns( db, table ); @@ -2788,7 +2788,7 @@ r = msi_table_find_row( tv, rec, &row ); if (r != ERROR_SUCCESS) - ERR("no matching row to transform\n"); + WARN("no matching row to transform\n"); else if ( mask ) { TRACE("modifying row [%d]:\n", row); Modified: trunk/reactos/include/psdk/msi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msi.h?rev=435… ============================================================================== --- trunk/reactos/include/psdk/msi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msi.h [iso-8859-1] Sat Oct 17 23:16:57 2009 @@ -237,6 +237,8 @@ #define MAX_FEATURE_CHARS 38 +#define ERROR_PATCH_TARGET_NOT_FOUND 1642 + /* Strings defined in msi.h */ /* Advertised Information */

15 years, 2 months

[cwittich] 43545: fix all gdi32 gdiobj winetests

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Oct 17 23:04:04 2009 New Revision: 43545 URL: http://svn.reactos.org/svn/reactos?rev=43545&view=rev Log: fix all gdi32 gdiobj winetests Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Sat Oct 17 23:04:04 2009 @@ -2988,20 +2988,47 @@ FASTCALL REGION_RectInRegion( PROSRGNDATA Rgn, - const RECTL *rc + const RECTL *rect ) { PRECTL pCurRect, pRectEnd; - - // this is (just) a useful optimization - if ((Rgn->rdh.nCount > 0) && EXTENTCHECK(&Rgn->rdh.rcBound, rc)) - { - for (pCurRect = Rgn->Buffer, pRectEnd = pCurRect + Rgn->rdh.nCount; pCurRect < pRectEnd; pCurRect++) - { - if (pCurRect->bottom <= rc->top) continue; // not far enough down yet - if (pCurRect->top >= rc->bottom) break; // too far down - if (pCurRect->right <= rc->left) continue; // not far enough over yet - if (pCurRect->left >= rc->right) continue; + RECT rc; + + /* swap the coordinates to make right >= left and bottom >= top */ + /* (region building rectangles are normalized the same way) */ + if( rect->top > rect->bottom) { + rc.top = rect->bottom; + rc.bottom = rect->top; + } else { + rc.top = rect->top; + rc.bottom = rect->bottom; + } + if( rect->right < rect->left) { + rc.right = rect->left; + rc.left = rect->right; + } else { + rc.right = rect->right; + rc.left = rect->left; + } + + /* this is (just) a useful optimization */ + if ((Rgn->rdh.nCount > 0) && EXTENTCHECK(&Rgn->rdh.rcBound, &rc)) + { + for (pCurRect = Rgn->Buffer, pRectEnd = pCurRect + + Rgn->rdh.nCount; pCurRect < pRectEnd; pCurRect++) + { + if (pCurRect->bottom <= rc.top) + continue; /* not far enough down yet */ + + if (pCurRect->top >= rc.bottom) + break; /* too far down */ + + if (pCurRect->right <= rc.left) + continue; /* not far enough over yet */ + + if (pCurRect->left >= rc.right) { + continue; + } return TRUE; }

15 years, 2 months

[cwittich] 43544: sync shlwapi to wine 1.1.31

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Oct 17 22:45:32 2009 New Revision: 43544 URL: http://svn.reactos.org/svn/reactos?rev=43544&view=rev Log: sync shlwapi to wine 1.1.31 Modified: trunk/reactos/dll/win32/shlwapi/regstream.c trunk/reactos/dll/win32/shlwapi/shlwapi.spec Modified: trunk/reactos/dll/win32/shlwapi/regstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/regstrea… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/regstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/regstream.c [iso-8859-1] Sat Oct 17 22:45:32 2009 @@ -43,6 +43,12 @@ LPBYTE pbBuffer; DWORD dwLength; DWORD dwPos; + DWORD dwMode; + union { + LPSTR keyNameA; + LPWSTR keyNameW; + }u; + BOOL bUnicode; } ISHRegStream; /************************************************************************** @@ -98,11 +104,34 @@ { TRACE(" destroying SHReg IStream (%p)\n",This); - HeapFree(GetProcessHeap(),0,This->pbBuffer); - if (This->hKey) + { + /* write back data in REG_BINARY */ + if (This->dwMode == STGM_READWRITE || This->dwMode == STGM_WRITE) + { + if (This->dwLength) + { + if (This->bUnicode) + RegSetValueExW(This->hKey, This->u.keyNameW, 0, REG_BINARY, + (const BYTE *) This->pbBuffer, This->dwLength); + else + RegSetValueExA(This->hKey, This->u.keyNameA, 0, REG_BINARY, + (const BYTE *) This->pbBuffer, This->dwLength); + } + else + { + if (This->bUnicode) + RegDeleteValueW(This->hKey, This->u.keyNameW); + else + RegDeleteValueA(This->hKey, This->u.keyNameA); + } + } + RegCloseKey(This->hKey); - + } + + HeapFree(GetProcessHeap(),0,This->u.keyNameA); + HeapFree(GetProcessHeap(),0,This->pbBuffer); HeapFree(GetProcessHeap(),0,This); return 0; } @@ -116,24 +145,21 @@ static HRESULT WINAPI IStream_fnRead (IStream * iface, void* pv, ULONG cb, ULONG* pcbRead) { ISHRegStream *This = (ISHRegStream *)iface; - - DWORD dwBytesToRead, dwBytesLeft; + DWORD dwBytesToRead; TRACE("(%p)->(%p,0x%08x,%p)\n",This, pv, cb, pcbRead); - if (!pv) - return STG_E_INVALIDPOINTER; - - dwBytesLeft = This->dwLength - This->dwPos; - - if ( 0 >= dwBytesLeft ) /* end of buffer */ - return S_FALSE; - - dwBytesToRead = ( cb > dwBytesLeft) ? dwBytesLeft : cb; - - memmove ( pv, (This->pbBuffer) + (This->dwPos), dwBytesToRead); - - This->dwPos += dwBytesToRead; /* adjust pointer */ + if (This->dwPos >= This->dwLength) + dwBytesToRead = 0; + else + dwBytesToRead = This->dwLength - This->dwPos; + + dwBytesToRead = (cb > dwBytesToRead) ? dwBytesToRead : cb; + if (dwBytesToRead != 0) /* not at end of buffer and we want to read something */ + { + memmove(pv, This->pbBuffer + This->dwPos, dwBytesToRead); + This->dwPos += dwBytesToRead; /* adjust pointer */ + } if (pcbRead) *pcbRead = dwBytesToRead; @@ -147,13 +173,29 @@ static HRESULT WINAPI IStream_fnWrite (IStream * iface, const void* pv, ULONG cb, ULONG* pcbWritten) { ISHRegStream *This = (ISHRegStream *)iface; - - TRACE("(%p)\n",This); + DWORD newLen = This->dwPos + cb; + + TRACE("(%p, %p, %d, %p)\n",This, pv, cb, pcbWritten); + + if (newLen < This->dwPos) /* overflow */ + return STG_E_INSUFFICIENTMEMORY; + + if (newLen > This->dwLength) + { + LPBYTE newBuf = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->pbBuffer, newLen); + if (!newBuf) + return STG_E_INSUFFICIENTMEMORY; + + This->dwLength = newLen; + This->pbBuffer = newBuf; + } + memmove(This->pbBuffer + This->dwPos, pv, cb); + This->dwPos += cb; /* adjust pointer */ if (pcbWritten) - *pcbWritten = 0; - - return E_NOTIMPL; + *pcbWritten = cb; + + return S_OK; } /************************************************************************** @@ -162,12 +204,28 @@ static HRESULT WINAPI IStream_fnSeek (IStream * iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition) { ISHRegStream *This = (ISHRegStream *)iface; - - TRACE("(%p)\n",This); + LARGE_INTEGER tmp; + TRACE("(%p, %s, %d %p)\n", This, + wine_dbgstr_longlong(dlibMove.QuadPart), dwOrigin, plibNewPosition); + + if (dwOrigin == STREAM_SEEK_SET) + tmp = dlibMove; + else if (dwOrigin == STREAM_SEEK_CUR) + tmp.QuadPart = This->dwPos + dlibMove.QuadPart; + else if (dwOrigin == STREAM_SEEK_END) + tmp.QuadPart = This->dwLength + dlibMove.QuadPart; + else + return STG_E_INVALIDPARAMETER; + + if (tmp.QuadPart < 0) + return STG_E_INVALIDFUNCTION; + + /* we cut off the high part here */ + This->dwPos = tmp.LowPart; if (plibNewPosition) - plibNewPosition->QuadPart = 0; - return E_NOTIMPL; + plibNewPosition->QuadPart = This->dwPos; + return S_OK; } /************************************************************************** @@ -176,9 +234,21 @@ static HRESULT WINAPI IStream_fnSetSize (IStream * iface, ULARGE_INTEGER libNewSize) { ISHRegStream *This = (ISHRegStream *)iface; - - TRACE("(%p)\n",This); - return E_NOTIMPL; + DWORD newLen; + LPBYTE newBuf; + + TRACE("(%p, %s)\n", This, wine_dbgstr_longlong(libNewSize.QuadPart)); + + /* we cut off the high part here */ + newLen = libNewSize.LowPart; + newBuf = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->pbBuffer, newLen); + if (!newBuf) + return STG_E_INSUFFICIENTMEMORY; + + This->pbBuffer = newBuf; + This->dwLength = newLen; + + return S_OK; } /************************************************************************** @@ -193,6 +263,8 @@ pcbRead->QuadPart = 0; if (pcbWritten) pcbWritten->QuadPart = 0; + + /* TODO implement */ return E_NOTIMPL; } @@ -205,6 +277,7 @@ TRACE("(%p)\n",This); + /* commit not supported by this stream */ return E_NOTIMPL; } @@ -217,6 +290,7 @@ TRACE("(%p)\n",This); + /* revert not supported by this stream */ return E_NOTIMPL; } @@ -229,19 +303,35 @@ TRACE("(%p)\n",This); + /* lock/unlock not supported by this stream */ return E_NOTIMPL; } /************************************************************************* * IStream_fnStat */ -static HRESULT WINAPI IStream_fnStat (IStream * iface, STATSTG* pstatstg, DWORD grfStatFlag) -{ - ISHRegStream *This = (ISHRegStream *)iface; - - TRACE("(%p)\n",This); - - return E_NOTIMPL; +static HRESULT WINAPI IStream_fnStat (IStream * iface, STATSTG* pstatstg, DWORD grfStatFlag) +{ + ISHRegStream *This = (ISHRegStream *)iface; + + TRACE("(%p, %p, %d)\n",This,pstatstg,grfStatFlag); + + pstatstg->pwcsName = NULL; + pstatstg->type = STGTY_STREAM; + pstatstg->cbSize.QuadPart = This->dwLength; + pstatstg->mtime.dwHighDateTime = 0; + pstatstg->mtime.dwLowDateTime = 0; + pstatstg->ctime.dwHighDateTime = 0; + pstatstg->ctime.dwLowDateTime = 0; + pstatstg->atime.dwHighDateTime = 0; + pstatstg->atime.dwLowDateTime = 0; + pstatstg->grfMode = This->dwMode; + pstatstg->grfLocksSupported = 0; + pstatstg->clsid = CLSID_NULL; + pstatstg->grfStateBits = 0; + pstatstg->reserved = 0; + + return S_OK; } /************************************************************************* @@ -252,8 +342,9 @@ ISHRegStream *This = (ISHRegStream *)iface; TRACE("(%p)\n",This); - if (ppstm) - *ppstm = NULL; + *ppstm = NULL; + + /* clone not supported by this stream */ return E_NOTIMPL; } @@ -333,7 +424,10 @@ NULL, NULL, 0, - 0 + 0, + STGM_READWRITE, + {NULL}, + FALSE }; /************************************************************************** @@ -341,7 +435,7 @@ * * Internal helper: Create and initialise a new registry stream object. */ -static IStream *IStream_Create(HKEY hKey, LPBYTE pbBuffer, DWORD dwLength) +static ISHRegStream *IStream_Create(HKEY hKey, LPBYTE pbBuffer, DWORD dwLength) { ISHRegStream* regStream; @@ -355,9 +449,12 @@ regStream->pbBuffer = pbBuffer; regStream->dwLength = dwLength; regStream->dwPos = 0; + regStream->dwMode = STGM_READWRITE; + regStream->u.keyNameA = NULL; + regStream->bUnicode = FALSE; } TRACE ("Returning %p\n", regStream); - return (IStream *)regStream; + return regStream; } /************************************************************************* @@ -378,21 +475,52 @@ IStream * WINAPI SHOpenRegStream2A(HKEY hKey, LPCSTR pszSubkey, LPCSTR pszValue,DWORD dwMode) { + ISHRegStream *tmp; HKEY hStrKey = NULL; LPBYTE lpBuff = NULL; - DWORD dwLength, dwType; + DWORD dwLength = 0; + LONG ret; TRACE("(%p,%s,%s,0x%08x)\n", hKey, pszSubkey, pszValue, dwMode); - /* Open the key, read in binary data and create stream */ - if (!RegOpenKeyExA (hKey, pszSubkey, 0, KEY_READ, &hStrKey) && - !RegQueryValueExA (hStrKey, pszValue, 0, 0, 0, &dwLength) && - (lpBuff = HeapAlloc (GetProcessHeap(), 0, dwLength)) && - !RegQueryValueExA (hStrKey, pszValue, 0, &dwType, lpBuff, &dwLength) && - dwType == REG_BINARY) - return IStream_Create(hStrKey, lpBuff, dwLength); - - HeapFree (GetProcessHeap(), 0, lpBuff); + if (dwMode == STGM_READ) + ret = RegOpenKeyExA(hKey, pszSubkey, 0, KEY_READ, &hStrKey); + else /* in write mode we make sure the subkey exits */ + ret = RegCreateKeyExA(hKey, pszSubkey, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &hStrKey, NULL); + + if (ret == ERROR_SUCCESS) + { + if (dwMode == STGM_READ || dwMode == STGM_READWRITE) + { + /* read initial data */ + ret = RegQueryValueExA(hStrKey, pszValue, 0, 0, 0, &dwLength); + if (ret == ERROR_SUCCESS && dwLength) + { + lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); + RegQueryValueExA(hStrKey, pszValue, 0, 0, lpBuff, &dwLength); + } + } + + if (!dwLength) + lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); + + tmp = IStream_Create(hStrKey, lpBuff, dwLength); + if(tmp) + { + if(pszValue) + { + int len = lstrlenA(pszValue) + 1; + tmp->u.keyNameA = HeapAlloc(GetProcessHeap(), 0, len); + memcpy(tmp->u.keyNameA, pszValue, len); + } + + tmp->dwMode = dwMode; + tmp->bUnicode = FALSE; + return (IStream *)tmp; + } + } + + HeapFree(GetProcessHeap(), 0, lpBuff); if (hStrKey) RegCloseKey(hStrKey); return NULL; @@ -406,22 +534,53 @@ IStream * WINAPI SHOpenRegStream2W(HKEY hKey, LPCWSTR pszSubkey, LPCWSTR pszValue, DWORD dwMode) { + ISHRegStream *tmp; HKEY hStrKey = NULL; LPBYTE lpBuff = NULL; - DWORD dwLength, dwType; + DWORD dwLength = 0; + LONG ret; TRACE("(%p,%s,%s,0x%08x)\n", hKey, debugstr_w(pszSubkey), debugstr_w(pszValue), dwMode); - /* Open the key, read in binary data and create stream */ - if (!RegOpenKeyExW (hKey, pszSubkey, 0, KEY_READ, &hStrKey) && - !RegQueryValueExW (hStrKey, pszValue, 0, 0, 0, &dwLength) && - (lpBuff = HeapAlloc (GetProcessHeap(), 0, dwLength)) && - !RegQueryValueExW (hStrKey, pszValue, 0, &dwType, lpBuff, &dwLength) && - dwType == REG_BINARY) - return IStream_Create(hStrKey, lpBuff, dwLength); - - HeapFree (GetProcessHeap(), 0, lpBuff); + if (dwMode == STGM_READ) + ret = RegOpenKeyExW(hKey, pszSubkey, 0, KEY_READ, &hStrKey); + else /* in write mode we make sure the subkey exits */ + ret = RegCreateKeyExW(hKey, pszSubkey, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &hStrKey, NULL); + + if (ret == ERROR_SUCCESS) + { + if (dwMode == STGM_READ || dwMode == STGM_READWRITE) + { + /* read initial data */ + ret = RegQueryValueExW(hStrKey, pszValue, 0, 0, 0, &dwLength); + if (ret == ERROR_SUCCESS && dwLength) + { + lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); + RegQueryValueExW(hStrKey, pszValue, 0, 0, lpBuff, &dwLength); + } + } + + if (!dwLength) + lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); + + tmp = IStream_Create(hStrKey, lpBuff, dwLength); + if(tmp) + { + if(pszValue) + { + int len = lstrlenW(pszValue) + 1; + tmp->u.keyNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + memcpy(tmp->u.keyNameW, pszValue, len * sizeof(WCHAR)); + } + + tmp->dwMode = dwMode; + tmp->bUnicode = TRUE; + return (IStream *)tmp; + } + } + + HeapFree(GetProcessHeap(), 0, lpBuff); if (hStrKey) RegCloseKey(hStrKey); return NULL; @@ -487,24 +646,25 @@ * A copy of the memory pointed to by lpbData is made, and is freed * when the stream is released. */ -IStream * WINAPI SHCreateMemStream(LPBYTE lpbData, DWORD dwDataLen) +IStream * WINAPI SHCreateMemStream(const BYTE *lpbData, UINT dwDataLen) { IStream *iStrmRet = NULL; + LPBYTE lpbDup; TRACE("(%p,%d)\n", lpbData, dwDataLen); - if (lpbData) + if (!lpbData) + dwDataLen = 0; + + lpbDup = HeapAlloc(GetProcessHeap(), 0, dwDataLen); + + if (lpbDup) { - LPBYTE lpbDup = HeapAlloc(GetProcessHeap(), 0, dwDataLen); - - if (lpbDup) - { - memcpy(lpbDup, lpbData, dwDataLen); - iStrmRet = IStream_Create(NULL, lpbDup, dwDataLen); - - if (!iStrmRet) - HeapFree(GetProcessHeap(), 0, lpbDup); - } + memcpy(lpbDup, lpbData, dwDataLen); + iStrmRet = (IStream *)IStream_Create(NULL, lpbDup, dwDataLen); + + if (!iStrmRet) + HeapFree(GetProcessHeap(), 0, lpbDup); } return iStrmRet; } @@ -539,7 +699,7 @@ if(dwReserved || !lppStream) return E_INVALIDARG; - lpStream = IStream_Create(NULL, lpbData, dwDataLen); + lpStream = (IStream *)IStream_Create(NULL, lpbData, dwDataLen); if(!lpStream) return E_OUTOFMEMORY; Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] Sat Oct 17 22:45:32 2009 @@ -643,7 +643,7 @@ @ stdcall PathQuoteSpacesA (str) @ stdcall PathQuoteSpacesW (wstr) @ stdcall PathRelativePathToA(ptr str long str long) -@ stdcall PathRelativePathToW(ptr str long str long) +@ stdcall PathRelativePathToW(ptr wstr long wstr long) @ stdcall PathRemoveArgsA(str) @ stdcall PathRemoveArgsW(wstr) @ stdcall PathRemoveBackslashA (str) @@ -700,9 +700,9 @@ @ stdcall SHGetValueW ( long wstr wstr ptr ptr ptr ) @ stdcall SHIsLowMemoryMachine(long) @ stdcall SHOpenRegStream2A(long str str long) -@ stdcall SHOpenRegStream2W(long wstr str long) +@ stdcall SHOpenRegStream2W(long wstr wstr long) @ stdcall SHOpenRegStreamA(long str str long) -@ stdcall SHOpenRegStreamW(long wstr str long) +@ stdcall SHOpenRegStreamW(long wstr wstr long) @ stdcall SHQueryInfoKeyA(long ptr ptr ptr ptr) @ stdcall SHQueryInfoKeyW(long ptr ptr ptr ptr) @ stdcall SHQueryValueExA(long str ptr ptr ptr ptr) @@ -738,7 +738,7 @@ @ stdcall SHRegSetUSValueA ( str str long ptr long long) @ stdcall SHRegSetUSValueW ( wstr wstr long ptr long long) @ stdcall SHRegWriteUSValueA (long str long ptr long long) -@ stdcall SHRegWriteUSValueW (long str long ptr long long) +@ stdcall SHRegWriteUSValueW (long wstr long ptr long long) @ stdcall SHRegisterValidateTemplate(wstr long) @ stdcall SHReleaseThreadRef() @ stdcall SHSetThreadRef (ptr) @@ -785,7 +785,7 @@ @ stdcall StrPBrkW(wstr wstr) @ stdcall StrRChrA (str str long) @ stdcall StrRChrIA (str str long) -@ stdcall StrRChrIW (str str long) +@ stdcall StrRChrIW (wstr wstr long) @ stdcall StrRChrW (wstr wstr long) @ stdcall StrRStrIA (str str str) @ stdcall StrRStrIW (wstr wstr wstr)

15 years, 2 months

[tkreuzer] 43543: Add some structure offset macros to asm.h for amd64

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 17 22:19:42 2009 New Revision: 43543 URL: http://svn.reactos.org/svn/reactos?rev=43543&view=rev Log: Add some structure offset macros to asm.h for amd64 Modified: trunk/reactos/include/ndk/amd64/asm.h Modified: trunk/reactos/include/ndk/amd64/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/amd64/asm.h?re… ============================================================================== --- trunk/reactos/include/ndk/amd64/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/amd64/asm.h [iso-8859-1] Sat Oct 17 22:19:42 2009 @@ -49,6 +49,15 @@ #define KTHREAD_INITIAL_STACK 0x28 #define KTHREAD_STACK_LIMIT 0x30 #define KTHREAD_WAIT_IRQL 0x156 +#define KTHREAD_TEB 0x0B0+0x10 +#define KTHREAD_KERNEL_STACK 0x038 +#define KTHREAD_NPX_STATE 0x85 +#define KTHREAD_SERVICE_TABLE 0x1E8 +#define KTHREAD_PREVIOUS_MODE 0x137 +#define KTHREAD_TRAP_FRAME 0x1D8 +#define KTHREAD_CALLBACK_STACK 0x1E0 +#define KTHREAD_APCSTATE_PROCESS 0x068 +#define KPROCESS_DIRECTORY_TABLE_BASE 0x028 // // KPRCB Offsets

15 years, 2 months

[sginsberg] 43542: - Fix msvc build broken in 43466 -- please stop hurting msvc, it just wants to be loved (and wants __declspec placed first).

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sat Oct 17 22:01:58 2009 New Revision: 43542 URL: http://svn.reactos.org/svn/reactos?rev=43542&view=rev Log: - Fix msvc build broken in 43466 -- please stop hurting msvc, it just wants to be loved (and wants __declspec placed first). Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=43542&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Sat Oct 17 22:01:58 2009 @@ -151,7 +151,7 @@ SUBHEAP subheap; /* First sub-heap */ struct list entry; /* Entry in process heap list */ RTL_CRITICAL_SECTION critSection; /* Critical section for serialization */ - FREE_LIST_ENTRY freeList[HEAP_NB_FREE_LISTS] DECLSPEC_ALIGN(8); /* Free lists */ + DECLSPEC_ALIGN(8) FREE_LIST_ENTRY freeList[HEAP_NB_FREE_LISTS]; /* Free lists */ DWORD flags; /* Heap flags */ DWORD magic; /* Magic number */ PRTL_HEAP_COMMIT_ROUTINE commitRoutine;

15 years, 2 months

[cwittich] 43541: sync dialog to wine 1.1.31 (fixes one dialog winetest)

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Oct 17 22:00:54 2009 New Revision: 43541 URL: http://svn.reactos.org/svn/reactos?rev=43541&view=rev Log: sync dialog to wine 1.1.31 (fixes one dialog winetest) Modified: trunk/reactos/dll/win32/user32/windows/dialog.c Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Sat Oct 17 22:00:54 2009 @@ -181,10 +181,11 @@ if (hOwner) hOwner = GetAncestor( hOwner, GA_ROOT ); if (!hOwner) return; - EnableWindow( hOwner, TRUE ); -} - - /*********************************************************************** + EnableWindow( hOwner, TRUE ); +} + + +/*********************************************************************** * DIALOG_DisableOwner * * Helper function for modal dialogs to disable the @@ -205,7 +206,7 @@ return FALSE; } - /*********************************************************************** +/*********************************************************************** * DIALOG_GetControl32 * * Return the class and text of the control pointed to by ptr, @@ -303,10 +304,11 @@ p++; /* Next control is on dword boundary */ - return (const WORD *)((((int)p) + 3) & ~3); -} - - /*********************************************************************** + return (const WORD *)(((UINT_PTR)p + 3) & ~3); +} + + +/*********************************************************************** * DIALOG_CreateControls32 * * Create the control windows for a dialog. @@ -645,9 +647,9 @@ /* Get the font name */ result->pointSize = 0; + result->faceName = NULL; result->weight = FW_DONTCARE; result->italic = FALSE; - result->faceName = NULL; if (result->style & DS_SETFONT) { @@ -660,18 +662,18 @@ */ if (result->pointSize == 0x7fff) { - /* We could call SystemParametersInfo here, but then we'd have - * to convert from pixel size to point size (which can be - * imprecise). - */ + /* We could call SystemParametersInfo here, but then we'd have + * to convert from pixel size to point size (which can be + * imprecise). + */ TRACE(" FONT: Using message box font\n"); } else { if (result->dialogEx) { - result->weight = GET_WORD(p); p++; - result->italic = LOBYTE(GET_WORD(p)); p++; + result->weight = GET_WORD(p); p++; + result->italic = LOBYTE(GET_WORD(p)); p++; } result->faceName = (LPCWSTR)p; p += wcslen( result->faceName ) + 1; @@ -726,7 +728,7 @@ /* If no saved focus control exists, set focus to the first visible, non-disabled, WS_TABSTOP control in the dialog */ infoPtr->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE ); - if (!IsWindow( infoPtr->hwndFocus )) return; + if (!IsWindow( infoPtr->hwndFocus )) return; } DEFDLG_SetFocus( hwnd, infoPtr->hwndFocus ); @@ -783,20 +785,19 @@ ncMetrics.cbSize = sizeof(NONCLIENTMETRICSW); if (SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW), &ncMetrics, 0)) - { - hUserFont = CreateFontIndirectW( &ncMetrics.lfMessageFont ); - } - } - else - { - /* We convert the size to pixels and then make it -ve. This works - * for both +ve and -ve template.pointSize */ - int pixels; - pixels = MulDiv(template.pointSize, GetDeviceCaps(dc , LOGPIXELSY), 72); - hUserFont = CreateFontW( -pixels, 0, 0, 0, template.weight, - template.italic, FALSE, FALSE, DEFAULT_CHARSET, 0, 0, - PROOF_QUALITY, FF_DONTCARE, - template.faceName ); + { + hUserFont = CreateFontIndirectW( &ncMetrics.lfMessageFont ); + } + } + else + { + /* We convert the size to pixels and then make it -ve. This works + * for both +ve and -ve template.pointSize */ + int pixels = MulDiv(template.pointSize, GetDeviceCaps(dc , LOGPIXELSY), 72); + hUserFont = CreateFontW( -pixels, 0, 0, 0, template.weight, + template.italic, FALSE, FALSE, DEFAULT_CHARSET, 0, 0, + PROOF_QUALITY, FF_DONTCARE, + template.faceName ); } if (hUserFont) @@ -840,7 +841,7 @@ { HMONITOR monitor = 0; MONITORINFO mon_info; - + mon_info.cbSize = sizeof(mon_info); if (template.style & DS_CENTER) { @@ -947,7 +948,7 @@ dlgInfo->hMenu = hMenu; dlgInfo->xBaseUnit = xBaseUnit; dlgInfo->yBaseUnit = yBaseUnit; - dlgInfo->idResult = 0; + dlgInfo->idResult = IDOK; dlgInfo->flags = flags; /* dlgInfo->hDialogHeap = 0; */ @@ -993,6 +994,7 @@ if( IsWindow(hwnd) ) DestroyWindow( hwnd ); return 0; } + /*********************************************************************** * DEFDLG_FindDefButton

15 years, 2 months

[fireball] 43540: - It was really too early to remove PatBlt and BitBlt. Get them back for now, since they are still supported.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Oct 17 21:47:26 2009 New Revision: 43540 URL: http://svn.reactos.org/svn/reactos?rev=43540&view=rev Log: - It was really too early to remove PatBlt and BitBlt. Get them back for now, since they are still supported. Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/dll/win32/winent.drv/winent.drv.spec Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Sat Oct 17 21:47:26 2009 @@ -40,7 +40,6 @@ return FALSE; } -#if 0 BOOL CDECL RosDrv_BitBlt( NTDRV_PDEVICE *physDevDst, INT xDst, INT yDst, INT width, INT height, NTDRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, DWORD rop ) @@ -76,7 +75,6 @@ return RosGdiBitBlt(physDevDst->hKernelDC, xDst, yDst, width, height, physDevSrc->hKernelDC, xSrc, ySrc, rop); } -#endif int CDECL RosDrv_ChoosePixelFormat(NTDRV_PDEVICE *physDev, const PIXELFORMATDESCRIPTOR *ppfd) @@ -398,6 +396,29 @@ return FALSE; } +BOOL CDECL RosDrv_PatBlt( NTDRV_PDEVICE *physDev, INT left, INT top, INT width, INT height, DWORD rop ) +{ + POINT pts[2], ptBrush; + + /* Map coordinates */ + pts[0].x = left; + pts[0].y = top; + pts[1].x = left + width; + pts[1].y = top + height; + + LPtoDP(physDev->hUserDC, pts, 2); + width = pts[1].x - pts[0].x; + height = pts[1].y - pts[0].y; + left = pts[0].x; + top = pts[0].y; + + /* Update brush origin */ + GetBrushOrgEx(physDev->hUserDC, &ptBrush); + RosGdiSetBrushOrg(physDev->hKernelDC, ptBrush.x, ptBrush.y); + + return RosGdiPatBlt(physDev->hKernelDC, left, top, width, height, rop); +} + BOOL CDECL RosDrv_Pie( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { @@ -752,16 +773,8 @@ GetBrushOrgEx(physDevDst->hUserDC, &ptBrush); RosGdiSetBrushOrg(physDevDst->hKernelDC, ptBrush.x, ptBrush.y); - if (!physDevSrc) - { - /* This is PatBlt */ - return RosGdiPatBlt(physDevDst->hKernelDC, xDst, yDst, widthDst, heightDst, rop); - } - else - { - return RosGdiStretchBlt(physDevDst->hKernelDC, xDst, yDst, widthDst, heightDst, - physDevSrc->hKernelDC, xSrc, ySrc, widthSrc, heightSrc, rop); - } + return RosGdiStretchBlt(physDevDst->hKernelDC, xDst, yDst, widthDst, heightDst, + physDevSrc->hKernelDC, xSrc, ySrc, widthSrc, heightSrc, rop); } BOOL CDECL RosDrv_SwapBuffers(NTDRV_PDEVICE *physDev) Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.drv.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/winent.drv.spec [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/winent.drv.spec [iso-8859-1] Sat Oct 17 21:47:26 2009 @@ -2,6 +2,7 @@ @ cdecl AlphaBlend(ptr long long long long ptr long long long long long) RosDrv_AlphaBlend @ cdecl Arc(ptr long long long long long long long long) RosDrv_Arc +@ cdecl BitBlt(ptr long long long long ptr long long long) RosDrv_BitBlt @ cdecl ChoosePixelFormat(ptr ptr) RosDrv_ChoosePixelFormat @ cdecl Chord(ptr long long long long long long long long) RosDrv_Chord @ cdecl CreateBitmap(ptr long ptr) RosDrv_CreateBitmap @@ -30,6 +31,7 @@ @ cdecl GetTextMetrics(ptr ptr) RosDrv_GetTextMetrics @ cdecl LineTo(ptr long long) RosDrv_LineTo @ cdecl PaintRgn(ptr long) RosDrv_PaintRgn +@ cdecl PatBlt(ptr long long long long long) RosDrv_PatBlt @ cdecl Pie(ptr long long long long long long long long) RosDrv_Pie @ cdecl PolyPolygon(ptr ptr ptr long) RosDrv_PolyPolygon @ cdecl PolyPolyline(ptr ptr ptr long) RosDrv_PolyPolyline

15 years, 2 months

← Newer
1
...
32
33
34
35
36
37
38
...
65
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 October 2009