Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SETUPAPI] cfgmgr.c: Remove 5 useless '= NULL' initializations (#6209)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8943354d1771af201339d… commit 8943354d1771af201339d34adde1f89775a941e3 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Dec 23 21:38:36 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 23 21:38:36 2023 +0100 [SETUPAPI] cfgmgr.c: Remove 5 useless '= NULL' initializations (#6209) --- dll/win32/setupapi/cfgmgr.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index e42530fe60d..2b2ec4b7067 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -603,7 +603,7 @@ CMP_RegisterNotification( _Out_ PHDEVNOTIFY phDevNotify) { RPC_BINDING_HANDLE BindingHandle = NULL; - PNOTIFY_DATA pNotifyData = NULL; + PNOTIFY_DATA pNotifyData; WCHAR szNameBuffer[256]; INT nLength; DWORD ulUnknown9 = 0; @@ -1465,7 +1465,7 @@ CM_Create_Range_List( _Out_ PRANGE_LIST prlh, _In_ ULONG ulFlags) { - PINTERNAL_RANGE_LIST pRangeList = NULL; + PINTERNAL_RANGE_LIST pRangeList; FIXME("CM_Create_Range_List(%p %lx)\n", prlh, ulFlags); @@ -2904,7 +2904,7 @@ CM_Get_Class_Registry_PropertyA( ULONG ulFlags, HMACHINE hMachine) { - PWSTR BufferW = NULL; + PWSTR BufferW; ULONG ulLength = 0; ULONG ulType; CONFIGRET ret; @@ -3190,7 +3190,7 @@ CM_Get_DevNode_Custom_Property_ExA( _In_ ULONG ulFlags, _In_opt_ HMACHINE hMachine) { - LPWSTR pszPropertyNameW = NULL; + LPWSTR pszPropertyNameW; PVOID BufferW; ULONG ulLengthW; ULONG ulDataType = REG_NONE; @@ -3421,7 +3421,6 @@ CM_Get_DevNode_Registry_Property_ExA( LengthW = *pulLength * sizeof(WCHAR); BufferW = HeapAlloc(GetProcessHeap(), 0, LengthW); - if (!BufferW) return CR_OUT_OF_MEMORY; @@ -7257,7 +7256,7 @@ CM_Register_Device_Interface_ExA( _In_opt_ HMACHINE hMachine) { LPWSTR pszReferenceW = NULL; - LPWSTR pszDeviceInterfaceW = NULL; + LPWSTR pszDeviceInterfaceW; ULONG ulLength; CONFIGRET ret;

1 year, 6 months

[reactos] 01/01: [SETUPAPI] CMP_RegisterNotification(): Remove duplicated code (#6207)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=74a82c831b7b4316ff452… commit 74a82c831b7b4316ff452379902f58bf462c14e7 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Dec 23 21:38:09 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 23 21:38:09 2023 +0100 [SETUPAPI] CMP_RegisterNotification(): Remove duplicated code (#6207) Addendum to commit 9277f5352 --- dll/win32/setupapi/cfgmgr.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index ef29d045f8c..e42530fe60d 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -645,11 +645,6 @@ CMP_RegisterNotification( nLength = GetWindowTextW((HWND)hRecipient, szNameBuffer, ARRAYSIZE(szNameBuffer)); - if (nLength == 0) - { - - } - if (nLength == 0) { szNameBuffer[0] = UNICODE_NULL;

1 year, 6 months

[reactos] 01/01: [REACTOS] Fix typos (#6198)

by Ratin Gao

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ffb20d3330269b21ca1b6… commit ffb20d3330269b21ca1b61ceef54b924f6de8557 Author: Ratin Gao <ratin(a)knsoft.org> AuthorDate: Sun Dec 24 04:37:08 2023 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 23 21:37:08 2023 +0100 [REACTOS] Fix typos (#6198) - Adress -> Address - Currupted -> Corrupted 3rd-party files are not modified. --- dll/win32/mapi32/stubs.c | 2 +- drivers/network/tcpip/ip/network/ip.c | 2 +- hal/halx86/acpi/halpnpdd.c | 2 +- hal/halx86/apic/apic.c | 2 +- hal/halx86/apic/apicp.h | 4 ++-- hal/halx86/legacy/halpnpdd.c | 2 +- hal/halx86/mp/mpconfig.c | 2 +- modules/rosapps/applications/devutils/syscalldump/syscalldump.c | 6 +++--- ntoskrnl/ex/sysinfo.c | 4 ++-- ntoskrnl/ke/i386/traphdlr.c | 2 +- ntoskrnl/mm/ARM3/miarm.h | 2 +- ntoskrnl/mm/ARM3/section.c | 2 +- ntoskrnl/mm/i386/page.c | 2 +- ntoskrnl/mm/marea.c | 2 +- ntoskrnl/mm/section.c | 2 +- sdk/include/c++/stlport/stl/_iostream_string.h | 2 +- sdk/include/ndk/mmtypes.h | 2 +- sdk/include/psdk/ntddndis.h | 2 +- sdk/lib/delayimp/delayimp.c | 2 +- sdk/lib/rtl/amd64/unwind.c | 2 +- sdk/tools/rsym/rsym64.c | 2 +- win32ss/gdi/eng/ldevobj.c | 6 +++--- 22 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dll/win32/mapi32/stubs.c b/dll/win32/mapi32/stubs.c index 87e4f2ffb3a..25ae1cc08cc 100644 --- a/dll/win32/mapi32/stubs.c +++ b/dll/win32/mapi32/stubs.c @@ -39,7 +39,7 @@ OpenTnefStreamEx( ULONG ulFlags, LPMESSAGE lpMessage, WORD wKeyVal, - LPADDRESSBOOK lpAdressBook, + LPADDRESSBOOK lpAddressBook, LPSTREAM *lppTNEF) { UNIMPLEMENTED; diff --git a/drivers/network/tcpip/ip/network/ip.c b/drivers/network/tcpip/ip/network/ip.c index 1328be9b47c..6bc1dd1395e 100644 --- a/drivers/network/tcpip/ip/network/ip.c +++ b/drivers/network/tcpip/ip/network/ip.c @@ -161,7 +161,7 @@ VOID IPDispatchProtocol( AddrInitIPv4(&SrcAddress, ((PIPv4_HEADER)(IPPacket->Header))->SrcAddr); break; case IP_ADDRESS_V6: - /* FIXME: IPv6 adresses not supported */ + /* FIXME: IPv6 addresses not supported */ TI_DbgPrint(MIN_TRACE, ("IPv6 datagram discarded.\n")); return; default: diff --git a/hal/halx86/acpi/halpnpdd.c b/hal/halx86/acpi/halpnpdd.c index 0dabbcc6f5b..890b0580e4f 100644 --- a/hal/halx86/acpi/halpnpdd.c +++ b/hal/halx86/acpi/halpnpdd.c @@ -324,7 +324,7 @@ HalpQueryCapabilities(IN PDEVICE_OBJECT DeviceObject, Capabilities->UniqueID = TRUE; Capabilities->SilentInstall = TRUE; - /* Fill out the adress */ + /* Fill out the address */ Capabilities->Address = InterfaceTypeUndefined; Capabilities->UINumber = InterfaceTypeUndefined; diff --git a/hal/halx86/apic/apic.c b/hal/halx86/apic/apic.c index 0fe921149f6..0c563c335d5 100644 --- a/hal/halx86/apic/apic.c +++ b/hal/halx86/apic/apic.c @@ -290,7 +290,7 @@ VOID NTAPI ApicInitializeLocalApic(ULONG Cpu) { - APIC_BASE_ADRESS_REGISTER BaseRegister; + APIC_BASE_ADDRESS_REGISTER BaseRegister; APIC_SPURIOUS_INERRUPT_REGISTER SpIntRegister; LVT_REGISTER LvtEntry; diff --git a/hal/halx86/apic/apicp.h b/hal/halx86/apic/apicp.h index 0a91da45992..e723a4f0696 100644 --- a/hal/halx86/apic/apicp.h +++ b/hal/halx86/apic/apicp.h @@ -183,7 +183,7 @@ typedef enum _TIMER_DV } TIMER_DV; #include <pshpack1.h> -typedef union _APIC_BASE_ADRESS_REGISTER +typedef union _APIC_BASE_ADDRESS_REGISTER { UINT64 LongLong; struct @@ -195,7 +195,7 @@ typedef union _APIC_BASE_ADRESS_REGISTER UINT64 BaseAddress:40; UINT64 ReservedMBZ:12; }; -} APIC_BASE_ADRESS_REGISTER; +} APIC_BASE_ADDRESS_REGISTER; typedef union _APIC_SPURIOUS_INERRUPT_REGISTER { diff --git a/hal/halx86/legacy/halpnpdd.c b/hal/halx86/legacy/halpnpdd.c index 90e7d1294ae..9e8633f011a 100644 --- a/hal/halx86/legacy/halpnpdd.c +++ b/hal/halx86/legacy/halpnpdd.c @@ -301,7 +301,7 @@ HalpQueryCapabilities(IN PDEVICE_OBJECT DeviceObject, Capabilities->UniqueID = TRUE; Capabilities->SilentInstall = TRUE; - /* Fill out the adress */ + /* Fill out the address */ Capabilities->Address = InterfaceTypeUndefined; Capabilities->UINumber = InterfaceTypeUndefined; diff --git a/hal/halx86/mp/mpconfig.c b/hal/halx86/mp/mpconfig.c index e229d936699..4288b0009a9 100644 --- a/hal/halx86/mp/mpconfig.c +++ b/hal/halx86/mp/mpconfig.c @@ -291,7 +291,7 @@ HaliReadMPConfigTable(PMP_CONFIGURATION_TABLE Table) if (Table->LocalAPICAddress != APIC_DEFAULT_BASE) { - DPRINT1("APIC base address is at 0x%X. I cannot handle non-standard adresses\n", + DPRINT1("APIC base address is at 0x%X. I cannot handle non-standard addresses\n", Table->LocalAPICAddress); ASSERT(FALSE); return FALSE; diff --git a/modules/rosapps/applications/devutils/syscalldump/syscalldump.c b/modules/rosapps/applications/devutils/syscalldump/syscalldump.c index 8b35ce75531..2d5b112f3fc 100644 --- a/modules/rosapps/applications/devutils/syscalldump/syscalldump.c +++ b/modules/rosapps/applications/devutils/syscalldump/syscalldump.c @@ -39,9 +39,9 @@ ImageSymToVa(HANDLE hProcess, PSYMBOL_INFO pSym, PBYTE pModule, PCSTR Name) } #if defined(__GNUC__) && \ (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ < 40400) - printf("looking up adress for %s: 0x%llx\n", Name, pSym->Address); + printf("looking up address for %s: 0x%llx\n", Name, pSym->Address); #else - printf("looking up adress for %s: 0x%I64x\n", Name, pSym->Address); + printf("looking up address for %s: 0x%I64x\n", Name, pSym->Address); #endif NtHeaders = ImageNtHeader(pModule); @@ -160,7 +160,7 @@ cont: if (!pW32pServiceTable || !pW32pServiceLimit || !pW32pArgumentTable) { - printf("Couldn't find adress!\n"); + printf("Couldn't find address!\n"); goto cleanup; } diff --git a/ntoskrnl/ex/sysinfo.c b/ntoskrnl/ex/sysinfo.c index 58b023466a1..e7e67cd85b9 100644 --- a/ntoskrnl/ex/sysinfo.c +++ b/ntoskrnl/ex/sysinfo.c @@ -1386,7 +1386,7 @@ QSI_DEF(SystemHandleInformation) HandleInformation->Handles[Index].CreatorBackTraceIndex = 0; -#if 0 /* FIXME!!! Type field currupted */ +#if 0 /* FIXME!!! Type field corrupted */ HandleInformation->Handles[Index].ObjectTypeIndex = (UCHAR) ObjectHeader->Type->Index; #else @@ -2572,7 +2572,7 @@ QSI_DEF(SystemExtendedHandleInformation) HandleInformation->Handle[Index].CreatorBackTraceIndex = 0; -#if 0 /* FIXME!!! Type field currupted */ +#if 0 /* FIXME!!! Type field corrupted */ HandleInformation->Handles[Index].ObjectTypeIndex = (UCHAR) ObjectHeader->Type->Index; #else diff --git a/ntoskrnl/ke/i386/traphdlr.c b/ntoskrnl/ke/i386/traphdlr.c index e9045186f12..db25cfc0661 100644 --- a/ntoskrnl/ke/i386/traphdlr.c +++ b/ntoskrnl/ke/i386/traphdlr.c @@ -1159,7 +1159,7 @@ KiTrap0DHandler(IN PKTRAP_FRAME TrapFrame) * which will cause a GPF since the trap frame is a total mess (on purpose) * as built in KiEnterV86Mode. * - * The idea is to scan for IRET, scan for the known EIP adress, validate CS + * The idea is to scan for IRET, scan for the known EIP address, validate CS * and then manually issue a jump to the V8086 return EIP. */ Instructions = (PUCHAR)TrapFrame->Eip; diff --git a/ntoskrnl/mm/ARM3/miarm.h b/ntoskrnl/mm/ARM3/miarm.h index 1776b69a918..b11aef4626d 100644 --- a/ntoskrnl/mm/ARM3/miarm.h +++ b/ntoskrnl/mm/ARM3/miarm.h @@ -862,7 +862,7 @@ MI_MAKE_PROTOTYPE_PTE(IN PMMPTE NewPte, /* * Prototype PTEs are only valid in paged pool by design, this little trick - * lets us only use 30 bits for the adress of the PTE, as long as the area + * lets us only use 30 bits for the address of the PTE, as long as the area * stays 1024MB At most. */ Offset = (ULONG_PTR)PointerPte - (ULONG_PTR)MmPagedPoolStart; diff --git a/ntoskrnl/mm/ARM3/section.c b/ntoskrnl/mm/ARM3/section.c index fed3fa0f685..b7f5606f68d 100644 --- a/ntoskrnl/mm/ARM3/section.c +++ b/ntoskrnl/mm/ARM3/section.c @@ -1142,7 +1142,7 @@ MiMapViewInSystemSpace( SectionOffset->QuadPart); ASSERT(NT_SUCCESS(Status)); - /* Return the base adress of the mapping and success */ + /* Return the base address of the mapping and success */ *MappedBase = Base; return STATUS_SUCCESS; } diff --git a/ntoskrnl/mm/i386/page.c b/ntoskrnl/mm/i386/page.c index df13cb013e2..33299ca375b 100644 --- a/ntoskrnl/mm/i386/page.c +++ b/ntoskrnl/mm/i386/page.c @@ -904,7 +904,7 @@ MmSetDirtyBit(PEPROCESS Process, PVOID Address, BOOLEAN Bit) MiMakePdeExistAndMakeValid(MiAddressToPde(Address), Process, MM_NOIRQL); PointerPte = MiAddressToPte(Address); - // We shouldnl't set dirty bit on non-mapped adresses + // We shouldnl't set dirty bit on non-mapped addresses if (!PointerPte->u.Hard.Valid && (FlagOn(PointerPte->u.Long, 0x800) || (PointerPte->u.Hard.PageFrameNumber == 0))) { DPRINT1("Invalid Pte %lx\n", PointerPte->u.Long); diff --git a/ntoskrnl/mm/marea.c b/ntoskrnl/mm/marea.c index 281226c4afc..76c545e6ffd 100644 --- a/ntoskrnl/mm/marea.c +++ b/ntoskrnl/mm/marea.c @@ -346,7 +346,7 @@ MmFreeMemoryArea( ASSERT(MemoryArea->Type == MEMORY_AREA_SECTION_VIEW); #endif - /* MmCleanProcessAddressSpace might have removed it (and this would be MmDeleteProcessAdressSpace) */ + /* MmCleanProcessAddressSpace might have removed it (and this would be MmDeleteProcessAddressSpace) */ ASSERT(MemoryArea->VadNode.u.VadFlags.Spare != 0); if (((PMMVAD)MemoryArea->Vad)->u.VadFlags.Spare == 1) { diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index ff77ef77077..0e4c0e1bcc7 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -4551,7 +4551,7 @@ MmMapViewInSystemSpaceEx ( return Status; } -/* This function must be called with adress space lock held */ +/* This function must be called with address space lock held */ NTSTATUS NTAPI MiRosUnmapViewInSystemSpace(IN PVOID MappedBase) diff --git a/sdk/include/c++/stlport/stl/_iostream_string.h b/sdk/include/c++/stlport/stl/_iostream_string.h index 87656a4ce59..2a5923e38de 100644 --- a/sdk/include/c++/stlport/stl/_iostream_string.h +++ b/sdk/include/c++/stlport/stl/_iostream_string.h @@ -98,7 +98,7 @@ struct __basic_iostring : public basic_string<_CharT, char_traits<_CharT>, __ios /* * A consequence of the non standard conformant allocator is that a string using it * must always be presized to the allocator static buffer size because the basic_string implementation - * do not manage an allocator returning always the same memory adress as long as the + * do not manage an allocator returning always the same memory address as long as the * requested memory block size is under a certain value. */ typedef __basic_iostring<_CharT> _Self; diff --git a/sdk/include/ndk/mmtypes.h b/sdk/include/ndk/mmtypes.h index 56e918d5c2f..cccf5610f49 100644 --- a/sdk/include/ndk/mmtypes.h +++ b/sdk/include/ndk/mmtypes.h @@ -672,7 +672,7 @@ typedef struct _MM_AVL_TABLE } MM_AVL_TABLE, *PMM_AVL_TABLE; // -// Virtual Adress List used in VADs +// Virtual Address List used in VADs // typedef struct _MMADDRESS_LIST { diff --git a/sdk/include/psdk/ntddndis.h b/sdk/include/psdk/ntddndis.h index efdf04d422d..0c4707bfaed 100644 --- a/sdk/include/psdk/ntddndis.h +++ b/sdk/include/psdk/ntddndis.h @@ -435,7 +435,7 @@ typedef ULONG NDIS_OID, *PNDIS_OID; #define NDIS_MAC_OPTION_EOTX_INDICATION 0x00000020 #define NDIS_MAC_OPTION_8021P_PRIORITY 0x00000040 -#define NDIS_MAC_OPTION_SUPPORTS_MAC_ADRESS_OVERWRITE 0x00000080 +#define NDIS_MAC_OPTION_SUPPORTS_MAC_ADDRESS_OVERWRITE 0x00000080 #define NDIS_MAC_OPTION_RECEIVE_AT_DPC 0x00000100 #define NDIS_MAC_OPTION_8021Q_VLAN 0x00000200 #define NDIS_MAC_OPTION_RESERVED 0x80000000 diff --git a/sdk/lib/delayimp/delayimp.c b/sdk/lib/delayimp/delayimp.c index 0f86b67f2bd..91cdc2fd708 100644 --- a/sdk/lib/delayimp/delayimp.c +++ b/sdk/lib/delayimp/delayimp.c @@ -77,7 +77,7 @@ __delayLoadHelper2(PCImgDelayDescr pidd, PImgThunkData pIATEntry) dli.dlp.fImportByName = !IMAGE_SNAP_BY_ORDINAL(pINT[index].u1.Ordinal); if (dli.dlp.fImportByName) { - /* u1.AdressOfData points to a IMAGE_IMPORT_BY_NAME struct */ + /* u1.AddressOfData points to a IMAGE_IMPORT_BY_NAME struct */ PIMAGE_IMPORT_BY_NAME piibn = PFromRva((RVA)pINT[index].u1.AddressOfData); dli.dlp.szProcName = (LPCSTR)&piibn->Name; } diff --git a/sdk/lib/rtl/amd64/unwind.c b/sdk/lib/rtl/amd64/unwind.c index dec55f7d3a5..2883b4f494b 100644 --- a/sdk/lib/rtl/amd64/unwind.c +++ b/sdk/lib/rtl/amd64/unwind.c @@ -347,7 +347,7 @@ RtlpTryToUnwindEpilog( LocalContext.Rsp = GetReg(&LocalContext, Reg); - /* Get adressing mode */ + /* Get addressing mode */ Mod = (Instr >> 22) & 0x3; if (Mod == 0) { diff --git a/sdk/tools/rsym/rsym64.c b/sdk/tools/rsym/rsym64.c index 07e5596fa08..129e268fc5b 100644 --- a/sdk/tools/rsym/rsym64.c +++ b/sdk/tools/rsym/rsym64.c @@ -269,7 +269,7 @@ DwExecIntruction(PDW2CFSTATE State, char *pc) } /* These work differently. We are in a new function. - * We have to parse a lea opcode to find the adress of + * We have to parse a lea opcode to find the address of * the jump target. This is the reference to find the * appropriate C_SCOPE_TABLE. */ case 6: /* Filter func */ diff --git a/win32ss/gdi/eng/ldevobj.c b/win32ss/gdi/eng/ldevobj.c index b4f13b88d19..478800a9571 100644 --- a/win32ss/gdi/eng/ldevobj.c +++ b/win32ss/gdi/eng/ldevobj.c @@ -226,7 +226,7 @@ LDEVOBJ_pvFindImageProcAddress( { PVOID pvImageBase; PIMAGE_EXPORT_DIRECTORY pExportDir; - PVOID pvProcAdress = NULL; + PVOID pvProcAddress = NULL; PUSHORT pOrdinals; PULONG pNames, pAddresses; ULONG i; @@ -255,13 +255,13 @@ LDEVOBJ_pvFindImageProcAddress( if (_stricmp(pszProcName, RVA_TO_ADDR(pvImageBase, pNames[i])) == 0) { /* Found! Calculate the procedure address */ - pvProcAdress = RVA_TO_ADDR(pvImageBase, pAddresses[pOrdinals[i]]); + pvProcAddress = RVA_TO_ADDR(pvImageBase, pAddresses[pOrdinals[i]]); break; } } /* Return the address */ - return pvProcAdress; + return pvProcAddress; } static

1 year, 6 months

[reactos] 01/01: [WSHOM.OCX] WshShell::Run intWindowStyle parameter is optional (#6180)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f380a5104034604de6a8c… commit f380a5104034604de6a8ca3d7b90a15a459e894b Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sat Dec 23 21:27:00 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 23 21:27:00 2023 +0100 [WSHOM.OCX] WshShell::Run intWindowStyle parameter is optional (#6180) The last two parameters are optional, see https://learn.microsoft.com/en-us/previous-versions/d5fk67ky(v=vs.85) Test case: ``` ' test.vbs Set objShell = Wscript.CreateObject("Wscript.Shell") objShell.Run "calc.exe" ' Should work because the arguments are optional objShell.Run "winver.exe", invalidnumber ' Windows treats this as SW_HIDE because it can convert VT_EMPTY objShell.Run "notepad.exe", "invalidnumber" ' Windows fails with error ``` --- dll/win32/wshom.ocx/shell.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dll/win32/wshom.ocx/shell.c b/dll/win32/wshom.ocx/shell.c index 49f1771ab20..9f545115a84 100644 --- a/dll/win32/wshom.ocx/shell.c +++ b/dll/win32/wshom.ocx/shell.c @@ -1261,6 +1261,15 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, return E_POINTER; VariantInit(&s); +#ifdef __REACTOS__ + if (is_optional_argument(style)) + { + V_VT(&s) = VT_I4; + V_I4(&s) = SW_SHOW; + hr = S_OK; + } + else +#endif hr = VariantChangeType(&s, style, 0, VT_I4); if (FAILED(hr)) {

1 year, 6 months

[reactos] 01/01: [VFATFS] FATGetNextDirEntry(): Fix 1 MSVC 'warning C4267' (#6179)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3558b7b985900e108fe75… commit 3558b7b985900e108fe7540f56d58145fce20962 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Dec 23 21:24:51 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 23 21:24:51 2023 +0100 [VFATFS] FATGetNextDirEntry(): Fix 1 MSVC 'warning C4267' (#6179) Fix `warning C4267: '=': conversion from 'size_t' to 'USHORT', possible loss of data` by explicitly casting to USHORT. This is OK as the line immediately before NULL-terminates the buffer within boundary. Addendum to commit 096a69471 (r6279). --- drivers/filesystems/vfatfs/direntry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filesystems/vfatfs/direntry.c b/drivers/filesystems/vfatfs/direntry.c index 91d115c1eb0..937211ebf49 100644 --- a/drivers/filesystems/vfatfs/direntry.c +++ b/drivers/filesystems/vfatfs/direntry.c @@ -460,7 +460,7 @@ FATGetNextDirEntry( /* Make sure filename is NULL terminate and calculate length */ DirContext->LongNameU.Buffer[DirContext->LongNameU.MaximumLength / sizeof(WCHAR) - 1] = UNICODE_NULL; - DirContext->LongNameU.Length = wcslen(DirContext->LongNameU.Buffer) * sizeof(WCHAR); + DirContext->LongNameU.Length = (USHORT)(wcslen(DirContext->LongNameU.Buffer) * sizeof(WCHAR)); /* Init short name */ vfat8Dot3ToString(&DirContext->DirEntry.Fat, &DirContext->ShortNameU);

1 year, 6 months

[reactos] 01/01: [EXPLORER] Notification area icon improvements (#6169)

by Carl J. Bialorucki

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=77653462a9503f126c4fd… commit 77653462a9503f126c4fdd839cb791aeb03daded Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Sat Dec 23 13:21:12 2023 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 23 21:21:12 2023 +0100 [EXPLORER] Notification area icon improvements (#6169) Automatically adjusts the spacing of the tray icons according to the small or large taskbar icons setting. Also, a minor bug fix to the clock spacing when switching between taskbar icon sizes. CORE-19380 Update the ROS-specific CompactTrayIcons registry value from a binary yes/no to have three states. The three states are as follows: 0 (default) - Automatic. When small taskbar icons are used, the notification area will use compact tray icon spacing. When large taskbar icons are used, the notification area will use larger tray icon spacing. While no version of Windows behaves this way, I believe this is a smart default choice for ReactOS since users wanting large taskbar icons will generally expect larger tray icon spacing, while users with small taskbar icons may want more compact spacing. 1 - Never Compact. Regardless of the taskbar icon size setting, the notification area will always use the larger spacing. This follows the behavior of Windows 7 and newer versions. 2 - Always Compact. Regardless of the taskbar icon size setting, the notification area will always use the compact spacing. This follows the behavior of Windows Vista and older versions. Fix a clock spacing bug that occurs when changing the taskbar size before advancing to the next minute. The taskbar clock now adjusts its spacing when the size of the taskbar changes. --- base/shell/explorer/precomp.h | 22 +++++++++++++++++++- base/shell/explorer/settings.cpp | 6 ++++-- base/shell/explorer/syspager.cpp | 44 +++++++++++++++++++++++++-------------- base/shell/explorer/trayclock.cpp | 4 ++-- 4 files changed, 55 insertions(+), 21 deletions(-) diff --git a/base/shell/explorer/precomp.h b/base/shell/explorer/precomp.h index ecc36caa9c6..8a2dfd08811 100644 --- a/base/shell/explorer/precomp.h +++ b/base/shell/explorer/precomp.h @@ -184,6 +184,14 @@ TrayMessageLoop(IN OUT ITrayWindow *Tray); * settings.c */ +enum TrayIconsMode +{ + TIM_Default, + TIM_NeverCompact, + TIM_AlwaysCompact, + TIM_Max = TIM_AlwaysCompact +}; + typedef struct _TW_STUCKRECTS2 { DWORD cbSize; @@ -212,12 +220,24 @@ struct TaskbarSettings BOOL bPreferDate; BOOL bHideInactiveIcons; BOOL bSmallIcons; - BOOL bCompactTrayIcons; + TrayIconsMode eCompactTrayIcons; BOOL bShowDesktopButton; TW_STRUCKRECTS2 sr; BOOL Load(); BOOL Save(); + inline BOOL UseCompactTrayIcons() + { + switch (eCompactTrayIcons) + { + case TIM_NeverCompact: + return FALSE; + case TIM_AlwaysCompact: + return TRUE; + default: + return bSmallIcons; + } + } }; extern TaskbarSettings g_TaskbarSettings; diff --git a/base/shell/explorer/settings.cpp b/base/shell/explorer/settings.cpp index 62ac29b5b2f..f5932ef42cb 100644 --- a/base/shell/explorer/settings.cpp +++ b/base/shell/explorer/settings.cpp @@ -32,7 +32,6 @@ BOOL TaskbarSettings::Save() SHSetValueW(hkExplorer, L"Advanced", L"TaskbarSizeMove", REG_DWORD, &bAllowSizeMove, sizeof(bAllowSizeMove)); sr.cbSize = sizeof(sr); SHSetValueW(hkExplorer, L"Advanced", L"TaskbarSmallIcons", REG_DWORD, &bSmallIcons, sizeof(bSmallIcons)); - SHSetValueW(hkExplorer, L"Advanced", L"CompactTrayIcons", REG_DWORD, &bCompactTrayIcons, sizeof(bCompactTrayIcons)); SHSetValueW(hkExplorer, L"Advanced", L"TaskbarSd", REG_DWORD, &bShowDesktopButton, sizeof(bShowDesktopButton)); SHSetValueW(hkExplorer, L"StuckRects2", L"Settings", REG_BINARY, &sr, sizeof(sr)); @@ -64,7 +63,10 @@ BOOL TaskbarSettings::Load() bSmallIcons = (dwRet == ERROR_SUCCESS) ? (dwValue != 0) : TRUE; dwRet = SHGetValueW(hkExplorer, L"Advanced", L"CompactTrayIcons", NULL, &dwValue, &cbSize); - bCompactTrayIcons = (dwRet == ERROR_SUCCESS) ? (dwValue != 0) : bSmallIcons; + if (dwRet == ERROR_SUCCESS && dwValue <= TIM_Max) + eCompactTrayIcons = static_cast<TrayIconsMode>(dwValue); + else + eCompactTrayIcons = TIM_Default; dwRet = SHGetValueW(hkExplorer, L"Advanced", L"TaskbarSd", NULL, &dwValue, &cbSize); bShowDesktopButton = (dwRet == ERROR_SUCCESS) ? (dwValue != 0) : TRUE; diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index b039f189101..22063a18bc6 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -165,6 +165,7 @@ public: BOOL RemoveButton(IN CONST NOTIFYICONDATA *iconData); VOID ResizeImagelist(); bool SendNotifyCallback(InternalIconData* notifyItem, UINT uMsg); + void RefreshToolbarMetrics(BOOL bForceRefresh); private: LRESULT OnCtxMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); @@ -1250,24 +1251,34 @@ void CNotifyToolbar::Initialize(HWND hWndParent, CBalloonQueue * queue) m_ImageList = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, 0, 1000); SetImageList(m_ImageList); - TBMETRICS tbm = {sizeof(tbm)}; - tbm.dwMask = TBMF_BARPAD | TBMF_BUTTONSPACING | TBMF_PAD; - tbm.cxPad = 1; - tbm.cyPad = 1; - if (!g_TaskbarSettings.bCompactTrayIcons) - { - tbm.cxPad = GetSystemMetrics(SM_CXSMICON) / 2; - tbm.cyPad = GetSystemMetrics(SM_CYSMICON) / 2; - } - tbm.cxBarPad = 1; - tbm.cyBarPad = 1; - tbm.cxButtonSpacing = 1; - tbm.cyButtonSpacing = 1; - SetMetrics(&tbm); + RefreshToolbarMetrics(TRUE); SetButtonSize(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON)); } +void CNotifyToolbar::RefreshToolbarMetrics(BOOL bForceRefresh = FALSE) +{ + // Toolbar metrics only needs to be refreshed for the automatic setting and first launch + if (g_TaskbarSettings.eCompactTrayIcons == TrayIconsMode::TIM_Default || + bForceRefresh) + { + TBMETRICS tbm = {sizeof(tbm)}; + tbm.dwMask = TBMF_BARPAD | TBMF_BUTTONSPACING | TBMF_PAD; + tbm.cxPad = 1; + tbm.cyPad = 1; + if (!g_TaskbarSettings.UseCompactTrayIcons()) + { + tbm.cxPad = GetSystemMetrics(SM_CXSMICON) / 2; + tbm.cyPad = GetSystemMetrics(SM_CYSMICON) / 2; + } + tbm.cxBarPad = 1; + tbm.cyBarPad = 1; + tbm.cxButtonSpacing = 1; + tbm.cyButtonSpacing = 1; + SetMetrics(&tbm); + } +} + /* * SysPagerWnd */ @@ -1404,7 +1415,7 @@ void CSysPagerWnd::GetSize(IN BOOL IsHorizontal, IN PSIZE size) INT columns = 0; INT cyButton = GetSystemMetrics(SM_CYSMICON) + 2; INT cxButton = GetSystemMetrics(SM_CXSMICON) + 2; - if (!g_TaskbarSettings.bCompactTrayIcons) + if (!g_TaskbarSettings.UseCompactTrayIcons()) { cyButton = MulDiv(GetSystemMetrics(SM_CYSMICON), 3, 2); cxButton = MulDiv(GetSystemMetrics(SM_CXSMICON), 3, 2); @@ -1413,7 +1424,7 @@ void CSysPagerWnd::GetSize(IN BOOL IsHorizontal, IN PSIZE size) if (IsHorizontal) { - if (!g_TaskbarSettings.bCompactTrayIcons) + if (!g_TaskbarSettings.UseCompactTrayIcons()) rows = max(size->cy / MulDiv(cyButton, 3, 2), 1); else rows = max(size->cy / cyButton, 1); @@ -1522,6 +1533,7 @@ LRESULT CSysPagerWnd::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHan INT yOff = (szClient.cy - szBar.cy) / 2; Toolbar.SetWindowPos(NULL, xOff, yOff, szBar.cx, szBar.cy, SWP_NOZORDER); + Toolbar.RefreshToolbarMetrics(); } return Ret; } diff --git a/base/shell/explorer/trayclock.cpp b/base/shell/explorer/trayclock.cpp index f25c63dbe9c..4411d34d543 100644 --- a/base/shell/explorer/trayclock.cpp +++ b/base/shell/explorer/trayclock.cpp @@ -572,7 +572,7 @@ VOID CTrayClockWnd::PaintLine(IN HDC hDC, IN OUT RECT *rcClient, IN UINT LineNum return; INT HShift = ((IsHorizontal && (VisibleLines <= 1 || - g_TaskbarSettings.bCompactTrayIcons)) ? 0 : TRAY_CLOCK_WND_SPACING_X); + g_TaskbarSettings.UseCompactTrayIcons())) ? 0 : TRAY_CLOCK_WND_SPACING_X); TextOut(hDC, ((rcClient->right - LineSizes[szLinesIndex].cx) / 2) + HShift, @@ -684,7 +684,7 @@ LRESULT CTrayClockWnd::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHa VisibleLines = GetMinimumSize(IsHorizontal, &szClient); CurrentSize = szClient; - InvalidateRect(NULL, TRUE); + UpdateWnd(); return TRUE; }

1 year, 6 months

[reactos] 01/01: [SDK] Add cicRealCoCreateInstance into <cicero/cicbase.h>

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f2d34ab4c9532af5b22b0… commit f2d34ab4c9532af5b22b0c56dc5eb882f1ae234e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Dec 23 11:02:40 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Dec 23 11:02:40 2023 +0900 [SDK] Add cicRealCoCreateInstance into <cicero/cicbase.h> It looks like Cicero wants to hook CoCreateInstance. CORE-19363 --- sdk/include/reactos/cicero/cicbase.h | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/sdk/include/reactos/cicero/cicbase.h b/sdk/include/reactos/cicero/cicbase.h index 805a8187d7b..6bf6a491e80 100644 --- a/sdk/include/reactos/cicero/cicbase.h +++ b/sdk/include/reactos/cicero/cicbase.h @@ -241,29 +241,20 @@ _cicGetSetUserCoCreateInstance(FN_CoCreateInstance fnUserCoCreateInstance) return s_fn; } -/** - * @implemented - */ static inline HRESULT -cicCoCreateInstance( +cicRealCoCreateInstance( REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWORD dwClsContext, REFIID iid, LPVOID *ppv) { - FN_CoCreateInstance fnUserCoCreateInstance = _cicGetSetUserCoCreateInstance(NULL); - if (fnUserCoCreateInstance) - return fnUserCoCreateInstance(rclsid, pUnkOuter, dwClsContext, iid, ppv); - static HINSTANCE s_hOle32 = NULL; static FN_CoCreateInstance s_fnCoCreateInstance = NULL; if (!s_fnCoCreateInstance) { if (!s_hOle32) s_hOle32 = cicLoadSystemLibrary(L"ole32.dll", FALSE); - if (!s_hOle32) - return E_NOTIMPL; s_fnCoCreateInstance = (FN_CoCreateInstance)GetProcAddress(s_hOle32, "CoCreateInstance"); if (!s_fnCoCreateInstance) return E_NOTIMPL; @@ -272,6 +263,25 @@ cicCoCreateInstance( return s_fnCoCreateInstance(rclsid, pUnkOuter, dwClsContext, iid, ppv); } +/** + * @implemented + */ +static inline HRESULT +cicCoCreateInstance( + REFCLSID rclsid, + LPUNKNOWN pUnkOuter, + DWORD dwClsContext, + REFIID iid, + LPVOID *ppv) +{ + // NOTE: It looks like Cicero wants to hook CoCreateInstance + FN_CoCreateInstance fnUserCoCreateInstance = _cicGetSetUserCoCreateInstance(NULL); + if (fnUserCoCreateInstance) + return fnUserCoCreateInstance(rclsid, pUnkOuter, dwClsContext, iid, ppv); + + return cicRealCoCreateInstance(rclsid, pUnkOuter, dwClsContext, iid, ppv); +} + /** * @implemented */

1 year, 6 months

[reactos] 01/01: [CTFMON][MSCTFIME][SDK] Refactoring on Cicero design

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eb72347672f6f5750c06a… commit eb72347672f6f5750c06aa74bba559f69e637ad7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Dec 23 09:34:41 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Dec 23 09:34:41 2023 +0900 [CTFMON][MSCTFIME][SDK] Refactoring on Cicero design CORE-19362 --- base/applications/ctfmon/ctfmon.cpp | 6 +++ dll/ime/msctfime/msctfime.cpp | 62 +++++++++++------------ sdk/include/reactos/cicero/cicbase.h | 96 ++++++++++++++++++++++++++++++++++++ 3 files changed, 133 insertions(+), 31 deletions(-) diff --git a/base/applications/ctfmon/ctfmon.cpp b/base/applications/ctfmon/ctfmon.cpp index c0da53c4cf4..71e7aeae2af 100644 --- a/base/applications/ctfmon/ctfmon.cpp +++ b/base/applications/ctfmon/ctfmon.cpp @@ -180,6 +180,9 @@ InitApp( g_bOnWow64 = cicIsWow64(); // Is the current process on WoW64? cicGetOSInfo(&g_uACP, &g_dwOsInfo); // Get OS info + // Initialize Cicero + TFInitLib(); + // Create a mutex for Cicero g_hCicMutex = TF_CreateCicLoadMutex(&g_fWinLogon); if (!g_hCicMutex) @@ -234,6 +237,9 @@ UninitApp(VOID) // Close TIP Bar Popup ClosePopupTipbar(); + // Release Cicero + TFUninitLib(); + // Close the mutex ::CloseHandle(g_hCicMutex); g_hCicMutex = NULL; diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index cfb29f4db17..6aa33c76490 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -120,13 +120,7 @@ IsInteractiveUserLogon(VOID) return bOK && IsMember; } -typedef struct LIBTHREAD -{ - IUnknown *m_pUnknown1; - ITfDisplayAttributeMgr *m_pDisplayAttrMgr; -} LIBTHREAD, *PLIBTHREAD; - -HRESULT InitDisplayAttrbuteLib(PLIBTHREAD pLibThread) +HRESULT InitDisplayAttrbuteLib(PCIC_LIBTHREAD pLibThread) { if (!pLibThread) return E_FAIL; @@ -141,7 +135,7 @@ HRESULT InitDisplayAttrbuteLib(PLIBTHREAD pLibThread) return E_NOTIMPL; } -HRESULT UninitDisplayAttrbuteLib(PLIBTHREAD pLibThread) +HRESULT UninitDisplayAttrbuteLib(PCIC_LIBTHREAD pLibThread) { if (!pLibThread) return E_FAIL; @@ -155,23 +149,6 @@ HRESULT UninitDisplayAttrbuteLib(PLIBTHREAD pLibThread) return S_OK; } -void TFUninitLib_Thread(PLIBTHREAD pLibThread) -{ - if (!pLibThread) - return; - - if (pLibThread->m_pUnknown1) - { - pLibThread->m_pUnknown1->Release(); - pLibThread->m_pUnknown1 = NULL; - } - if (pLibThread->m_pDisplayAttrMgr) - { - pLibThread->m_pDisplayAttrMgr->Release(); - pLibThread->m_pDisplayAttrMgr = NULL; - } -} - /*********************************************************************** * Compartment */ @@ -542,7 +519,7 @@ public: DWORD m_dw3[19]; public: - CicInputContext(TfClientId cliendId, LIBTHREAD *pLibThread, HIMC hIMC); + CicInputContext(TfClientId cliendId, PCIC_LIBTHREAD pLibThread, HIMC hIMC); virtual ~CicInputContext() { } @@ -576,7 +553,7 @@ public: /** * @unimplemented */ -CicInputContext::CicInputContext(TfClientId cliendId, LIBTHREAD *pLibThread, HIMC hIMC) +CicInputContext::CicInputContext(TfClientId cliendId, PCIC_LIBTHREAD pLibThread, HIMC hIMC) { m_hIMC = hIMC; m_guid = GUID_NULL; @@ -1040,7 +1017,7 @@ protected: ITfDocumentMgr *m_pDocMgr; CThreadMgrEventSink *m_pThreadMgrEventSink; TfClientId m_cliendId; - LIBTHREAD m_LibThread; + CIC_LIBTHREAD m_LibThread; DWORD m_dw21; static BOOL CALLBACK EnumCreateInputContextCallback(HIMC hIMC, LPARAM lParam); @@ -2833,6 +2810,22 @@ VOID DetachIME(VOID) /** * @unimplemented */ +VOID InitUIFLib(VOID) +{ + //FIXME +} + +/** + * @unimplemented + */ +VOID DoneUIFLib(VOID) +{ + //FIXME +} + +/** + * @implemented + */ BOOL ProcessAttach(HINSTANCE hinstDLL) { g_hInst = hinstDLL; @@ -2844,7 +2837,10 @@ BOOL ProcessAttach(HINSTANCE hinstDLL) cicGetOSInfo(&g_uACP, &g_dwOSInfo); - // FIXME + InitUIFLib(); + + if (!TFInitLib()) + return FALSE; gfTFInitLib = TRUE; return AttachIME(); @@ -2857,14 +2853,18 @@ VOID ProcessDetach(HINSTANCE hinstDLL) { // FIXME + TF_DllDetachInOther(); + if (gfTFInitLib) + { DetachIME(); + TFUninitLib(); + } DeleteCriticalSection(&g_csLock); TLS::InternalDestroyTLS(); TLS::Uninitialize(); - - // FIXME + DoneUIFLib(); } /** diff --git a/sdk/include/reactos/cicero/cicbase.h b/sdk/include/reactos/cicero/cicbase.h index 9b934991e2d..805a8187d7b 100644 --- a/sdk/include/reactos/cicero/cicbase.h +++ b/sdk/include/reactos/cicero/cicbase.h @@ -49,6 +49,12 @@ inline void __cdecl operator delete(void* ptr, size_t size) noexcept cicMemFree(ptr); } +typedef struct CIC_LIBTHREAD +{ + IUnknown *m_pUnknown1; + ITfDisplayAttributeMgr *m_pDisplayAttrMgr; +} CIC_LIBTHREAD, *PCIC_LIBTHREAD; + /* The flags of cicGetOSInfo() */ #define CIC_OSINFO_NT 0x01 #define CIC_OSINFO_2KPLUS 0x02 @@ -217,3 +223,93 @@ Failure: m_cchPath = 0; return FALSE; } + +// ole32!CoCreateInstance +typedef HRESULT (WINAPI *FN_CoCreateInstance)( + REFCLSID rclsid, + LPUNKNOWN pUnkOuter, + DWORD dwClsContext, + REFIID iid, + LPVOID *ppv); + +static inline FN_CoCreateInstance +_cicGetSetUserCoCreateInstance(FN_CoCreateInstance fnUserCoCreateInstance) +{ + static FN_CoCreateInstance s_fn = NULL; + if (fnUserCoCreateInstance) + s_fn = fnUserCoCreateInstance; + return s_fn; +} + +/** + * @implemented + */ +static inline HRESULT +cicCoCreateInstance( + REFCLSID rclsid, + LPUNKNOWN pUnkOuter, + DWORD dwClsContext, + REFIID iid, + LPVOID *ppv) +{ + FN_CoCreateInstance fnUserCoCreateInstance = _cicGetSetUserCoCreateInstance(NULL); + if (fnUserCoCreateInstance) + return fnUserCoCreateInstance(rclsid, pUnkOuter, dwClsContext, iid, ppv); + + static HINSTANCE s_hOle32 = NULL; + static FN_CoCreateInstance s_fnCoCreateInstance = NULL; + if (!s_fnCoCreateInstance) + { + if (!s_hOle32) + s_hOle32 = cicLoadSystemLibrary(L"ole32.dll", FALSE); + if (!s_hOle32) + return E_NOTIMPL; + s_fnCoCreateInstance = (FN_CoCreateInstance)GetProcAddress(s_hOle32, "CoCreateInstance"); + if (!s_fnCoCreateInstance) + return E_NOTIMPL; + } + + return s_fnCoCreateInstance(rclsid, pUnkOuter, dwClsContext, iid, ppv); +} + +/** + * @implemented + */ +static inline BOOL +TFInitLib(FN_CoCreateInstance fnCoCreateInstance = NULL) +{ + if (fnCoCreateInstance) + _cicGetSetUserCoCreateInstance(fnCoCreateInstance); + return TRUE; +} + +/** + * @unimplemented + */ +static inline VOID +TFUninitLib(VOID) +{ + //FIXME +} + +/** + * @implemented + */ +static inline VOID +TFUninitLib_Thread(PCIC_LIBTHREAD pLibThread) +{ + if (!pLibThread) + return; + + if (pLibThread->m_pUnknown1) + { + pLibThread->m_pUnknown1->Release(); + pLibThread->m_pUnknown1 = NULL; + } + + if (pLibThread->m_pDisplayAttrMgr) + { + pLibThread->m_pDisplayAttrMgr->Release(); + pLibThread->m_pDisplayAttrMgr = NULL; + } +}

1 year, 6 months

[reactos] 01/01: [CTFMON][SDK] Move ClosePopupTipbar and GetPopupTipbar

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=50755684cfaa5135db8b0… commit 50755684cfaa5135db8b0fc8fc48d032ecd36929 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Dec 23 08:27:47 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Dec 23 08:27:47 2023 +0900 [CTFMON][SDK] Move ClosePopupTipbar and GetPopupTipbar Refactoring. CORE-19362 --- base/applications/ctfmon/precomp.h | 10 ++++++++++ sdk/include/reactos/cicero/cicbase.h | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/base/applications/ctfmon/precomp.h b/base/applications/ctfmon/precomp.h index 541e1d6833a..4a8a5d121d5 100644 --- a/base/applications/ctfmon/precomp.h +++ b/base/applications/ctfmon/precomp.h @@ -43,3 +43,13 @@ typedef enum WATCH_INDEX WI_ASSEMBLIES = 11, WI_DESKTOP_SWITCH = 12, } WATCH_INDEX; + +// FIXME: Use msutb.dll and header +static inline void ClosePopupTipbar(void) +{ +} + +// FIXME: Use msutb.dll and header +static inline void GetPopupTipbar(HWND hwnd, BOOL fWinLogon) +{ +} diff --git a/sdk/include/reactos/cicero/cicbase.h b/sdk/include/reactos/cicero/cicbase.h index c3eff7f720c..9b934991e2d 100644 --- a/sdk/include/reactos/cicero/cicbase.h +++ b/sdk/include/reactos/cicero/cicbase.h @@ -49,16 +49,6 @@ inline void __cdecl operator delete(void* ptr, size_t size) noexcept cicMemFree(ptr); } -// FIXME: Use msutb.dll and header -static inline void ClosePopupTipbar(void) -{ -} - -// FIXME: Use msutb.dll and header -static inline void GetPopupTipbar(HWND hwnd, BOOL fWinLogon) -{ -} - /* The flags of cicGetOSInfo() */ #define CIC_OSINFO_NT 0x01 #define CIC_OSINFO_2KPLUS 0x02

1 year, 6 months

[reactos] 01/01: [BROWSEUI] Clear pidlLastParsed on CAddressEditBox::Execute (#6183)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ac1a96477ba45d37c8448… commit ac1a96477ba45d37c8448fc3cf858f7cca6c426f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Dec 23 08:16:01 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 23 08:16:01 2023 +0900 [BROWSEUI] Clear pidlLastParsed on CAddressEditBox::Execute (#6183) Based on KRosUser's gopidlparsed.patch. Clear pidlLastParsed if necessary. CORE-19019 --- dll/win32/browseui/addresseditbox.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dll/win32/browseui/addresseditbox.cpp b/dll/win32/browseui/addresseditbox.cpp index cec978c191e..7eb6581f731 100644 --- a/dll/win32/browseui/addresseditbox.cpp +++ b/dll/win32/browseui/addresseditbox.cpp @@ -318,8 +318,16 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::Execute(long paramC) hr = psf->CompareIDs(0, pidl, pidlLastParsed); SHFree(pidl); + if (hr == 0) + { + if (pidlLastParsed) + { + ILFree(pidlLastParsed); + pidlLastParsed = NULL; + } return S_OK; + } /* * Attempt to browse to the parsed pidl

1 year, 6 months

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