Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 65756: [BROWSEUI] Reorder some exports. CORE-8936 CORE-8174
by akhaldi＠svn.reactos.org 20 Dec '14

20 Dec '14

Author: akhaldi Date: Sat Dec 20 15:16:18 2014 New Revision: 65756 URL: http://svn.reactos.org/svn/reactos?rev=65756&view=rev Log: [BROWSEUI] Reorder some exports. CORE-8936 CORE-8174 Modified: trunk/reactos/dll/win32/browseui/browseui.spec Modified: trunk/reactos/dll/win32/browseui/browseui.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui.spec [iso-8859-1] Sat Dec 20 15:16:18 2014 @@ -1,15 +1,15 @@ -@ stdcall -private DllCanUnloadNow() -@ stdcall -private DllGetClassObject(ptr ptr ptr) -@ stdcall -private DllGetVersion(ptr) -@ stdcall -private DllInstall(long wstr) -@ stdcall -private DllRegisterServer() -@ stdcall -private DllUnregisterServer() 101 stdcall -noname InitOCHostClass(long) 102 stdcall -noname SHOpenFolderWindow(ptr) 103 stdcall -noname SHOpenNewFrame(ptr ptr long long) +@ stdcall -private DllCanUnloadNow() 105 stdcall -noname SHCreateSavedWindows() 106 stdcall -noname SHCreateFromDesktop(long) 107 stdcall -noname SHExplorerParseCmdLine(wstr) +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllGetVersion(ptr) +@ stdcall -private DllInstall(long wstr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() 118 stdcall -noname UEMRegisterNotify(long long) 120 stdcall -noname SHCreateBandForPidl(ptr ptr long) 121 stdcall -noname SHPidlFromDataObject(ptr ptr long ptr)

1 0

[akhaldi] 65755: [SHELL32] Add export 007.. I mean 44. Mark some exports for inspection. CORE-8936 CORE-8174
by akhaldi＠svn.reactos.org 20 Dec '14

20 Dec '14

Author: akhaldi Date: Sat Dec 20 15:10:45 2014 New Revision: 65755 URL: http://svn.reactos.org/svn/reactos?rev=65755&view=rev Log: [SHELL32] Add export 007.. I mean 44. Mark some exports for inspection. CORE-8936 CORE-8174 Modified: trunk/reactos/dll/win32/shell32/shell32.spec Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Sat Dec 20 15:10:45 2014 @@ -33,13 +33,14 @@ 34 stdcall -noname PathFindFileName(wstr) PathFindFileNameW 35 stdcall -noname PathRemoveFileSpec(ptr) PathRemoveFileSpecAW # Fixme 36 stdcall -noname PathAppend(ptr ptr) PathAppendAW # Fixme -37 stdcall -noname PathCombine(wstr wstr wstr) PathCombineW +37 stdcall -noname PathCombine(wstr wstr wstr) PathCombineW # FIXME: Inspect 38 stdcall -noname PathStripPath(wstr) PathStripPathW -39 stdcall -noname PathIsUNC(wstr) PathIsUNCW -40 stdcall -noname PathIsRelative(wstr) PathIsRelativeW +39 stdcall -noname PathIsUNC(wstr) PathIsUNCW # FIXME: Inspect +40 stdcall -noname PathIsRelative(wstr) PathIsRelativeW # FIXME: Inspect 41 stdcall IsLFNDriveA(str) 42 stdcall IsLFNDriveW(wstr) 43 stdcall PathIsExe(ptr) PathIsExeAW +44 stub -noname Control_RunDLLNoFallback 45 stdcall -noname PathFileExists(ptr) PathFileExistsAW # Fixme 46 stdcall -noname PathMatchSpec(wstr wstr) PathMatchSpecW 47 stdcall PathMakeUniqueName(ptr long ptr ptr ptr) PathMakeUniqueNameAW @@ -238,7 +239,7 @@ 240 stdcall PathIsSlowA(str long) 241 stdcall -noname SHGetUserDisplayName(wstr ptr) 242 stdcall -noname SHGetProcessDword(long long) # FIXME: Inspect -243 stdcall -noname SHSetShellWindowEx(ptr ptr) user32.SetShellWindowEx +243 stdcall -noname SHSetShellWindowEx(ptr ptr) user32.SetShellWindowEx # FIXME: Inspect 244 stdcall -noname SHInitRestricted(ptr ptr) # FIXME: Inspect 245 stdcall SHTestTokenMembership(ptr ptr) 246 stub -noname SHInvokePrivilegedFunctionW

1 0

[akhaldi] 65754: [SHLWAPI] Stub some exports. Stubplement SHGetAllAccessSA. Based on a patch by Giannis Adamopoulos. CORE-8936 CORE-8174
by akhaldi＠svn.reactos.org 20 Dec '14

20 Dec '14

Author: akhaldi Date: Sat Dec 20 14:54:04 2014 New Revision: 65754 URL: http://svn.reactos.org/svn/reactos?rev=65754&view=rev Log: [SHLWAPI] Stub some exports. Stubplement SHGetAllAccessSA. Based on a patch by Giannis Adamopoulos. CORE-8936 CORE-8174 Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c trunk/reactos/dll/win32/shlwapi/shlwapi.spec Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/ordinal.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] Sat Dec 20 14:54:04 2014 @@ -5307,3 +5307,10 @@ return ret; } + +#ifdef __REACTOS__ +DWORD WINAPI SHGetAllAccessSA(void) +{ + return 0; +} +#endif 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 Dec 20 14:54:04 2014 @@ -204,7 +204,7 @@ 204 stdcall -noname SHIsChildOrSelf(long long) 205 stdcall -noname SHGetValueGoodBootA(long str str ptr ptr ptr) 206 stdcall -noname SHGetValueGoodBootW(long wstr wstr ptr ptr ptr) -#207 stub -noname IContextMenu_Invoke +207 stub -noname IContextMenu_Invoke 208 stdcall -noname FDSA_Initialize(long long ptr ptr long) 209 stdcall -noname FDSA_Destroy(ptr) 210 stdcall -noname FDSA_InsertItem(ptr long ptr) @@ -223,16 +223,16 @@ 223 stdcall -noname SHGlobalCounterGetValue(long) 224 stdcall -noname SHGlobalCounterIncrement(long) 225 stdcall -noname SHStripMneumonicW(wstr) -#226 stub -noname ZoneCheckPathA -#227 stub -noname ZoneCheckPathW -#228 stub -noname ZoneCheckUrlA -#229 stub -noname ZoneCheckUrlW -#230 stub -noname ZoneCheckUrlExA +226 stub -noname ZoneCheckPathA +227 stub -noname ZoneCheckPathW +228 stub -noname ZoneCheckUrlA +229 stub -noname ZoneCheckUrlW +230 stub -noname ZoneCheckUrlExA 231 stdcall -noname ZoneCheckUrlExW(wstr ptr long long long long long long) -#232 stub -noname ZoneCheckUrlExCacheA -#233 stub -noname ZoneCheckUrlExCacheW -#234 stub -noname ZoneCheckHost -#235 stub -noname ZoneCheckHostEx +232 stub -noname ZoneCheckUrlExCacheA +233 stub -noname ZoneCheckUrlExCacheW +234 stub -noname ZoneCheckHost +235 stub -noname ZoneCheckHostEx 236 stdcall -noname SHPinDllOfCLSID(ptr) 237 stdcall -noname SHRegisterClassW(ptr) 238 stdcall -noname SHUnregisterClassesA(ptr ptr long) @@ -243,38 +243,38 @@ 243 stdcall -noname StopWatchA(long str long long long) 244 stdcall -noname StopWatchW(long wstr long long long) 245 stdcall -noname StopWatch_TimerHandler(ptr ptr long ptr) -#246 stub -noname StopWatch_CheckMsg +246 stub -noname StopWatch_CheckMsg 247 stdcall -noname StopWatch_MarkFrameStart(str) -#248 stub -noname StopWatch_MarkSameFrameStart +248 stub -noname StopWatch_MarkSameFrameStart 249 stdcall -noname StopWatch_MarkJavaStop(wstr ptr long) 250 stdcall -noname GetPerfTime() -#251 stub -noname StopWatch_DispatchTime +251 stub -noname StopWatch_DispatchTime 252 stdcall -noname StopWatch_SetMsgLastLocation(long) -#253 stub -noname StopWatchExA -#254 stub -noname StopWatchExW -#255 stub -noname EventTraceHandler +253 stub -noname StopWatchExA +254 stub -noname StopWatchExW +255 stub -noname EventTraceHandler 256 stdcall -noname IUnknown_GetSite(ptr ptr ptr) 257 stdcall -noname SHCreateWorkerWindowA(long ptr long long ptr long) -#258 stub -noname SHRegisterWaitForSingleObject -#259 stub -noname SHUnregisterWait +258 stub -noname SHRegisterWaitForSingleObject +259 stub -noname SHUnregisterWait 260 stdcall -noname SHQueueUserWorkItem(long long long long long long long) -#261 stub -noname SHCreateTimerQueue -#262 stub -noname SHDeleteTimerQueue +261 stub -noname SHCreateTimerQueue +262 stub -noname SHDeleteTimerQueue 263 stdcall -noname SHSetTimerQueueTimer(long ptr ptr long long str long) -#264 stub -noname SHChangeTimerQueueTimer -#265 stub -noname SHCancelTimerQueueTimer +264 stub -noname SHChangeTimerQueueTimer +265 stub -noname SHCancelTimerQueueTimer 266 stdcall -noname SHRestrictionLookup(long wstr ptr ptr) 267 stdcall -noname SHWeakQueryInterface(long long long long) 268 stdcall -noname SHWeakReleaseInterface(long long) 269 stdcall -noname GUIDFromStringA(str ptr) 270 stdcall -noname GUIDFromStringW(wstr ptr) 271 stdcall -noname SHGetRestriction(wstr wstr wstr) -#272 stub -noname SHSetThreadPoolLimits -#273 stub -noname SHTerminateThreadPool -#274 stub -noname RegisterGlobalHotkeyW -#275 stub -noname RegisterGlobalHotkeyA +272 stub -noname SHSetThreadPoolLimits +273 stub -noname SHTerminateThreadPool +274 stub -noname RegisterGlobalHotkeyW +275 stub -noname RegisterGlobalHotkeyA 276 stdcall -noname WhichPlatform() -#277 stub -noname SHDialogBox +277 stub -noname SHDialogBox 278 stdcall -noname SHCreateWorkerWindowW(long long long long long long) 279 stdcall -noname SHInvokeDefaultCommand(ptr ptr ptr) 280 stdcall -noname SHRegGetIntW(ptr wstr long) @@ -285,16 +285,16 @@ 285 stdcall -noname IConnectionPoint_OnChanged(ptr long) 286 varargs -noname IUnknown_CPContainerInvokeParam(ptr ptr long ptr long) 287 stdcall -noname IUnknown_CPContainerOnChanged(ptr long) -#288 stub -noname IUnknown_CPContainerInvokeIndirect +288 stub -noname IUnknown_CPContainerInvokeIndirect 289 stdcall -noname PlaySoundWrapW(wstr long long) -#290 stub -noname SHMirrorIcon +290 stub -noname SHMirrorIcon 291 stdcall -noname SHMessageBoxCheckExA(ptr ptr ptr ptr ptr long str) 292 stdcall -noname SHMessageBoxCheckExW(ptr ptr ptr ptr ptr long wstr) -#293 stub -noname SHCancelUserWorkItems +293 stub -noname SHCancelUserWorkItems 294 stdcall -noname SHGetIniStringW(wstr wstr ptr long wstr) 295 stdcall -noname SHSetIniStringW(wstr ptr wstr wstr) -#296 stub -noname CreateURLFileContentsW -#297 stub -noname CreateURLFileContentsA +296 stub -noname CreateURLFileContentsW +297 stub -noname CreateURLFileContentsA 298 stdcall -noname WritePrivateProfileStringWrapW(wstr wstr wstr wstr) kernel32.WritePrivateProfileStringW 299 stdcall -noname ExtTextOutWrapW(long long long long ptr wstr long ptr) gdi32.ExtTextOutW 300 stdcall -noname CreateFontWrapW(long long long long long long long long long long long long long wstr) gdi32.CreateFontW @@ -313,8 +313,8 @@ 313 stdcall -noname SHGetFileInfoWrapW(ptr long ptr long long) 314 stdcall -noname RegisterClassExWrapW(ptr) user32.RegisterClassExW 315 stdcall -noname GetClassInfoExWrapW(long wstr ptr) user32.GetClassInfoExW -#316 stub -noname IShellFolder_GetDisplayNameOf -#317 stub -noname IShellFolder_ParseDisplayName +316 stub -noname IShellFolder_GetDisplayNameOf +317 stub -noname IShellFolder_ParseDisplayName 318 stdcall -noname DragQueryFileWrapW(long long wstr long) 319 stdcall -noname FindWindowExWrapW(long long wstr wstr) user32.FindWindowExW 320 stdcall -noname RegisterMIMETypeForExtensionA(str str) @@ -345,8 +345,8 @@ 345 stdcall -noname SHAnsiToAnsi(str ptr long) 346 stdcall -noname SHUnicodeToUnicode(wstr ptr long) 347 stdcall -noname RegDeleteValueWrapW(long wstr) advapi32.RegDeleteValueW -#348 stub -noname SHGetFileDescriptionW -#349 stub -noname SHGetFileDescriptionA +348 stub -noname SHGetFileDescriptionW +349 stub -noname SHGetFileDescriptionA 350 stdcall -noname GetFileVersionInfoSizeWrapW(wstr ptr) 351 stdcall -noname GetFileVersionInfoWrapW(wstr long long ptr) 352 stdcall -noname VerQueryValueWrapW(ptr wstr ptr ptr) @@ -371,20 +371,20 @@ 371 stdcall -noname DdeInitializeWrapW(ptr ptr long long) user32.DdeInitializeW 372 stdcall -noname DdeCreateStringHandleWrapW(long ptr long) user32.DdeCreateStringHandleW 373 stdcall -noname DdeQueryStringWrapW(long ptr wstr long long) user32.DdeQueryStringW -#374 stub -noname SHCheckDiskForMediaA -#375 stub -noname SHCheckDiskForMediaW +374 stub -noname SHCheckDiskForMediaA +375 stub -noname SHCheckDiskForMediaW 376 stdcall -noname MLGetUILanguage() kernel32.GetUserDefaultUILanguage 377 stdcall -noname MLLoadLibraryA(str long long) 378 stdcall -noname MLLoadLibraryW(wstr long long) -#379 stub -noname Shell_GetCachedImageIndexWrapW -#380 stub -noname Shell_GetCachedImageIndexWrapA -#381 stub -noname AssocCopyVerbs +379 stub -noname Shell_GetCachedImageIndexWrapW +380 stub -noname Shell_GetCachedImageIndexWrapA +381 stub -noname AssocCopyVerbs 382 stdcall -noname ZoneComputePaneSize(ptr) -#383 stub -noname ZoneConfigureW -#384 stub -noname SHRestrictedMessageBox -#385 stub -noname SHLoadRawAccelerators -#386 stub -noname SHQueryRawAccelerator -#387 stub -noname SHQueryRawAcceleratorMsg +383 stub -noname ZoneConfigureW +384 stub -noname SHRestrictedMessageBox +385 stub -noname SHLoadRawAccelerators +386 stub -noname SHQueryRawAccelerator +387 stub -noname SHQueryRawAcceleratorMsg 388 varargs -noname ShellMessageBoxWrapW(long long wstr wstr long) 389 stdcall -noname GetSaveFileNameWrapW(ptr) 390 stdcall -noname WNetRestoreConnectionWrapW(long wstr) @@ -392,10 +392,10 @@ 392 stdcall -noname EndDialogWrap(ptr ptr) user32.EndDialog 393 stdcall -noname CreateDialogIndirectParamWrapW(long ptr long ptr long) user32.CreateDialogIndirectParamW 394 stdcall -noname SHChangeNotifyWrap(long long ptr ptr) -#395 stub -noname MLWinHelpA -#396 stub -noname MLHtmlHelpA -#397 stub -noname MLWinHelpW -#398 stub -noname MLHtmlHelpW +395 stub -noname MLWinHelpA +396 stub -noname MLHtmlHelpA +397 stub -noname MLWinHelpW +398 stub -noname MLHtmlHelpW 399 stdcall -noname StrCpyNXA(ptr str long) 400 stdcall -noname StrCpyNXW(ptr wstr long) 401 stdcall -noname PageSetupDlgWrapW(ptr) @@ -404,21 +404,21 @@ 404 stdcall -noname IShellFolder_EnumObjects(ptr ptr long ptr) SHIShellFolder_EnumObjects 405 stdcall -noname MLBuildResURLA(str ptr long str ptr long) 406 stdcall -noname MLBuildResURLW(wstr ptr long wstr ptr long) -#407 stub -noname AssocMakeProgid -#408 stub -noname AssocMakeShell -#409 stub -noname AssocMakeApplicationByKeyW -#410 stub -noname AssocMakeApplicationByKeyA -#411 stub -noname AssocMakeFileExtsToApplicationW -#412 stub -noname AssocMakeFileExtsToApplicationA +407 stub -noname AssocMakeProgid +408 stub -noname AssocMakeShell +409 stub -noname AssocMakeApplicationByKeyW +410 stub -noname AssocMakeApplicationByKeyA +411 stub -noname AssocMakeFileExtsToApplicationW +412 stub -noname AssocMakeFileExtsToApplicationA 413 stdcall -noname SHGetMachineInfo(long) -#414 stub -noname SHHtmlHelpOnDemandW -#415 stub -noname SHHtmlHelpOnDemandA +414 stub -noname SHHtmlHelpOnDemandW +415 stub -noname SHHtmlHelpOnDemandA 416 stdcall -noname SHWinHelpOnDemandW(long wstr long ptr long) 417 stdcall -noname SHWinHelpOnDemandA(long str long ptr long) 418 stdcall -noname MLFreeLibrary(long) 419 stdcall -noname SHFlushSFCacheWrap() -#420 stub SHLWAPI_420 # CMemStream::Commit ?? -#421 stub -noname SHLoadPersistedDataObject +420 stub -noname SHLWAPI_420 # CMemStream::Commit ?? +421 stub -noname SHLoadPersistedDataObject 422 stdcall -noname SHGlobalCounterCreateNamedA(str long) 423 stdcall -noname SHGlobalCounterCreateNamedW(wstr long) 424 stdcall -noname SHGlobalCounterDecrement(long) @@ -435,7 +435,7 @@ 435 stdcall -noname CLSIDFromProgIDWrap(wstr ptr) ole32.CLSIDFromProgID 436 stdcall -noname CLSIDFromStringWrap(wstr ptr) 437 stdcall -noname IsOS(long) -#438 stub -noname SHLoadRegUIStringA +438 stub -noname SHLoadRegUIStringA 439 stdcall -noname SHLoadRegUIStringW(ptr wstr ptr long) 440 stdcall -noname SHGetWebFolderFilePathA(str ptr long) 441 stdcall -noname SHGetWebFolderFilePathW(wstr ptr long) @@ -444,14 +444,14 @@ 444 stdcall -noname SHGetSystemWindowsDirectoryW(ptr long) kernel32.GetSystemWindowsDirectoryW 445 stdcall -noname PathFileExistsAndAttributesA(str ptr) 446 stdcall -noname PathFileExistsAndAttributesW(wstr ptr) -#447 stub -noname FixSlashesAndColonA +447 stub -noname FixSlashesAndColonA 448 stdcall -noname FixSlashesAndColonW(wstr) -#449 stub -noname NextPathA -#450 stub -noname NextPathW -#451 stub -noname CharUpperNoDBCSA -#452 stub -noname CharUpperNoDBCSW -#453 stub -noname CharLowerNoDBCSA -#454 stub -noname CharLowerNoDBCSW +449 stub -noname NextPathA +450 stub -noname NextPathW +451 stub -noname CharUpperNoDBCSA +452 stub -noname CharUpperNoDBCSW +453 stub -noname CharLowerNoDBCSA +454 stub -noname CharLowerNoDBCSW 455 stdcall -noname PathIsValidCharA(long long) 456 stdcall -noname PathIsValidCharW(long long) 457 stdcall -noname GetLongPathNameWrapW(wstr ptr long) kernel32.GetLongPathNameW @@ -462,108 +462,108 @@ 462 stdcall -noname UrlFixupW(wstr wstr long) 463 stdcall -noname SHExpandEnvironmentStringsForUserA(ptr str ptr long) userenv.ExpandEnvironmentStringsForUserA 464 stdcall -noname SHExpandEnvironmentStringsForUserW(ptr wstr ptr long) userenv.ExpandEnvironmentStringsForUserW -#465 stub -noname PathUnExpandEnvStringsForUserA -#466 stub -noname PathUnExpandEnvStringsForUserW +465 stub -noname PathUnExpandEnvStringsForUserA +466 stub -noname PathUnExpandEnvStringsForUserW 467 stub -ordinal SHRunIndirectRegClientCommand -#468 stub -noname RunIndirectRegCommand -#469 stub -noname RunRegCommand -#470 stub -noname IUnknown_ProfferServiceOld +468 stub -noname RunIndirectRegCommand +469 stub -noname RunRegCommand +470 stub -noname IUnknown_ProfferServiceOld 471 stdcall -noname SHCreatePropertyBagOnRegKey(long wstr long ptr ptr) -#472 stub -noname SHCreatePropertyBagOnProfileSelection -#473 stub -noname SHGetIniStringUTF7W -#474 stub -noname SHSetIniStringUTF7W +472 stub -noname SHCreatePropertyBagOnProfileSelection +473 stub -noname SHGetIniStringUTF7W +474 stub -noname SHSetIniStringUTF7W 475 stdcall -noname GetShellSecurityDescriptor(ptr long) 476 stdcall -noname SHGetObjectCompatFlags(ptr ptr) -#477 stub -noname SHCreatePropertyBagOnMemory +477 stub -noname SHCreatePropertyBagOnMemory 478 stdcall -noname IUnknown_TranslateAcceleratorIO(ptr ptr) 479 stdcall -noname IUnknown_UIActivateIO(ptr long ptr) 480 stdcall -noname UrlCrackW(wstr long long ptr) wininet.InternetCrackUrlW 481 stdcall -noname IUnknown_HasFocusIO(ptr) -#482 stub -noname SHMessageBoxHelpA -#483 stub -noname SHMessageBoxHelpW +482 stub -noname SHMessageBoxHelpA +483 stub -noname SHMessageBoxHelpW 484 stdcall -noname IUnknown_QueryServiceExec(ptr ptr ptr long long long ptr) -#485 stub -noname MapWin32ErrorToSTG -#486 stub -noname ModeToCreateFileFlags +485 stub -noname MapWin32ErrorToSTG +486 stub -noname ModeToCreateFileFlags 487 stdcall -ordinal SHLoadIndirectString(wstr ptr long ptr) -#488 stub -noname SHConvertGraphicsFile +488 stub -noname SHConvertGraphicsFile 489 stdcall -noname GlobalAddAtomWrapW(wstr) kernel32.GlobalAddAtomW 490 stdcall -noname GlobalFindAtomWrapW(wstr) kernel32.GlobalFindAtomW 491 stdcall -noname SHGetShellKey(long long long) -#492 stub -noname PrettifyFileDescriptionW -#493 stub -noname SHPropertyBag_ReadType -#494 stub -noname SHPropertyBag_ReadStr -#495 stub -noname SHPropertyBag_WriteStr +492 stub -noname PrettifyFileDescriptionW +493 stub -noname SHPropertyBag_ReadType +494 stub -noname SHPropertyBag_ReadStr +495 stub -noname SHPropertyBag_WriteStr 496 stdcall -noname SHPropertyBag_ReadLONG(ptr wstr ptr) -#497 stub -noname SHPropertyBag_WriteLONG -#498 stub -noname SHPropertyBag_ReadBOOLOld -#499 stub -noname SHPropertyBag_WriteBOOL +497 stub -noname SHPropertyBag_WriteLONG +498 stub -noname SHPropertyBag_ReadBOOLOld +499 stub -noname SHPropertyBag_WriteBOOL 500 stdcall AssocGetPerceivedType(wstr ptr ptr ptr) 501 stdcall AssocIsDangerous(wstr) 502 stdcall AssocQueryKeyA(long long str str ptr) 503 stdcall AssocQueryKeyW(long long wstr wstr ptr) 504 stdcall AssocQueryStringA(long long str str ptr ptr) -#505 stub -noname SHPropertyBag_ReadGUID -#506 stub -noname SHPropertyBag_WriteGUID -#507 stub -noname SHPropertyBag_ReadDWORD -#508 stub -noname SHPropertyBag_WriteDWORD +505 stub -noname SHPropertyBag_ReadGUID +506 stub -noname SHPropertyBag_WriteGUID +507 stub -noname SHPropertyBag_ReadDWORD +508 stub -noname SHPropertyBag_WriteDWORD 509 stdcall -noname IUnknown_OnFocusChangeIS(ptr ptr long) -#510 stub -noname SHLockSharedEx -#511 stub -noname PathFileExistsDefExtAndAttributesW -#512 stub -ordinal IStream_ReadPidl -#513 stub -ordinal IStream_WritePidl +510 stub -noname SHLockSharedEx +511 stub -noname PathFileExistsDefExtAndAttributesW +512 stub -ordinal IStream_ReadPidl +513 stub -ordinal IStream_WritePidl 514 stdcall -noname IUnknown_ProfferService(ptr ptr ptr ptr) 515 stdcall -ordinal SHGetViewStatePropertyBag(ptr wstr long ptr ptr) 516 stdcall -noname SKGetValueW(long wstr wstr ptr ptr ptr) 517 stdcall -noname SKSetValueW(long wstr wstr long ptr long) 518 stdcall -noname SKDeleteValueW(long wstr wstr) 519 stdcall -noname SKAllocValueW(long wstr wstr ptr ptr ptr) -#520 stub -noname SHPropertyBag_ReadBSTR -#521 stub -noname SHPropertyBag_ReadPOINTL -#522 stub -noname SHPropertyBag_WritePOINTL -#523 stub -noname SHPropertyBag_ReadRECTL -#524 stub -noname SHPropertyBag_WriteRECTL -#525 stub -noname SHPropertyBag_ReadPOINTS -#526 stub -noname SHPropertyBag_WritePOINTS -#527 stub -noname SHPropertyBag_ReadSHORT -#528 stub -noname SHPropertyBag_WriteSHORT -#529 stub -noname SHPropertyBag_ReadInt -#530 stub -noname SHPropertyBag_WriteInt -#531 stub -noname SHPropertyBag_ReadStream -#532 stub -noname SHPropertyBag_WriteStream -#533 stub -noname SHGetPerScreenResName -#534 stub -noname SHPropertyBag_ReadBOOL -#535 stub -noname SHPropertyBag_Delete -#536 stub -noname IUnknown_QueryServicePropertyBag -#537 stub -noname SHBoolSystemParametersInfo +520 stub -noname SHPropertyBag_ReadBSTR +521 stub -noname SHPropertyBag_ReadPOINTL +522 stub -noname SHPropertyBag_WritePOINTL +523 stub -noname SHPropertyBag_ReadRECTL +524 stub -noname SHPropertyBag_WriteRECTL +525 stub -noname SHPropertyBag_ReadPOINTS +526 stub -noname SHPropertyBag_WritePOINTS +527 stub -noname SHPropertyBag_ReadSHORT +528 stub -noname SHPropertyBag_WriteSHORT +529 stub -noname SHPropertyBag_ReadInt +530 stub -noname SHPropertyBag_WriteInt +531 stub -noname SHPropertyBag_ReadStream +532 stub -noname SHPropertyBag_WriteStream +533 stub -noname SHGetPerScreenResName +534 stub -noname SHPropertyBag_ReadBOOL +535 stub -noname SHPropertyBag_Delete +536 stub -noname IUnknown_QueryServicePropertyBag +537 stub -noname SHBoolSystemParametersInfo 538 stdcall -noname IUnknown_QueryServiceForWebBrowserApp(ptr ptr ptr) -#539 stub -noname IUnknown_ShowBrowserBar -#540 stub -noname SHInvokeCommandOnContextMenu -#541 stub -noname SHInvokeCommandsOnContextMen +539 stub -noname IUnknown_ShowBrowserBar +540 stub -noname SHInvokeCommandOnContextMenu +541 stub -noname SHInvokeCommandsOnContextMen 542 stdcall -noname GetUIVersion() 543 stdcall -noname CreateColorSpaceWrapW(ptr) gdi32.CreateColorSpaceW -#544 stub -noname QuerySourceCreateFromKey -#545 stub -noname SHForwardContextMenuMsg -#546 stub -noname IUnknown_DoContextMenuPopup +544 stub -noname QuerySourceCreateFromKey +545 stub -noname SHForwardContextMenuMsg +546 stub -noname IUnknown_DoContextMenuPopup 547 stdcall DelayLoadFailureHook(str str) kernel32.DelayLoadFailureHook -#548 stub -noname SHAreIconsEqual +548 stub -noname SHAreIconsEqual 549 stdcall -noname SHCoCreateInstanceAC(ptr ptr long ptr ptr) -#550 stub -noname GetTemplateInfoFromHandle -#551 stub -noname IShellFolder_CompareIDs -#552 SHEvaluateSystemCommandTemplate +550 stub -noname GetTemplateInfoFromHandle +551 stub -noname IShellFolder_CompareIDs +552 stub -noname SHEvaluateSystemCommandTemplate 553 stdcall IsInternetESCEnabled() -#554 SHGetAllAccessSA +554 stdcall -noname SHGetAllAccessSA() 555 stdcall AssocQueryStringByKeyA(long long ptr str ptr ptr) -#556 SHCoExtensionAllowed -#557 SHCoCreateExtension -#558 SHCoExtensionCollectStats -#559 SHGetSignatureInfo -#560 SHWindowsPolicyGetValue -#561 AssocGetUrlAction -#562 SHGetPrivateProfileInt -#563 SHGetPrivateProfileSection -#564 SHGetPrivateProfileSectionNames -#565 SHGetPrivateProfileString -#566 SHGetPrivateProfileStruct +556 stub -noname SHCoExtensionAllowed +557 stub -noname SHCoCreateExtension +558 stub -noname SHCoExtensionCollectStats +559 stub -noname SHGetSignatureInfo +560 stub -noname SHWindowsPolicyGetValue +561 stub -noname AssocGetUrlAction +562 stub -noname SHGetPrivateProfileInt +563 stub -noname SHGetPrivateProfileSection +564 stub -noname SHGetPrivateProfileSectionNames +565 stub -noname SHGetPrivateProfileString +566 stub -noname SHGetPrivateProfileStruct 567 stdcall AssocQueryStringByKeyW(long long ptr wstr ptr ptr) 568 stdcall AssocQueryStringW(long long wstr wstr ptr ptr) 569 stdcall ChrCmpIA(long long) @@ -772,7 +772,7 @@ 772 stdcall StrChrA(str long) 773 stdcall StrChrIA(str long) 774 stdcall StrChrIW(wstr long) -#775 StrChrNIW +775 stub StrChrNIW 776 stdcall StrChrNW(wstr long long) 777 stdcall StrChrW(wstr long) 778 stdcall StrCmpIW(wstr wstr)

1 0

[hbelusca] 65753: [SERVICES]: Do not use GetSystemMetrics to retrieve SafeBoot option value, but instead use directly the registry (as it is done just after...).
by hbelusca＠svn.reactos.org 20 Dec '14

20 Dec '14

Author: hbelusca Date: Sat Dec 20 03:12:23 2014 New Revision: 65753 URL: http://svn.reactos.org/svn/reactos?rev=65753&view=rev Log: [SERVICES]: Do not use GetSystemMetrics to retrieve SafeBoot option value, but instead use directly the registry (as it is done just after...). Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sat Dec 20 03:12:23 2014 @@ -1774,13 +1774,15 @@ VOID ScmAutoStartServices(VOID) { - DWORD dwError = ERROR_SUCCESS; + DWORD dwError; PLIST_ENTRY GroupEntry; PLIST_ENTRY ServiceEntry; PSERVICE_GROUP CurrentGroup; PSERVICE CurrentService; WCHAR szSafeBootServicePath[MAX_PATH]; + DWORD SafeBootEnabled; HKEY hKey; + DWORD dwKeySize; ULONG i; /* @@ -1789,6 +1791,30 @@ */ ASSERT(ScmInitialize); + /* + * Retrieve the SafeBoot parameter. + */ + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\SafeBoot\\Option", + 0, + KEY_READ, + &hKey); + if (dwError == ERROR_SUCCESS) + { + dwKeySize = sizeof(SafeBootEnabled); + dwError = RegQueryValueExW(hKey, + L"OptionValue", + 0, + NULL, + (LPBYTE)&SafeBootEnabled, + &dwKeySize); + RegCloseKey(hKey); + } + + /* Default to Normal boot if the value doesn't exist */ + if (dwError != ERROR_SUCCESS) + SafeBootEnabled = 0; + /* Acquire the service control critical section, to synchronize starts */ EnterCriticalSection(&ControlServiceCriticalSection); @@ -1802,7 +1828,7 @@ wcscpy(szSafeBootServicePath, L"SYSTEM\\CurrentControlSet\\Control\\SafeBoot"); - switch (GetSystemMetrics(SM_CLEANBOOT)) + switch (SafeBootEnabled) { /* NOTE: Assumes MINIMAL (1) and DSREPAIR (3) load same items */ case 1: @@ -1815,7 +1841,7 @@ break; } - if (GetSystemMetrics(SM_CLEANBOOT)) + if (SafeBootEnabled != 0) { /* If key does not exist then do not assume safe mode */ dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, @@ -2028,14 +2054,13 @@ &hKey); if (dwError == ERROR_SUCCESS) { - dwKeySize = sizeof(DWORD); + dwKeySize = sizeof(PipeTimeout); RegQueryValueExW(hKey, L"ServicesPipeTimeout", 0, NULL, (LPBYTE)&PipeTimeout, &dwKeySize); - RegCloseKey(hKey); } }

1 0

[gadamopoulos] 65752: [UXTHEME] * Implement a few functions needed by windows themeui.dll
by gadamopoulos＠svn.reactos.org 19 Dec '14

19 Dec '14

Author: gadamopoulos Date: Fri Dec 19 14:21:18 2014 New Revision: 65752 URL: http://svn.reactos.org/svn/reactos?rev=65752&view=rev Log: [UXTHEME] * Implement a few functions needed by windows themeui.dll Modified: trunk/reactos/dll/win32/uxtheme/themehooks.c trunk/reactos/dll/win32/uxtheme/uxtheme.spec Modified: trunk/reactos/dll/win32/uxtheme/themehooks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/themehoo… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] Fri Dec 19 14:21:18 2014 @@ -399,4 +399,44 @@ UXTHEME_broadcast_msg (NULL, WM_THEMECHANGED); return ret; -} +} + +INT WINAPI ClassicSystemParametersInfoW(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni) +{ + if (gbThemeHooksActive) + { + return user32ApiHook.SystemParametersInfoW(uiAction, uiParam, pvParam, fWinIni); + } + + return SystemParametersInfoW(uiAction, uiParam, pvParam, fWinIni); +} + +INT WINAPI ClassicSystemParametersInfoA(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni) +{ + if (gbThemeHooksActive) + { + return user32ApiHook.SystemParametersInfoA(uiAction, uiParam, pvParam, fWinIni); + } + + return SystemParametersInfoA(uiAction, uiParam, pvParam, fWinIni); +} + +INT WINAPI ClassicGetSystemMetrics(int nIndex) +{ + if (gbThemeHooksActive) + { + return user32ApiHook.GetSystemMetrics(nIndex); + } + + return GetSystemMetrics(nIndex); +} + +BOOL WINAPI ClassicAdjustWindowRectEx(LPRECT lpRect, DWORD dwStyle, BOOL bMenu, DWORD dwExStyle) +{ + if (gbThemeHooksActive) + { + return user32ApiHook.AdjustWindowRectEx(lpRect, dwStyle, bMenu, dwExStyle); + } + + return AdjustWindowRectEx(lpRect, dwStyle, bMenu, dwExStyle); +} Modified: trunk/reactos/dll/win32/uxtheme/uxtheme.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxtheme.… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxtheme.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxtheme.spec [iso-8859-1] Fri Dec 19 14:21:18 2014 @@ -40,10 +40,10 @@ 40 stdcall EnableThemeDialogTexture(ptr long) 41 stdcall EnableTheming(long) 42 stdcall GetCurrentThemeName(wstr long wstr long wstr long) -43 stub -noname ClassicGetSystemMetrics -44 stub -noname ClassicSystemParametersInfoA -45 stub -noname ClassicSystemParametersInfoW -46 stub -noname ClassicAdjustWindowRectEx +43 stdcall -noname ClassicGetSystemMetrics(long) +44 stdcall -noname ClassicSystemParametersInfoA(long long ptr long) +45 stdcall -noname ClassicSystemParametersInfoW(long long ptr long) +46 stdcall -noname ClassicAdjustWindowRectEx(ptr long long long) 47 stdcall DrawThemeBackgroundEx(ptr ptr long long ptr ptr) 48 stub -noname GetThemeParseErrorInfo 49 stdcall GetThemeAppProperties()

1 0

[akhaldi] 65751: [UXTHEME] Remove some exports that do not exist in native. Reorder some exports. Add some missing exports. Mark OpenThemeDataEx as noname. CORE-8174
by akhaldi＠svn.reactos.org 19 Dec '14

19 Dec '14

Author: akhaldi Date: Fri Dec 19 14:00:09 2014 New Revision: 65751 URL: http://svn.reactos.org/svn/reactos?rev=65751&view=rev Log: [UXTHEME] Remove some exports that do not exist in native. Reorder some exports. Add some missing exports. Mark OpenThemeDataEx as noname. CORE-8174 Modified: trunk/reactos/dll/win32/uxtheme/uxtheme.spec Modified: trunk/reactos/dll/win32/uxtheme/uxtheme.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxtheme.… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxtheme.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxtheme.spec [iso-8859-1] Fri Dec 19 14:00:09 2014 @@ -1,13 +1,15 @@ -# Undocumented functions - Names derived from debug symbols -1 stdcall -noname QueryThemeServices() -2 stdcall -noname OpenThemeFile(wstr wstr wstr ptr long) -3 stdcall -noname CloseThemeFile(ptr) -4 stdcall -noname ApplyTheme(ptr ptr ptr) -7 stdcall -noname GetThemeDefaults(wstr wstr long wstr long) -8 stdcall -noname EnumThemes(wstr ptr ptr) -9 stdcall -noname EnumThemeColors(wstr wstr long ptr) +1 stdcall -noname QueryThemeServices() +2 stdcall -noname OpenThemeFile(wstr wstr wstr ptr long) +3 stdcall -noname CloseThemeFile(ptr) +4 stdcall -noname ApplyTheme(ptr ptr ptr) +5 stdcall CloseThemeData(ptr) +6 stdcall DrawThemeBackground(ptr ptr long long ptr ptr) +7 stdcall -noname GetThemeDefaults(wstr wstr long wstr long) +8 stdcall -noname EnumThemes(wstr ptr ptr) +9 stdcall -noname EnumThemeColors(wstr wstr long ptr) 10 stdcall -noname EnumThemeSizes(wstr wstr long ptr) 11 stdcall -noname ParseThemeIniFile(wstr wstr ptr ptr) +12 stdcall DrawThemeEdge(ptr ptr long long ptr long long ptr) 13 stdcall -noname DrawNCPreview(ptr long ptr wstr wstr wstr ptr ptr) 14 stub -noname RegisterDefaultTheme 15 stub -noname DumpLoadedThemeToTextFile @@ -32,67 +34,62 @@ 34 stdcall -noname ThemeHooksInstall() 35 stdcall -noname ThemeHooksRemove() 36 stub -noname RefreshThemeForTS +37 stdcall DrawThemeIcon(ptr ptr long long ptr ptr long) +38 stdcall DrawThemeParentBackground(ptr ptr ptr) +39 stdcall DrawThemeText(ptr ptr long long wstr long long long ptr) +40 stdcall EnableThemeDialogTexture(ptr long) +41 stdcall EnableTheming(long) +42 stdcall GetCurrentThemeName(wstr long wstr long wstr long) 43 stub -noname ClassicGetSystemMetrics 44 stub -noname ClassicSystemParametersInfoA 45 stub -noname ClassicSystemParametersInfoW 46 stub -noname ClassicAdjustWindowRectEx +47 stdcall DrawThemeBackgroundEx(ptr ptr long long ptr ptr) 48 stub -noname GetThemeParseErrorInfo +49 stdcall GetThemeAppProperties() +50 stdcall GetThemeBackgroundContentRect(ptr ptr long long ptr ptr) +51 stdcall GetThemeBackgroundExtent(ptr ptr long long ptr ptr) +52 stdcall GetThemeBackgroundRegion(ptr ptr long long ptr ptr) +53 stdcall GetThemeBool(ptr long long long ptr) +54 stdcall GetThemeColor(ptr long long long ptr) +55 stdcall GetThemeDocumentationProperty(wstr wstr wstr long) +56 stdcall GetThemeEnumValue(ptr long long long ptr) +57 stdcall GetThemeFilename(ptr long long long wstr long) +58 stdcall GetThemeFont(ptr ptr long long long ptr) +59 stdcall GetThemeInt(ptr long long long ptr) 60 stub -noname CreateThemeDataFromObjects -61 stdcall OpenThemeDataEx(ptr wstr long) +61 stdcall -noname OpenThemeDataEx(ptr wstr long) 62 stub -noname ServerClearStockObjects 63 stub -noname MarkSelection - -# Standard functions -@ stdcall BeginBufferedPaint(ptr ptr long ptr ptr) -@ stdcall BufferedPaintInit() -@ stdcall BufferedPaintUnInit() -@ stdcall CloseThemeData(ptr) -@ stdcall DrawThemeBackground(ptr ptr long long ptr ptr) -@ stdcall DrawThemeBackgroundEx(ptr ptr long long ptr ptr) -@ stdcall DrawThemeEdge(ptr ptr long long ptr long long ptr) -@ stdcall DrawThemeIcon(ptr ptr long long ptr ptr long) -@ stdcall DrawThemeParentBackground(ptr ptr ptr) -@ stdcall DrawThemeText(ptr ptr long long wstr long long long ptr) -@ stdcall EnableThemeDialogTexture(ptr long) -@ stdcall EnableTheming(long) -@ stdcall EndBufferedPaint(ptr long) -@ stdcall GetCurrentThemeName(wstr long wstr long wstr long) -@ stdcall GetThemeAppProperties() -@ stdcall GetThemeBackgroundContentRect(ptr ptr long long ptr ptr) -@ stdcall GetThemeBackgroundExtent(ptr ptr long long ptr ptr) -@ stdcall GetThemeBackgroundRegion(ptr ptr long long ptr ptr) -@ stdcall GetThemeBool(ptr long long long ptr) -@ stdcall GetThemeColor(ptr long long long ptr) -@ stdcall GetThemeDocumentationProperty(wstr wstr wstr long) -@ stdcall GetThemeEnumValue(ptr long long long ptr) -@ stdcall GetThemeFilename(ptr long long long wstr long) -@ stdcall GetThemeFont(ptr ptr long long long ptr) -@ stdcall GetThemeInt(ptr long long long ptr) -@ stdcall GetThemeIntList(ptr long long long ptr) -@ stdcall GetThemeMargins(ptr ptr long long long ptr ptr) -@ stdcall GetThemeMetric(ptr ptr long long long ptr) -@ stdcall GetThemePartSize(ptr ptr long long ptr long ptr) -@ stdcall GetThemePosition(ptr long long long ptr) -@ stdcall GetThemePropertyOrigin(ptr long long long ptr) -@ stdcall GetThemeRect(ptr long long long ptr) -@ stdcall GetThemeString(ptr long long long wstr long) -@ stdcall GetThemeSysBool(ptr long) -@ stdcall GetThemeSysColor(ptr long) -@ stdcall GetThemeSysColorBrush(ptr long) -@ stdcall GetThemeSysFont(ptr long ptr) -@ stdcall GetThemeSysInt(ptr long ptr) -@ stdcall GetThemeSysSize(ptr long) -@ stdcall GetThemeSysString(ptr long wstr long) -@ stdcall GetThemeTextExtent(ptr ptr long long wstr long long ptr ptr) -@ stdcall GetThemeTextMetrics(ptr ptr long long ptr) -@ stdcall GetWindowTheme(ptr) -@ stdcall HitTestThemeBackground(ptr long long long long ptr long double ptr) -@ stdcall IsAppThemed() -@ stdcall IsThemeActive() -@ stdcall IsThemeBackgroundPartiallyTransparent(ptr long long) -@ stdcall IsThemeDialogTextureEnabled(ptr) -@ stdcall IsThemePartDefined(ptr long long) -@ stdcall OpenThemeData(ptr wstr) -@ stdcall SetThemeAppProperties(long) -@ stdcall SetWindowTheme(ptr wstr wstr) -@ stdcall ThemeInitApiHook(long ptr) +#64 ProcessLoadTheme_RunDLLW +#65 SetSystemVisualStyle +#66 ServiceClearStockObjects +67 stdcall GetThemeIntList(ptr long long long ptr) +68 stdcall GetThemeMargins(ptr ptr long long long ptr ptr) +69 stdcall GetThemeMetric(ptr ptr long long long ptr) +70 stdcall GetThemePartSize(ptr ptr long long ptr long ptr) +71 stdcall GetThemePosition(ptr long long long ptr) +72 stdcall GetThemePropertyOrigin(ptr long long long ptr) +#73 IsThemeActiveByPolicy +74 stdcall GetThemeRect(ptr long long long ptr) +75 stdcall GetThemeString(ptr long long long wstr long) +76 stdcall GetThemeSysBool(ptr long) +77 stdcall GetThemeSysColor(ptr long) +78 stdcall GetThemeSysColorBrush(ptr long) +79 stdcall GetThemeSysFont(ptr long ptr) +80 stdcall GetThemeSysInt(ptr long ptr) +81 stdcall GetThemeSysSize(ptr long) +82 stdcall GetThemeSysString(ptr long wstr long) +83 stdcall GetThemeTextExtent(ptr ptr long long wstr long long ptr ptr) +84 stdcall GetThemeTextMetrics(ptr ptr long long ptr) +85 stdcall GetWindowTheme(ptr) +86 stdcall HitTestThemeBackground(ptr long long long long ptr long double ptr) +87 stdcall IsAppThemed() +88 stdcall IsThemeActive() +89 stdcall IsThemeBackgroundPartiallyTransparent(ptr long long) +90 stdcall IsThemeDialogTextureEnabled(ptr) +91 stdcall IsThemePartDefined(ptr long long) +92 stdcall OpenThemeData(ptr wstr) +93 stdcall SetThemeAppProperties(long) +94 stdcall SetWindowTheme(ptr wstr wstr) +95 stdcall ThemeInitApiHook(long ptr)

1 0

[akhaldi] 65750: [SHLWAPI_WINETEST] Addendum to r65749. CORE-7556
by akhaldi＠svn.reactos.org 19 Dec '14

19 Dec '14

Author: akhaldi Date: Fri Dec 19 13:22:15 2014 New Revision: 65750 URL: http://svn.reactos.org/svn/reactos?rev=65750&view=rev Log: [SHLWAPI_WINETEST] Addendum to r65749. CORE-7556 Modified: trunk/rostests/winetests/shlwapi/string.c Modified: trunk/rostests/winetests/shlwapi/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/string.… ============================================================================== --- trunk/rostests/winetests/shlwapi/string.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/string.c [iso-8859-1] Fri Dec 19 13:22:15 2014 @@ -53,6 +53,7 @@ static DWORD (WINAPI *pSHUnicodeToUnicode)(LPCWSTR,LPWSTR,int); static LPSTR (WINAPI *pStrCatBuffA)(LPSTR,LPCSTR,INT); static LPWSTR (WINAPI *pStrCatBuffW)(LPWSTR,LPCWSTR,INT); +static DWORD (WINAPI *pStrCatChainW)(LPWSTR,DWORD,DWORD,LPCWSTR); static LPSTR (WINAPI *pStrCpyNXA)(LPSTR,LPCSTR,int); static LPWSTR (WINAPI *pStrCpyNXW)(LPWSTR,LPCWSTR,int); static LPSTR (WINAPI *pStrFormatByteSize64A)(LONGLONG,LPSTR,UINT); @@ -1486,6 +1487,125 @@ } } +static void test_StrCatChainW(void) +{ + static const WCHAR deadbeefW[] = {'D','e','A','d','B','e','E','f',0}; + static const WCHAR deadW[] = {'D','e','A','d',0}; + static const WCHAR beefW[] = {'B','e','E','f',0}; + + WCHAR buf[32 + 1]; + DWORD ret; + + if (!pStrCatChainW) + { + win_skip("StrCatChainW is not available\n"); + return; + } + + /* Test with NULL buffer */ + ret = pStrCatChainW(NULL, 0, 0, beefW); + ok(ret == 0, "Expected StrCatChainW to return 0, got %u\n", ret); + + /* Test with empty buffer */ + memset(buf, 0x11, sizeof(buf)); + ret = pStrCatChainW(buf, 0, 0, beefW); + ok(ret == 0, "Expected StrCatChainW to return 0, got %u\n", ret); + ok(buf[0] == 0x1111, "Expected buf[0] = 0x1111, got %x\n", buf[0]); + + memcpy(buf, deadbeefW, sizeof(deadbeefW)); + ret = pStrCatChainW(buf, 0, -1, beefW); + ok(ret == 8, "Expected StrCatChainW to return 8, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + + /* Append data to existing string with offset = -1 */ + memset(buf, 0x11, sizeof(buf)); + ret = pStrCatChainW(buf, 32, 0, deadW); + ok(ret == 4, "Expected StrCatChainW to return 4, got %u\n", ret); + ok(!memcmp(buf, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + + ret = pStrCatChainW(buf, 32, -1, beefW); + ok(ret == 8, "Expected StrCatChainW to return 8, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + + /* Append data at a fixed offset */ + memset(buf, 0x11, sizeof(buf)); + ret = pStrCatChainW(buf, 32, 0, deadW); + ok(ret == 4, "Expected StrCatChainW to return 4, got %u\n", ret); + ok(!memcmp(buf, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + + ret = pStrCatChainW(buf, 32, 4, beefW); + ok(ret == 8, "Expected StrCatChainW to return 8, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + + /* Buffer exactly sufficient for string + terminating null */ + memset(buf, 0x11, sizeof(buf)); + ret = pStrCatChainW(buf, 5, 0, deadW); + ok(ret == 4, "Expected StrCatChainW to return 4, got %u\n", ret); + ok(!memcmp(buf, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + + /* Buffer too small, string will be truncated */ + memset(buf, 0x11, sizeof(buf)); + ret = pStrCatChainW(buf, 4, 0, deadW); + if (ret == 4) + { + /* Windows 2000 and XP uses a slightly different implementation + * for StrCatChainW, which doesn't ensure that strings are null- + * terminated. Skip test if we detect such an implementation. */ + win_skip("Windows2000/XP behaviour detected for StrCatChainW, skipping tests\n"); + return; + } + ok(ret == 3, "Expected StrCatChainW to return 3, got %u\n", ret); + ok(!memcmp(buf, deadW, 3 * sizeof(WCHAR)), "Buffer contains wrong data\n"); + ok(!buf[3], "String is not nullterminated\n"); + ok(buf[4] == 0x1111, "Expected buf[4] = 0x1111, got %x\n", buf[4]); + + /* Overwrite part of an existing string */ + ret = pStrCatChainW(buf, 4, 1, beefW); + ok(ret == 3, "Expected StrCatChainW to return 3, got %u\n", ret); + ok(buf[0] == 'D', "Expected buf[0] = 'D', got %x\n", buf[0]); + ok(buf[1] == 'B', "Expected buf[1] = 'B', got %x\n", buf[1]); + ok(buf[2] == 'e', "Expected buf[2] = 'e', got %x\n", buf[2]); + ok(!buf[3], "String is not nullterminated\n"); + ok(buf[4] == 0x1111, "Expected buf[4] = 0x1111, got %x\n", buf[4]); + + /* Test appending to full buffer */ + memset(buf, 0x11, sizeof(buf)); + memcpy(buf, deadbeefW, sizeof(deadbeefW)); + memcpy(buf + 9, deadW, sizeof(deadW)); + ret = pStrCatChainW(buf, 9, 8, beefW); + ok(ret == 8, "Expected StrCatChainW to return 8, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + ok(!memcmp(buf + 9, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + + /* Offset points at the end of the buffer */ + ret = pStrCatChainW(buf, 9, 9, beefW); + ok(ret == 8, "Expected StrCatChainW to return 8, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + ok(!memcmp(buf + 9, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + + /* Offset points outside of the buffer */ + ret = pStrCatChainW(buf, 9, 10, beefW); + ok(ret == 10, "Expected StrCatChainW to return 10, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + ok(!memcmp(buf + 9, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + + /* The same but without nullterminated string */ + memcpy(buf, deadbeefW, sizeof(deadbeefW)); + ret = pStrCatChainW(buf, 5, -1, deadW); + ok(ret == 8, "Expected StrCatChainW to return 8, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + + ret = pStrCatChainW(buf, 5, 5, deadW); + ok(ret == 4, "Expected StrCatChainW to return 4, got %u\n", ret); + ok(!memcmp(buf, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + ok(buf[5] == 'e', "Expected buf[5] = 'e', got %x\n", buf[5]); + + ret = pStrCatChainW(buf, 5, 6, deadW); + ok(ret == 6, "Expected StrCatChainW to return 6, got %u\n", ret); + ok(!memcmp(buf, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + ok(buf[5] == 'e', "Expected buf[5] = 'e', got %x\n", buf[5]); +} + START_TEST(string) { HMODULE hShlwapi; @@ -1505,6 +1625,7 @@ pSHUnicodeToUnicode = (void *)GetProcAddress(hShlwapi, (LPSTR)346); pStrCatBuffA = (void *)GetProcAddress(hShlwapi, "StrCatBuffA"); pStrCatBuffW = (void *)GetProcAddress(hShlwapi, "StrCatBuffW"); + pStrCatChainW = (void *)GetProcAddress(hShlwapi, "StrCatChainW"); pStrCpyNXA = (void *)GetProcAddress(hShlwapi, (LPSTR)399); pStrCpyNXW = (void *)GetProcAddress(hShlwapi, (LPSTR)400); pStrChrNW = (void *)GetProcAddress(hShlwapi, "StrChrNW"); @@ -1570,6 +1691,7 @@ test_StrStrIW(); test_StrStrNW(); test_StrStrNIW(); + test_StrCatChainW(); CoUninitialize(); }

1 0

[akhaldi] 65749: [SHLWAPI] Import Wine commit 4b33a33 by Sebastian Lackner: Add implementation for StrCatChainW. Based on a patch by Huw Campbell. CORE-7556
by akhaldi＠svn.reactos.org 19 Dec '14

19 Dec '14

Author: akhaldi Date: Fri Dec 19 13:20:42 2014 New Revision: 65749 URL: http://svn.reactos.org/svn/reactos?rev=65749&view=rev Log: [SHLWAPI] Import Wine commit 4b33a33 by Sebastian Lackner: Add implementation for StrCatChainW. Based on a patch by Huw Campbell. CORE-7556 Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.spec trunk/reactos/dll/win32/shlwapi/string.c 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] Fri Dec 19 13:20:42 2014 @@ -767,7 +767,7 @@ 767 stdcall StrCSpnW(wstr wstr) 768 stdcall StrCatBuffA(str str long) 769 stdcall StrCatBuffW(wstr wstr long) -#770 StrCatChainW +770 stdcall StrCatChainW (ptr long long wstr) 771 stdcall StrCatW(ptr wstr) 772 stdcall StrChrA(str long) 773 stdcall StrChrIA(str long) Modified: trunk/reactos/dll/win32/shlwapi/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/string.c… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/string.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/string.c [iso-8859-1] Fri Dec 19 13:20:42 2014 @@ -435,6 +435,47 @@ if (lpszStr && lpszSrc) strcatW(lpszStr, lpszSrc); return lpszStr; +} + +/************************************************************************* + * StrCatChainW [SHLWAPI.@] + * + * Concatenates two unicode strings. + * + * PARAMS + * lpszStr [O] Initial string + * cchMax [I] Length of destination buffer + * ichAt [I] Offset from the destination buffer to begin concatenation + * lpszCat [I] String to concatenate + * + * RETURNS + * The offset from the beginning of pszDst to the terminating NULL. + */ +DWORD WINAPI StrCatChainW(LPWSTR lpszStr, DWORD cchMax, DWORD ichAt, LPCWSTR lpszCat) +{ + TRACE("(%s,%u,%d,%s)\n", debugstr_w(lpszStr), cchMax, ichAt, debugstr_w(lpszCat)); + + if (ichAt == -1) + ichAt = strlenW(lpszStr); + + if (!cchMax) + return ichAt; + + if (ichAt == cchMax) + ichAt--; + + if (lpszCat && ichAt < cchMax) + { + lpszStr += ichAt; + while (ichAt < cchMax - 1 && *lpszCat) + { + *lpszStr++ = *lpszCat++; + ichAt++; + } + *lpszStr = 0; + } + + return ichAt; } /*************************************************************************

1 0

[tkreuzer] 65748: [WIN32K] Handle coordinate translation in NtGdiOffsetClipRgn
by tkreuzer＠svn.reactos.org 19 Dec '14

19 Dec '14

Author: tkreuzer Date: Fri Dec 19 12:53:50 2014 New Revision: 65748 URL: http://svn.reactos.org/svn/reactos?rev=65748&view=rev Log: [WIN32K] Handle coordinate translation in NtGdiOffsetClipRgn Modified: trunk/reactos/win32ss/gdi/gdi32/objects/region.c trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/region.c [iso-8859-1] Fri Dec 19 12:53:50 2014 @@ -984,6 +984,11 @@ int nXOffset, int nYOffset) { + if (hdc == NULL) + { + SetLastError(ERROR_INVALID_HANDLE); + return ERROR; + } #if 0 // Handle something other than a normal dc object. if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) Modified: trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/cliprgn.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c [iso-8859-1] Fri Dec 19 12:53:50 2014 @@ -350,41 +350,59 @@ return iComplexity; } -int APIENTRY NtGdiOffsetClipRgn(HDC hDC, - int XOffset, - int YOffset) -{ - INT Result; - DC *dc; - - if(!(dc = DC_LockDc(hDC))) - { - EngSetLastError(ERROR_INVALID_HANDLE); +INT +APIENTRY +NtGdiOffsetClipRgn( + _In_ HDC hdc, + _In_ INT xOffset, + _In_ INT yOffset) +{ + INT iComplexity; + PDC pdc; + POINTL apt[2]; + + /* Lock the DC */ + pdc = DC_LockDc(hdc); + if (pdc == NULL) + { return ERROR; } - if(dc->dclevel.prgnClip != NULL) - { - if (!REGION_bOffsetRgn(dc->dclevel.prgnClip, - XOffset, - YOffset)) - { - Result = ERROR; + /* Check if we have a clip region */ + if (pdc->dclevel.prgnClip != NULL) + { + /* Convert coordinates into device space. Note that we need to convert + 2 coordinates to account for rotation / shear / offset */ + apt[0].x = 0; + apt[0].y = 0; + apt[1].x = xOffset; + apt[1].y = yOffset; + IntLPtoDP(pdc, &apt, 2); + + /* Offset the clip region */ + if (!REGION_bOffsetRgn(pdc->dclevel.prgnClip, + apt[1].x - apt[0].x, + apt[1].y - apt[0].y)) + { + iComplexity = ERROR; } else { - Result = REGION_Complexity(dc->dclevel.prgnClip); - } - - dc->fs |= DC_FLAG_DIRTY_RAO; + iComplexity = REGION_Complexity(pdc->dclevel.prgnClip); + } + + /* Mark the RAO region as dirty */ + pdc->fs |= DC_FLAG_DIRTY_RAO; } else { - Result = NULLREGION; - } - - DC_UnlockDc(dc); - return Result; + /* NULL means no clipping, i.e. the "whole" region */ + iComplexity = SIMPLEREGION; + } + + /* Unlock the DC and return the complexity */ + DC_UnlockDc(pdc); + return iComplexity; } BOOL APIENTRY NtGdiPtVisible(HDC hDC, @@ -472,6 +490,7 @@ { if ( pDC->dclevel.prgnClip ) { + // preferably REGION_IntersectRegion Ret = IntGdiCombineRgn(pDC->dclevel.prgnMeta, pDC->dclevel.prgnMeta, pDC->dclevel.prgnClip, RGN_AND); if (Ret != ERROR) {

1 0

[tkreuzer] 65747: [WIN32K] Dump object event log, when trying to dereference an object with 0 references.
by tkreuzer＠svn.reactos.org 19 Dec '14

19 Dec '14

Author: tkreuzer Date: Fri Dec 19 11:12:40 2014 New Revision: 65747 URL: http://svn.reactos.org/svn/reactos?rev=65747&view=rev Log: [WIN32K] Dump object event log, when trying to dereference an object with 0 references. Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Fri Dec 19 11:12:40 2014 @@ -559,6 +559,10 @@ if (ulIndex) { /* Decrement reference count */ + if ((gpaulRefCount[ulIndex] & REF_MASK_COUNT) == 0) + { + DBG_DUMP_EVENT_LIST(&pobj->slhLog); + } ASSERT((gpaulRefCount[ulIndex] & REF_MASK_COUNT) > 0); cRefs = InterlockedDecrement((LONG*)&gpaulRefCount[ulIndex]); DBG_LOGEVENT(&pobj->slhLog, EVENT_DEREFERENCE, cRefs);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs