Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[gvg] 20633: The adapter name is actually the GUID. Also store the human recognizable

by gvg＠svn.reactos.org

The adapter name is actually the GUID. Also store the human recognizable description. This brings the network control panel applet a step further. Modified: trunk/reactos/drivers/net/tcpip/datalink/lan.c Modified: trunk/reactos/drivers/net/tcpip/include/ip.h _____ Modified: trunk/reactos/drivers/net/tcpip/datalink/lan.c --- trunk/reactos/drivers/net/tcpip/datalink/lan.c 2006-01-06 22:57:21 UTC (rev 20632) +++ trunk/reactos/drivers/net/tcpip/datalink/lan.c 2006-01-06 23:13:23 UTC (rev 20633) @@ -781,8 +781,8 @@ static NTSTATUS CheckForDeviceDesc( PUNICODE_STRING EnumKeyName, PUNICODE_STRING TargetKeyName, - PUNICODE_STRING ShortName, - PUNICODE_STRING OutName ) { + PUNICODE_STRING Name, + PUNICODE_STRING DeviceDesc ) { UNICODE_STRING RootDevice = { 0 }, LinkageKeyName = { 0 }; UNICODE_STRING DescKeyName = { 0 }, Linkage = { 0 }; UNICODE_STRING BackSlash = { 0 }; @@ -809,14 +809,14 @@ Status = ReadStringFromRegistry( LinkageKey, L"RootDevice", &RootDevice ); if( !NT_SUCCESS(Status) ) goto cleanup; - if( RtlCompareUnicodeString( &RootDevice, ShortName, TRUE ) == 0 ) { + if( RtlCompareUnicodeString( &RootDevice, Name, TRUE ) == 0 ) { Status = OpenRegistryKey( &DescKeyName, &DescKey ); if( !NT_SUCCESS(Status) ) goto cleanup; - Status = ReadStringFromRegistry( DescKey, L"DriverDesc", OutName ); + Status = ReadStringFromRegistry( DescKey, L"DriverDesc", DeviceDesc ); if( !NT_SUCCESS(Status) ) goto cleanup; - TI_DbgPrint(DEBUG_DATALINK,("ADAPTER NAME: %wZ\n", OutName)); + TI_DbgPrint(DEBUG_DATALINK,("ADAPTER DESC: %wZ\n", DeviceDesc)); } else Status = STATUS_UNSUCCESSFUL; cleanup: @@ -831,8 +831,8 @@ return Status; } -static NTSTATUS FindDeviceNameForAdapter( PUNICODE_STRING ShortName, - PUNICODE_STRING OutName ) { +static NTSTATUS FindDeviceDescForAdapter( PUNICODE_STRING Name, + PUNICODE_STRING DeviceDesc ) { UNICODE_STRING EnumKeyName, TargetKeyName; HANDLE EnumKey; NTSTATUS Status; @@ -872,7 +872,7 @@ TargetKeyName.Buffer = Kbio->Name; Status = CheckForDeviceDesc - ( &EnumKeyName, &TargetKeyName, ShortName, OutName ); + ( &EnumKeyName, &TargetKeyName, Name, DeviceDesc ); if( NT_SUCCESS(Status) ) { NtClose( EnumKey ); return Status; @@ -880,25 +880,30 @@ } } - RtlInitUnicodeString( OutName, L"" ); - AppendUnicodeString( OutName, &TargetKeyName, FALSE ); + RtlInitUnicodeString( DeviceDesc, L"" ); + AppendUnicodeString( DeviceDesc, &TargetKeyName, FALSE ); NtClose( EnumKey ); return STATUS_UNSUCCESSFUL; } -VOID GetShortName( PUNICODE_STRING RegistryKey, - PUNICODE_STRING ShortNameOut ) { +VOID GetName( PUNICODE_STRING RegistryKey, + PUNICODE_STRING OutName ) { PWCHAR Ptr; - ShortNameOut->Buffer = + UNICODE_STRING PartialRegistryKey; + + PartialRegistryKey.Buffer = RegistryKey->Buffer + wcslen(CCS_ROOT L"\\Services\\"); - Ptr = ShortNameOut->Buffer; + Ptr = PartialRegistryKey.Buffer; while( *Ptr != L'\\' && ((PCHAR)Ptr) < ((PCHAR)RegistryKey->Buffer) + RegistryKey->Length ) Ptr++; - ShortNameOut->Length = ShortNameOut->MaximumLength = - (Ptr - ShortNameOut->Buffer) * sizeof(WCHAR); + PartialRegistryKey.Length = PartialRegistryKey.MaximumLength = + (Ptr - PartialRegistryKey.Buffer) * sizeof(WCHAR); + + RtlInitUnicodeString( OutName, L"" ); + AppendUnicodeString( OutName, &PartialRegistryKey, FALSE ); } VOID BindAdapter( @@ -920,14 +925,11 @@ ULONG Lookahead = LOOKAHEAD_SIZE; NTSTATUS Status; HANDLE RegHandle = 0; - UNICODE_STRING ShortName; TI_DbgPrint(DEBUG_DATALINK, ("Called.\n")); Adapter->State = LAN_STATE_OPENING; - GetShortName( RegistryPath, &ShortName ); - NdisStatus = NDISCall(Adapter, NdisRequestSetInformation, OID_GEN_CURRENT_LOOKAHEAD, @@ -963,11 +965,14 @@ * services (ZwOpenKey, etc). */ + GetName( RegistryPath, &IF->Name ); + Status = OpenRegistryKey( RegistryPath, &RegHandle ); if(NT_SUCCESS(Status)) { - Status = FindDeviceNameForAdapter( &ShortName, &IF->Name ); - TI_DbgPrint(DEBUG_DATALINK,("Adapter Name: %wZ\n", &IF->Name)); + Status = FindDeviceDescForAdapter( &IF->Name, &IF->Description ); + TI_DbgPrint(DEBUG_DATALINK,("Adapter Description: %wZ\n", + &IF->Description)); } DefaultMask.Type = IP_ADDRESS_V4; _____ Modified: trunk/reactos/drivers/net/tcpip/include/ip.h --- trunk/reactos/drivers/net/tcpip/include/ip.h 2006-01-06 22:57:21 UTC (rev 20632) +++ trunk/reactos/drivers/net/tcpip/include/ip.h 2006-01-06 23:13:23 UTC (rev 20633) @@ -150,7 +150,8 @@ IP_ADDRESS PointToPoint; /* Point to point address */ IP_ADDRESS Netmask; /* Netmask */ IP_ADDRESS Broadcast; /* Broadcast */ - UNICODE_STRING Name; /* Adapter name */ + UNICODE_STRING Name; /* Adapter name (GUID) */ + UNICODE_STRING Description; /* Adapter description (Human readable) */ PUCHAR Address; /* Pointer to interface address */ UINT AddressLength; /* Length of address in bytes */ UINT Index; /* Index of adapter (used to add ip addr) */

18 years, 8 months

[ion] 20632: - Set the right Thread->WaitTime dring waits

by ion＠svn.reactos.org

- Set the right Thread->WaitTime dring waits - Initialize WaitBlock->Thread during thread creation. - Make APCs queuable for the thread after it's created - Enable Timer Block optimization since it works now. This allows us not to always set-up for each wait, since most of its fields can remain static. - Properly link wait block together with the waitlist of the timer. Modified: trunk/reactos/ntoskrnl/ke/gate.c Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ke/queue.c Modified: trunk/reactos/ntoskrnl/ke/wait.c _____ Modified: trunk/reactos/ntoskrnl/ke/gate.c --- trunk/reactos/ntoskrnl/ke/gate.c 2006-01-06 22:41:42 UTC (rev 20631) +++ trunk/reactos/ntoskrnl/ke/gate.c 2006-01-06 22:57:21 UTC (rev 20632) @@ -63,13 +63,12 @@ GateWaitBlock->Thread = CurrentThread; /* Set the Thread Wait Data */ - CurrentThread->WaitReason = WaitReason; - CurrentThread->WaitMode = WaitMode; CurrentThread->WaitIrql = OldIrql; CurrentThread->GateObject = Gate; /* Insert into the Wait List */ - InsertTailList(&Gate->Header.WaitListHead, &GateWaitBlock->WaitListEntry); + InsertTailList(&Gate->Header.WaitListHead, + &GateWaitBlock->WaitListEntry); /* Handle Kernel Queues */ if (CurrentThread->Queue) @@ -81,7 +80,7 @@ /* Setup the wait information */ CurrentThread->WaitMode = WaitMode; CurrentThread->WaitReason = WaitReason; - CurrentThread->WaitTime = 0; + CurrentThread->WaitTime = ((PLARGE_INTEGER)&KeTickCount)->LowPart; CurrentThread->State = Waiting; /* Find a new thread to run */ _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2006-01-06 22:41:42 UTC (rev 20631) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2006-01-06 22:57:21 UTC (rev 20632) @@ -19,7 +19,9 @@ #define THREAD_ALERT_INCREMENT 2 extern EX_WORK_QUEUE ExWorkerQueue[MaximumWorkQueue]; +#define TIMER_WAIT_BLOCK 0x3L + /* * PURPOSE: List of threads associated with each priority level */ @@ -789,6 +791,10 @@ PVOID Teb, PVOID KernelStack) { + ULONG i; + PKWAIT_BLOCK TimerWaitBlock; + PKTIMER Timer; + /* Initalize the Dispatcher Header */ DPRINT("Initializing Dispatcher Header for New Thread: %x in Process: %x\n", Thread, Process); KeInitializeDispatcherHeader(&Thread->DispatcherHeader, @@ -803,6 +809,13 @@ /* Initialize the Mutant List */ InitializeListHead(&Thread->MutantListHead); + /* Initialize the wait blocks */ + for (i = 0; i< (THREAD_WAIT_OBJECTS + 1); i++) + { + /* Put our pointer */ + Thread->WaitBlock[i].Thread = Thread; + } + /* Setup the Service Descriptor Table for Native Calls */ Thread->ServiceTable = KeServiceDescriptorTable; @@ -813,6 +826,7 @@ Thread->ApcStatePointer[OriginalApcEnvironment] = &Thread->ApcState; Thread->ApcStatePointer[AttachedApcEnvironment] = &Thread->SavedApcState; Thread->ApcStateIndex = OriginalApcEnvironment; + Thread->ApcQueueable = TRUE; KeInitializeSpinLock(&Thread->ApcQueueLock); /* Initialize the Suspend APC */ @@ -829,17 +843,18 @@ KeInitializeSemaphore(&Thread->SuspendSemaphore, 0, 128); /* FIXME OPTIMIZATION OF DOOM. DO NOT ENABLE FIXME */ -#if 0 - Thread->WaitBlock[3].Object = (PVOID)&Thread->Timer; - Thread->WaitBlock[3].Thread = Thread; - Thread->WaitBlock[3].WaitKey = STATUS_TIMEOUT; - Thread->WaitBlock[3].WaitType = WaitAny; - Thread->WaitBlock[3].NextWaitBlock = NULL; - InsertTailList(&Thread->Timer.Header.WaitListHead, - &Thread->WaitBlock[3].WaitListEntry); -#endif - KeInitializeTimer(&Thread->Timer); + Timer = &Thread->Timer; + KeInitializeTimer(Timer); + TimerWaitBlock = &Thread->WaitBlock[TIMER_WAIT_BLOCK]; + TimerWaitBlock->Object = Timer; + TimerWaitBlock->WaitKey = STATUS_TIMEOUT; + TimerWaitBlock->WaitType = WaitAny; + TimerWaitBlock->NextWaitBlock = NULL; + /* Link the two wait lists together */ + TimerWaitBlock->WaitListEntry.Flink = &Timer->Header.WaitListHead; + TimerWaitBlock->WaitListEntry.Blink = &Timer->Header.WaitListHead; + /* Set the TEB */ Thread->Teb = Teb; _____ Modified: trunk/reactos/ntoskrnl/ke/queue.c --- trunk/reactos/ntoskrnl/ke/queue.c 2006-01-06 22:41:42 UTC (rev 20631) +++ trunk/reactos/ntoskrnl/ke/queue.c 2006-01-06 22:57:21 UTC (rev 20632) @@ -270,8 +270,8 @@ WaitBlock->WaitType = WaitAny; /* Link the timer to this Wait Block */ - InitializeListHead(&Timer->Header.WaitListHead); - InsertTailList(&Timer->Header.WaitListHead, &WaitBlock->WaitListEntry); + Timer->Header.WaitListHead.Flink = &WaitBlock->WaitListEntry; + Timer->Header.WaitListHead.Blink = &WaitBlock->WaitListEntry; /* Create Timer */ DPRINT("Creating Timer with timeout %I64d\n", *Timeout); @@ -290,7 +290,7 @@ Thread->WaitMode = WaitMode; Thread->WaitReason = WrQueue; Thread->Alertable = FALSE; - Thread->WaitTime = 0; + Thread->WaitTime = ((PLARGE_INTEGER)&KeTickCount)->LowPart; Thread->State = Waiting; /* Find a new thread to run */ _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2006-01-06 22:41:42 UTC (rev 20631) +++ trunk/reactos/ntoskrnl/ke/wait.c 2006-01-06 22:57:21 UTC (rev 20632) @@ -148,15 +148,11 @@ /* Setup the Wait Block */ CurrentThread->WaitBlockList = TimerWaitBlock; - TimerWaitBlock->Object = (PVOID)ThreadTimer; - TimerWaitBlock->Thread = CurrentThread; - TimerWaitBlock->WaitKey = (USHORT)STATUS_TIMEOUT; - TimerWaitBlock->WaitType = WaitAny; TimerWaitBlock->NextWaitBlock = TimerWaitBlock; /* Link the timer to this Wait Block */ - InitializeListHead(&ThreadTimer->Header.WaitListHead); - InsertTailList(&ThreadTimer->Header.WaitListHead, &TimerWaitBlock->WaitListEntry); + ThreadTimer->Header.WaitListHead.Flink = &TimerWaitBlock->WaitListEntry; + ThreadTimer->Header.WaitListHead.Blink = &TimerWaitBlock->WaitListEntry; /* Insert the Timer into the Timer Lists and enable it */ if (!KiInsertTimer(ThreadTimer, *Interval)) @@ -177,7 +173,7 @@ CurrentThread->Alertable = Alertable; CurrentThread->WaitMode = WaitMode; CurrentThread->WaitReason = DelayExecution; - CurrentThread->WaitTime = 0; + CurrentThread->WaitTime = ((PLARGE_INTEGER)&KeTickCount)->LowPart; CurrentThread->State = Waiting; /* Find a new thread to run */ @@ -336,16 +332,11 @@ WaitBlock->NextWaitBlock = TimerWaitBlock; /* Set up the Timer Wait Block */ - TimerWaitBlock->Object = (PVOID)ThreadTimer; - TimerWaitBlock->Thread = CurrentThread; - TimerWaitBlock->WaitKey = STATUS_TIMEOUT; - TimerWaitBlock->WaitType = WaitAny; TimerWaitBlock->NextWaitBlock = WaitBlock; /* Link the timer to this Wait Block */ - InitializeListHead(&ThreadTimer->Header.WaitListHead); - InsertTailList(&ThreadTimer->Header.WaitListHead, - &TimerWaitBlock->WaitListEntry); + ThreadTimer->Header.WaitListHead.Flink = &TimerWaitBlock->WaitListEntry; + ThreadTimer->Header.WaitListHead.Blink = &TimerWaitBlock->WaitListEntry; /* Insert the Timer into the Timer Lists and enable it */ if (!KiInsertTimer(ThreadTimer, *Timeout)) @@ -371,7 +362,7 @@ CurrentThread->Alertable = Alertable; CurrentThread->WaitMode = WaitMode; CurrentThread->WaitReason = WaitReason; - CurrentThread->WaitTime = 0; + CurrentThread->WaitTime = ((PLARGE_INTEGER)&KeTickCount)->LowPart; CurrentThread->State = Waiting; /* Find a new thread to run */ @@ -610,13 +601,9 @@ WaitBlock->NextWaitBlock = TimerWaitBlock; /* Set up the Timer Wait Block */ - TimerWaitBlock->Object = (PVOID)ThreadTimer; - TimerWaitBlock->Thread = CurrentThread; - TimerWaitBlock->WaitKey = STATUS_TIMEOUT; - TimerWaitBlock->WaitType = WaitAny; TimerWaitBlock->NextWaitBlock = WaitBlockArray; - /* Link the timer to this Wait Block */ + /* Initialize the list head */ InitializeListHead(&ThreadTimer->Header.WaitListHead); /* Insert the Timer into the Timer Lists and enable it */ @@ -655,7 +642,7 @@ CurrentThread->Alertable = Alertable; CurrentThread->WaitMode = WaitMode; CurrentThread->WaitReason = WaitReason; - CurrentThread->WaitTime = 0; + CurrentThread->WaitTime = ((PLARGE_INTEGER)&KeTickCount)->LowPart; CurrentThread->State = Waiting; /* Find a new thread to run */

18 years, 8 months

[cwittich] 20631: buttons in page setup now working properly (for En and De only)

by cwittich＠svn.reactos.org

buttons in page setup now working properly (for En and De only) Modified: trunk/reactos/subsys/system/notepad/De.rc Modified: trunk/reactos/subsys/system/notepad/En.rc Modified: trunk/reactos/subsys/system/notepad/dialog.c _____ Modified: trunk/reactos/subsys/system/notepad/De.rc --- trunk/reactos/subsys/system/notepad/De.rc 2006-01-06 20:53:32 UTC (rev 20630) +++ trunk/reactos/subsys/system/notepad/De.rc 2006-01-06 22:41:42 UTC (rev 20631) @@ -95,8 +95,8 @@ LTEXT "&Unten:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Abbrechen", 0x152, 180, 21, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Abbrechen", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP PUSHBUTTON "&Hilfe", 0x153, 180, 39, 40, 15, WS_TABSTOP } _____ Modified: trunk/reactos/subsys/system/notepad/En.rc --- trunk/reactos/subsys/system/notepad/En.rc 2006-01-06 20:53:32 UTC (rev 20630) +++ trunk/reactos/subsys/system/notepad/En.rc 2006-01-06 22:41:42 UTC (rev 20631) @@ -97,8 +97,8 @@ LTEXT "&Bottom:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Cancel", 0x152, 180, 21, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Cancel", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP PUSHBUTTON "&Help", 0x153, 180, 39, 40, 15, WS_TABSTOP } _____ Modified: trunk/reactos/subsys/system/notepad/dialog.c --- trunk/reactos/subsys/system/notepad/dialog.c 2006-01-06 20:53:32 UTC (rev 20630) +++ trunk/reactos/subsys/system/notepad/dialog.c 2006-01-06 22:41:42 UTC (rev 20631) @@ -847,51 +847,54 @@ static INT_PTR WINAPI DIALOG_PAGESETUP_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { - switch (msg) + switch (msg) { case WM_COMMAND: - switch (wParam) + if (HIWORD(wParam) == BN_CLICKED) { - case IDOK: - /* save user input and close dialog */ - GetDlgItemText(hDlg, 0x141, Globals.szHeader, SIZEOF(Globals.szHeader)); - GetDlgItemText(hDlg, 0x143, Globals.szFooter, SIZEOF(Globals.szFooter)); - GetDlgItemText(hDlg, 0x14A, Globals.szMarginTop, SIZEOF(Globals.szMarginTop)); - GetDlgItemText(hDlg, 0x150, Globals.szMarginBottom, SIZEOF(Globals.szMarginBottom)); - GetDlgItemText(hDlg, 0x147, Globals.szMarginLeft, SIZEOF(Globals.szMarginLeft)); - GetDlgItemText(hDlg, 0x14D, Globals.szMarginRight, SIZEOF(Globals.szMarginRight)); - EndDialog(hDlg, IDOK); - return TRUE; + switch (LOWORD(wParam)) + { + case IDOK: + /* save user input and close dialog */ + GetDlgItemText(hDlg, 0x141, Globals.szHeader, SIZEOF(Globals.szHeader)); + GetDlgItemText(hDlg, 0x143, Globals.szFooter, SIZEOF(Globals.szFooter)); + GetDlgItemText(hDlg, 0x14A, Globals.szMarginTop, SIZEOF(Globals.szMarginTop)); + GetDlgItemText(hDlg, 0x150, Globals.szMarginBottom, SIZEOF(Globals.szMarginBottom)); + GetDlgItemText(hDlg, 0x147, Globals.szMarginLeft, SIZEOF(Globals.szMarginLeft)); + GetDlgItemText(hDlg, 0x14D, Globals.szMarginRight, SIZEOF(Globals.szMarginRight)); + EndDialog(hDlg, IDOK); + return TRUE; - case IDCANCEL: - /* discard user input and close dialog */ - EndDialog(hDlg, IDCANCEL); - return TRUE; + case IDCANCEL: + /* discard user input and close dialog */ + EndDialog(hDlg, IDCANCEL); + return TRUE; - case IDHELP: - { - /* FIXME: Bring this to work */ - static const WCHAR sorryW[] = { 'S','o','r','r','y',',',' ','n','o',' ','h','e','l','p',' ','a','v','a','i','l','a','b','l','e',0 }; - static const WCHAR helpW[] = { 'H','e','l','p',0 }; - MessageBox(Globals.hMainWnd, sorryW, helpW, MB_ICONEXCLAMATION); - return TRUE; - } + case IDHELP: + { + /* FIXME: Bring this to work */ + static const WCHAR sorryW[] = { 'S','o','r','r','y',',',' ','n','o',' ','h','e','l','p',' ','a','v','a','i','l','a','b','l','e',0 }; + static const WCHAR helpW[] = { 'H','e','l','p',0 }; + MessageBox(Globals.hMainWnd, sorryW, helpW, MB_ICONEXCLAMATION); + return TRUE; + } - default: - break; + default: + break; + } } - break; + break; case WM_INITDIALOG: - /* fetch last user input prior to display dialog */ - SetDlgItemText(hDlg, 0x141, Globals.szHeader); - SetDlgItemText(hDlg, 0x143, Globals.szFooter); - SetDlgItemText(hDlg, 0x14A, Globals.szMarginTop); - SetDlgItemText(hDlg, 0x150, Globals.szMarginBottom); - SetDlgItemText(hDlg, 0x147, Globals.szMarginLeft); - SetDlgItemText(hDlg, 0x14D, Globals.szMarginRight); - break; + /* fetch last user input prior to display dialog */ + SetDlgItemText(hDlg, 0x141, Globals.szHeader); + SetDlgItemText(hDlg, 0x143, Globals.szFooter); + SetDlgItemText(hDlg, 0x14A, Globals.szMarginTop); + SetDlgItemText(hDlg, 0x150, Globals.szMarginBottom); + SetDlgItemText(hDlg, 0x147, Globals.szMarginLeft); + SetDlgItemText(hDlg, 0x14D, Globals.szMarginRight); + break; } - return FALSE; + return FALSE; }

18 years, 8 months

[gvg] 20630: Update status

by gvg＠svn.reactos.org

Update status Modified: trunk/reactos/media/doc/README.WINE _____ Modified: trunk/reactos/media/doc/README.WINE --- trunk/reactos/media/doc/README.WINE 2006-01-06 20:49:27 UTC (rev 20629) +++ trunk/reactos/media/doc/README.WINE 2006-01-06 20:53:32 UTC (rev 20630) @@ -26,56 +26,56 @@ work to import a new dll. The following build tools are shared with Wine. -reactos/tools/unicode # Synced to Wine-0_9_4 -reactos/tools/wpp # Synced to Wine-0_9_4 +reactos/tools/unicode # Synced to Wine-0_9_5 +reactos/tools/wpp # Synced to Wine-0_9_5 reactos/tools/bin2res # Resource to binary converter -reactos/tools/winebuild # Synced to Wine-0_9_4 -reactos/tools/wmc # Synced to Wine-0_9_4 -reactos/tools/wrc # Synced to Wine-0_9_4 +reactos/tools/winebuild # Synced to Wine-0_9_5 +reactos/tools/wmc # Synced to Wine-0_9_5 +reactos/tools/wrc # Synced to Wine-0_9_5 reactos/tools/widl # Forked at Wine-20050930 The following libraries are shared with Wine. -reactos/lib/avifil32 # Synced to Wine-0_9_4 -reactos/lib/cabinet # Synced to Wine-0_9_4 -reactos/lib/comctl32 # Synced to Wine-0_9_4 -reactos/lib/comdlg32 # Synced to Wine-0_9_4 -reactos/lib/crypt32 # Synced to Wine-0_9_4 +reactos/lib/avifil32 # Synced to Wine-0_9_5 +reactos/lib/cabinet # Synced to Wine-0_9_5 +reactos/lib/comctl32 # Synced to Wine-0_9_5 +reactos/lib/comdlg32 # Synced to Wine-0_9_5 +reactos/lib/crypt32 # Synced to Wine-0_9_5 reactos/lib/dbghelp # -reactos/lib/dinput # Synced to Wine-0_9_4 -reactos/lib/dinput8 # Synced to Wine-0_9_4 -reactos/lib/dplay # Synced to Wine-0_9_4 -reactos/lib/dplayx # Synced to Wine-0_9_4 -reactos/lib/dxdiagn # Synced to Wine-0_9_4 -reactos/lib/icmp # Synced to Wine-0_9_4 -reactos/lib/imm32 # Synced to Wine-0_9_4 +reactos/lib/dinput # Synced to Wine-0_9_5 +reactos/lib/dinput8 # Synced to Wine-0_9_5 +reactos/lib/dplay # Synced to Wine-0_9_5 +reactos/lib/dplayx # Synced to Wine-0_9_5 +reactos/lib/dxdiagn # Synced to Wine-0_9_5 +reactos/lib/icmp # Synced to Wine-0_9_5 +reactos/lib/imm32 # Synced to Wine-0_9_5 reactos/lib/iphlpapi # Out of sync reactos/lib/imagehlp # Patches for BindImage need review and submission to winehq. reactos/lib/msvcrt20 # Out of sync -reactos/lib/mpr # Synced to Wine-0_9_4 +reactos/lib/mpr # Synced to Wine-0_9_5 reactos/lib/msacm # Out of sync -reactos/lib/msimg32 # Synced to Wine-0_9_4 -reactos/lib/msi # Synced to Wine-0_9_4 +reactos/lib/msimg32 # Synced to Wine-0_9_5 +reactos/lib/msi # Synced to Wine-0_9_5 reactos/lib/msvideo # Out of sync -reactos/lib/netapi32 # Synced to Wine-0_9_4 -reactos/lib/objsel # Synced to Wine-0_9_4 +reactos/lib/netapi32 # Synced to Wine-0_9_5 +reactos/lib/objsel # Synced to Wine-0_9_5 reactos/lib/odbc32 # Out of sync. Depends on port of Linux ODBC. -reactos/lib/ole32 # Synced to Wine-0_9_4 -reactos/lib/oleacc # Synced to Wine-0_9_4 -reactos/lib/oleaut32 # Synced to Wine-0_9_4 -reactos/lib/oledlg # Synced to Wine-0_9_4 -reactos/lib/olepro32 # Synced to Wine-0_9_4 -reactos/lib/riched20 # Synced to Wine-0_9_4 -reactos/lib/richedit # Synced to Wine-0_9_4 -reactos/lib/rpcrt4 # Synced to Wine-0_9_4 +reactos/lib/ole32 # Synced to Wine-0_9_5 +reactos/lib/oleacc # Synced to Wine-0_9_5 +reactos/lib/oleaut32 # Synced to Wine-0_9_5 +reactos/lib/oledlg # Synced to Wine-0_9_5 +reactos/lib/olepro32 # Synced to Wine-0_9_5 +reactos/lib/riched20 # Synced to Wine-0_9_5 +reactos/lib/richedit # Synced to Wine-0_9_5 +reactos/lib/rpcrt4 # Synced to Wine-0_9_5 reactos/lib/setupapi # Forked at Wine-20050524 -reactos/lib/shell32 # Synced to Wine-0_9_4 -reactos/lib/shdocvw # Synced to Wine-0_9_4 -reactos/lib/shfolder # Synced to Wine-0_9_4 -reactos/lib/shlwapi # Synced to Wine-0_9_4 +reactos/lib/shell32 # Synced to Wine-0_9_5 +reactos/lib/shdocvw # Synced to Wine-0_9_5 +reactos/lib/shfolder # Synced to Wine-0_9_5 +reactos/lib/shlwapi # Synced to Wine-0_9_5 reactos/lib/twain # Out of sync -reactos/lib/urlmon # Synced to Wine-0_9_4 -reactos/lib/uxtheme # Synced to Wine-0_9_4 +reactos/lib/urlmon # Synced to Wine-0_9_5 +reactos/lib/uxtheme # Synced to Wine-0_9_5 reactos/lib/version # Out of sync reactos/lib/wininet # Out of sync reactos/lib/winmm # Forked at Wine-20050628

18 years, 8 months

[gvg] 20629: Tag Wine-0_9_5, remove old tag

by gvg＠svn.reactos.org

Tag Wine-0_9_5, remove old tag Deleted: vendor/wine/dlls/avifil32/Wine-0_9_4/ Added: vendor/wine/dlls/avifil32/Wine-0_9_5/ Deleted: vendor/wine/dlls/cabinet/Wine-0_9_4/ Added: vendor/wine/dlls/cabinet/Wine-0_9_5/ Deleted: vendor/wine/dlls/comctl32/Wine-0_9_4/ Added: vendor/wine/dlls/comctl32/Wine-0_9_5/ Deleted: vendor/wine/dlls/comctl32/Wine-0_9_5/comctl32undoc.c Added: vendor/wine/dlls/comctl32/Wine-0_9_5/comctl32undoc.c Deleted: vendor/wine/dlls/comctl32/Wine-0_9_5/ipaddress.c Added: vendor/wine/dlls/comctl32/Wine-0_9_5/ipaddress.c Deleted: vendor/wine/dlls/comctl32/Wine-0_9_5/listview.c Added: vendor/wine/dlls/comctl32/Wine-0_9_5/listview.c Deleted: vendor/wine/dlls/comctl32/Wine-0_9_5/propsheet.c Added: vendor/wine/dlls/comctl32/Wine-0_9_5/propsheet.c Deleted: vendor/wine/dlls/commdlg/Wine-0_9_4/ Added: vendor/wine/dlls/commdlg/Wine-0_9_5/ Deleted: vendor/wine/dlls/commdlg/Wine-0_9_5/colordlg.c Added: vendor/wine/dlls/commdlg/Wine-0_9_5/colordlg.c Deleted: vendor/wine/dlls/crypt32/Wine-0_9_4/ Added: vendor/wine/dlls/crypt32/Wine-0_9_5/ Deleted: vendor/wine/dlls/dinput/Wine-0_9_4/ Added: vendor/wine/dlls/dinput/Wine-0_9_5/ Deleted: vendor/wine/dlls/dinput8/Wine-0_9_4/ Added: vendor/wine/dlls/dinput8/Wine-0_9_5/ Deleted: vendor/wine/dlls/dplay/Wine-0_9_4/ Added: vendor/wine/dlls/dplay/Wine-0_9_5/ Deleted: vendor/wine/dlls/dplayx/Wine-0_9_4/ Added: vendor/wine/dlls/dplayx/Wine-0_9_5/ Deleted: vendor/wine/dlls/dsound/Wine-0_9_4/ Added: vendor/wine/dlls/dsound/Wine-0_9_5/ Deleted: vendor/wine/dlls/dsound/Wine-0_9_5/buffer.c Added: vendor/wine/dlls/dsound/Wine-0_9_5/buffer.c Deleted: vendor/wine/dlls/dsound/Wine-0_9_5/capture.c Added: vendor/wine/dlls/dsound/Wine-0_9_5/capture.c Deleted: vendor/wine/dlls/dsound/Wine-0_9_5/dsound.c Added: vendor/wine/dlls/dsound/Wine-0_9_5/dsound.c Deleted: vendor/wine/dlls/dsound/Wine-0_9_5/dsound_private.h Added: vendor/wine/dlls/dsound/Wine-0_9_5/dsound_private.h Deleted: vendor/wine/dlls/dsound/Wine-0_9_5/primary.c Added: vendor/wine/dlls/dsound/Wine-0_9_5/primary.c Deleted: vendor/wine/dlls/dsound/Wine-0_9_5/propset.c Added: vendor/wine/dlls/dsound/Wine-0_9_5/propset.c Deleted: vendor/wine/dlls/dsound/Wine-0_9_5/sound3d.c Added: vendor/wine/dlls/dsound/Wine-0_9_5/sound3d.c Deleted: vendor/wine/dlls/dxdiagn/Wine-0_9_4/ Added: vendor/wine/dlls/dxdiagn/Wine-0_9_5/ Deleted: vendor/wine/dlls/icmp/Wine-0_9_4/ Added: vendor/wine/dlls/icmp/Wine-0_9_5/ Deleted: vendor/wine/dlls/imm32/Wine-0_9_4/ Added: vendor/wine/dlls/imm32/Wine-0_9_5/ Deleted: vendor/wine/dlls/midimap/Wine-0_9_4/ Added: vendor/wine/dlls/midimap/Wine-0_9_5/ Deleted: vendor/wine/dlls/mpr/Wine-0_9_4/ Added: vendor/wine/dlls/mpr/Wine-0_9_5/ Deleted: vendor/wine/dlls/msi/Wine-0_9_4/ Added: vendor/wine/dlls/msi/Wine-0_9_5/ Deleted: vendor/wine/dlls/msi/Wine-0_9_5/action.c Added: vendor/wine/dlls/msi/Wine-0_9_5/action.c Deleted: vendor/wine/dlls/msi/Wine-0_9_5/custom.c Added: vendor/wine/dlls/msi/Wine-0_9_5/custom.c Deleted: vendor/wine/dlls/msi/Wine-0_9_5/dialog.c Added: vendor/wine/dlls/msi/Wine-0_9_5/dialog.c Deleted: vendor/wine/dlls/msi/Wine-0_9_5/events.c Added: vendor/wine/dlls/msi/Wine-0_9_5/events.c Deleted: vendor/wine/dlls/msi/Wine-0_9_5/install.c Added: vendor/wine/dlls/msi/Wine-0_9_5/install.c Deleted: vendor/wine/dlls/msi/Wine-0_9_5/msi.c Added: vendor/wine/dlls/msi/Wine-0_9_5/msi.c Deleted: vendor/wine/dlls/msi/Wine-0_9_5/msi.spec Added: vendor/wine/dlls/msi/Wine-0_9_5/msi.spec Deleted: vendor/wine/dlls/msi/Wine-0_9_5/msipriv.h Added: vendor/wine/dlls/msi/Wine-0_9_5/msipriv.h Deleted: vendor/wine/dlls/msi/Wine-0_9_5/msiquery.c Added: vendor/wine/dlls/msi/Wine-0_9_5/msiquery.c Deleted: vendor/wine/dlls/msi/Wine-0_9_5/package.c Added: vendor/wine/dlls/msi/Wine-0_9_5/package.c Deleted: vendor/wine/dlls/msimg32/Wine-0_9_4/ Added: vendor/wine/dlls/msimg32/Wine-0_9_5/ Deleted: vendor/wine/dlls/netapi32/Wine-0_9_4/ Added: vendor/wine/dlls/netapi32/Wine-0_9_5/ Deleted: vendor/wine/dlls/objsel/Wine-0_9_4/ Added: vendor/wine/dlls/objsel/Wine-0_9_5/ Deleted: vendor/wine/dlls/ole32/Wine-0_9_4/ Added: vendor/wine/dlls/ole32/Wine-0_9_5/ Deleted: vendor/wine/dlls/ole32/Wine-0_9_5/hglobalstream.c Added: vendor/wine/dlls/ole32/Wine-0_9_5/hglobalstream.c Deleted: vendor/wine/dlls/ole32/Wine-0_9_5/stg_stream.c Added: vendor/wine/dlls/ole32/Wine-0_9_5/stg_stream.c Deleted: vendor/wine/dlls/oleacc/Wine-0_9_4/ Added: vendor/wine/dlls/oleacc/Wine-0_9_5/ Deleted: vendor/wine/dlls/oleaut32/Wine-0_9_4/ Added: vendor/wine/dlls/oleaut32/Wine-0_9_5/ Deleted: vendor/wine/dlls/oleaut32/Wine-0_9_5/typelib.c Added: vendor/wine/dlls/oleaut32/Wine-0_9_5/typelib.c Deleted: vendor/wine/dlls/oledlg/Wine-0_9_4/ Added: vendor/wine/dlls/oledlg/Wine-0_9_5/ Deleted: vendor/wine/dlls/olepro32/Wine-0_9_4/ Added: vendor/wine/dlls/olepro32/Wine-0_9_5/ Deleted: vendor/wine/dlls/riched20/Wine-0_9_4/ Added: vendor/wine/dlls/riched20/Wine-0_9_5/ [truncated at 100 lines; 88 more skipped] _____ Copied: vendor/wine/dlls/avifil32/Wine-0_9_5 (from rev 20612, vendor/wine/dlls/avifil32/current) _____ Copied: vendor/wine/dlls/cabinet/Wine-0_9_5 (from rev 20612, vendor/wine/dlls/cabinet/current) _____ Copied: vendor/wine/dlls/comctl32/Wine-0_9_5 (from rev 20612, vendor/wine/dlls/comctl32/current) _____ Deleted: vendor/wine/dlls/comctl32/Wine-0_9_5/comctl32undoc.c --- vendor/wine/dlls/comctl32/current/comctl32undoc.c 2006-01-06 15:42:12 UTC (rev 20612) +++ vendor/wine/dlls/comctl32/Wine-0_9_5/comctl32undoc.c 2006-01-06 20:49:27 UTC (rev 20629) @@ -1,1245 +0,0 @@ -/* - * Undocumented functions from COMCTL32.DLL - * - * Copyright 1998 Eric Kohl - * 1998 Juergen Schmied <j.schmied(a)metronet.de> - * 2000 Eric Kohl for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * NOTES - * All of these functions are UNDOCUMENTED!! And I mean UNDOCUMENTED!!!! - * Do NOT rely on names or contents of undocumented structures and types!!! - * These functions are used by EXPLORER.EXE, IEXPLORE.EXE and - * COMCTL32.DLL (internally). - * - */ -#include "config.h" -#include "wine/port.h" - -#include <stdarg.h> -#include <string.h> -#include <ctype.h> -#include <limits.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "winreg.h" -#include "commctrl.h" -#include "objbase.h" -#include "winerror.h" - -#include "wine/unicode.h" -#include "comctl32.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(commctrl); - -static const WCHAR strMRUList[] = { 'M','R','U','L','i','s','t',0 }; - -/********************************************************************** **** - * Alloc [COMCTL32.71] - * - * Allocates memory block from the dll's private heap - * - * PARAMS - * dwSize [I] size of the allocated memory block - * - * RETURNS - * Success: pointer to allocated memory block - * Failure: NULL - */ -LPVOID WINAPI Alloc (DWORD dwSize) -{ - return LocalAlloc( LMEM_ZEROINIT, dwSize ); -} - - -/********************************************************************** **** - * ReAlloc [COMCTL32.72] - * - * Changes the size of an allocated memory block or allocates a memory - * block using the dll's private heap. - * - * PARAMS - * lpSrc [I] pointer to memory block which will be resized - * dwSize [I] new size of the memory block. - * - * RETURNS - * Success: pointer to the resized memory block - * Failure: NULL - * - * NOTES - * If lpSrc is a NULL-pointer, then ReAlloc allocates a memory - * block like Alloc. - */ -LPVOID WINAPI ReAlloc (LPVOID lpSrc, DWORD dwSize) -{ - if (lpSrc) - return LocalReAlloc( lpSrc, dwSize, LMEM_ZEROINIT ); - else - return LocalAlloc( LMEM_ZEROINIT, dwSize); -} - - -/********************************************************************** **** - * Free [COMCTL32.73] - * - * Frees an allocated memory block from the dll's private heap. - * - * PARAMS - * lpMem [I] pointer to memory block which will be freed - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ -BOOL WINAPI Free (LPVOID lpMem) -{ - return !LocalFree( lpMem ); -} - - -/********************************************************************** **** - * GetSize [COMCTL32.74] - * - * Retrieves the size of the specified memory block from the dll's - * private heap. - * - * PARAMS - * lpMem [I] pointer to an allocated memory block - * - * RETURNS - * Success: size of the specified memory block - * Failure: 0 - */ -DWORD WINAPI GetSize (LPVOID lpMem) -{ - return LocalSize( lpMem ); -} - - -/********************************************************************** **** - * MRU-Functions {COMCTL32} - * - * NOTES - * The MRU-Api is a set of functions to manipulate lists of M.R.U. (Most Recently - * Used) items. It is an undocumented Api that is used (at least) by the shell - * and explorer to implement their recent documents feature. - * - * Since these functions are undocumented, they are unsupported by MS and - * may change at any time. - * - * Internally, the list is implemented as a last in, last out list of items - * persisted into the system registry under a caller chosen key. Each list - * item is given a one character identifier in the Ascii range from 'a' to - * '}'. A list of the identifiers in order from newest to oldest is stored - * under the same key in a value named "MRUList". - * - * Items are re-ordered by changing the order of the values in the MRUList - * value. When a new item is added, it becomes the new value of the oldest - * identifier, and that identifier is moved to the front of the MRUList value. - * - * Wine stores MRU-lists in the same registry format as Windows, so when - * switching between the builtin and native comctl32.dll no problems or - * incompatibilities should occur. - * - * The following undocumented structure is used to create an MRU-list: - *|typedef INT (CALLBACK *MRUStringCmpFn)(LPCTSTR lhs, LPCTSTR rhs); - *|typedef INT (CALLBACK *MRUBinaryCmpFn)(LPCVOID lhs, LPCVOID rhs, DWORD length); - *| - *|typedef struct tagCREATEMRULIST - *|{ - *| DWORD cbSize; - *| DWORD nMaxItems; - *| DWORD dwFlags; - *| HKEY hKey; - *| LPCTSTR lpszSubKey; - *| PROC lpfnCompare; - *|} CREATEMRULIST, *LPCREATEMRULIST; - * - * MEMBERS - * cbSize [I] The size of the CREATEMRULIST structure. This must be set - * to sizeof(CREATEMRULIST) by the caller. - * nMaxItems [I] The maximum number of items allowed in the list. Because - * of the limited number of identifiers, this should be set to - * a value from 1 to 30 by the caller. - * dwFlags [I] If bit 0 is set, the list will be used to store binary - * data, otherwise it is assumed to store strings. If bit 1 - * is set, every change made to the list will be reflected in - * the registry immediately, otherwise changes will only be - * written when the list is closed. - * hKey [I] The registry key that the list should be written under. - * This must be supplied by the caller. - * lpszSubKey [I] A caller supplied name of a subkey under hKey to write - * the list to. This may not be blank. - * lpfnCompare [I] A caller supplied comparison function, which may be either - * an MRUStringCmpFn if dwFlags does not have bit 0 set, or a - * MRUBinaryCmpFn otherwise. - * - * FUNCTIONS - * - Create an MRU-list with CreateMRUList() or CreateMRUListLazy(). - * - Add items to an MRU-list with AddMRUString() or AddMRUData(). - * - Remove items from an MRU-list with DelMRUString(). - * - Find data in an MRU-list with FindMRUString() or FindMRUData(). - * - Iterate through an MRU-list with EnumMRUList(). - * - Free an MRU-list with FreeMRUList(). - */ - -typedef struct tagCREATEMRULISTA -{ - DWORD cbSize; - DWORD nMaxItems; - DWORD dwFlags; - HKEY hKey; - LPCSTR lpszSubKey; - PROC lpfnCompare; -} CREATEMRULISTA, *LPCREATEMRULISTA; - -typedef struct tagCREATEMRULISTW -{ - DWORD cbSize; - DWORD nMaxItems; - DWORD dwFlags; - HKEY hKey; - LPCWSTR lpszSubKey; - PROC lpfnCompare; -} CREATEMRULISTW, *LPCREATEMRULISTW; - -/* dwFlags */ -#define MRUF_STRING_LIST 0 /* list will contain strings */ -#define MRUF_BINARY_LIST 1 /* list will contain binary data */ -#define MRUF_DELAYED_SAVE 2 /* only save list order to reg. is FreeMRUList */ - -/* If list is a string list lpfnCompare has the following prototype - * int CALLBACK MRUCompareString(LPCSTR s1, LPCSTR s2) - * for binary lists the prototype is - * int CALLBACK MRUCompareBinary(LPCVOID data1, LPCVOID data2, DWORD cbData) - * where cbData is the no. of bytes to compare. - * Need to check what return value means identical - 0? - */ - -typedef struct tagWINEMRUITEM -{ - DWORD size; /* size of data stored */ - DWORD itemFlag; /* flags */ - BYTE datastart; -} WINEMRUITEM, *LPWINEMRUITEM; - -/* itemFlag */ -#define WMRUIF_CHANGED 0x0001 /* this dataitem changed */ - -typedef struct tagWINEMRULIST -{ - CREATEMRULISTW extview; /* original create information */ - BOOL isUnicode; /* is compare fn Unicode */ - DWORD wineFlags; /* internal flags */ - DWORD cursize; /* current size of realMRU */ - LPWSTR realMRU; /* pointer to string of index names */ - LPWINEMRUITEM *array; /* array of pointers to data */ - /* in 'a' to 'z' order */ -} WINEMRULIST, *LPWINEMRULIST; - -/* wineFlags */ -#define WMRUF_CHANGED 0x0001 /* MRU list has changed */ - -/********************************************************************** **** - * MRU_SaveChanged (internal) - * - * Local MRU saving code - */ -static void MRU_SaveChanged ( LPWINEMRULIST mp ) -{ - UINT i, err; - HKEY newkey; - WCHAR realname[2]; - LPWINEMRUITEM witem; - - /* or should we do the following instead of RegOpenKeyEx: - */ - - /* open the sub key */ - if ((err = RegOpenKeyExW( mp->extview.hKey, mp->extview.lpszSubKey, - 0, KEY_WRITE, &newkey))) { - /* not present - what to do ??? */ - ERR("Could not open key, error=%d, attempting to create\n", - err); - if ((err = RegCreateKeyExW( mp->extview.hKey, mp->extview.lpszSubKey, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_READ | KEY_WRITE, - 0, - &newkey, - 0))) { - ERR("failed to create key /%s/, err=%d\n", - debugstr_w(mp->extview.lpszSubKey), err); - return; - } - } - if (mp->wineFlags & WMRUF_CHANGED) { - mp->wineFlags &= ~WMRUF_CHANGED; - err = RegSetValueExW(newkey, strMRUList, 0, REG_SZ, (LPBYTE)mp->realMRU, - (strlenW(mp->realMRU) + 1)*sizeof(WCHAR)); - if (err) { - ERR("error saving MRUList, err=%d\n", err); - } - TRACE("saving MRUList=/%s/\n", debugstr_w(mp->realMRU)); - } - realname[1] = 0; - for(i=0; i<mp->cursize; i++) { - witem = mp->array[i]; - if (witem->itemFlag & WMRUIF_CHANGED) { - witem->itemFlag &= ~WMRUIF_CHANGED; - realname[0] = 'a' + i; - err = RegSetValueExW(newkey, realname, 0, - (mp->extview.dwFlags & MRUF_BINARY_LIST) ? - REG_BINARY : REG_SZ, - &witem->datastart, witem->size); - if (err) { - ERR("error saving /%s/, err=%d\n", debugstr_w(realname), err); - } - TRACE("saving value for name /%s/ size=%ld\n", - debugstr_w(realname), witem->size); - } - } - RegCloseKey( newkey ); -} - -/********************************************************************** **** - * FreeMRUList [COMCTL32.152] - * - * Frees a most-recently-used items list. - * - * PARAMS - * hMRUList [I] Handle to list. - * - * RETURNS - * Nothing. - */ -void WINAPI FreeMRUList (HANDLE hMRUList) -{ - LPWINEMRULIST mp = (LPWINEMRULIST)hMRUList; - UINT i; - - TRACE("(%p)\n", hMRUList); - if (!hMRUList) - return; - - if (mp->wineFlags & WMRUF_CHANGED) { - /* need to open key and then save the info */ - MRU_SaveChanged( mp ); - } - - for(i=0; i<mp->extview.nMaxItems; i++) { - if (mp->array[i]) - Free(mp->array[i]); - } - Free(mp->realMRU); - Free(mp->array); - Free((LPWSTR)mp->extview.lpszSubKey); - Free(mp); -} - - -/********************************************************************** **** - * FindMRUData [COMCTL32.169] - * - * Searches binary list for item that matches lpData of length cbData. - * Returns position in list order 0 -> MRU and if lpRegNum != NULL then value - * corresponding to item's reg. name will be stored in it ('a' -> 0). - * - * PARAMS - * hList [I] list handle - * lpData [I] data to find - * cbData [I] length of data - * lpRegNum [O] position in registry (maybe NULL) - * - * RETURNS - * Position in list 0 -> MRU. -1 if item not found. - */ -INT WINAPI FindMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData, - LPINT lpRegNum) -{ - LPWINEMRULIST mp = (LPWINEMRULIST)hList; - INT ret; - UINT i; - LPSTR dataA = NULL; - - if (!mp->extview.lpfnCompare) { - ERR("MRU list not properly created. No compare procedure.\n"); - return -1; - } - - if(!(mp->extview.dwFlags & MRUF_BINARY_LIST) && !mp->isUnicode) { - DWORD len = WideCharToMultiByte(CP_ACP, 0, lpData, -1, - NULL, 0, NULL, NULL); - dataA = Alloc(len); - WideCharToMultiByte(CP_ACP, 0, lpData, -1, dataA, len, NULL, NULL); - } - - for(i=0; i<mp->cursize; i++) { - if (mp->extview.dwFlags & MRUF_BINARY_LIST) { - if (!mp->extview.lpfnCompare(lpData, &mp->array[i]->datastart, - cbData)) - break; - } - else { - if(mp->isUnicode) { - if (!mp->extview.lpfnCompare(lpData, &mp->array[i]->datastart)) - break; - } else { - DWORD len = WideCharToMultiByte(CP_ACP, 0, - (LPWSTR)&mp->array[i]->datastart, -1, - NULL, 0, NULL, NULL); - LPSTR itemA = Alloc(len); - INT cmp; - WideCharToMultiByte(CP_ACP, 0, (LPWSTR)&mp->array[i]->datastart, -1, - itemA, len, NULL, NULL); - - cmp = mp->extview.lpfnCompare(dataA, itemA); - Free(itemA); - if(!cmp) - break; - } - } - } - if(dataA) - Free(dataA); - if (i < mp->cursize) - ret = i; - else - ret = -1; - if (lpRegNum && (ret != -1)) - *lpRegNum = 'a' + i; - - TRACE("(%p, %p, %ld, %p) returning %d\n", - hList, lpData, cbData, lpRegNum, ret); - - return ret; -} - - -/********************************************************************** **** - * AddMRUData [COMCTL32.167] - * - * Add item to MRU binary list. If item already exists in list then it is - * simply moved up to the top of the list and not added again. If list is - * full then the least recently used item is removed to make room. - * - * PARAMS - * hList [I] Handle to list. - * lpData [I] ptr to data to add. - * cbData [I] no. of bytes of data. - * - * RETURNS - * No. corresponding to registry name where value is stored 'a' -> 0 etc. - * -1 on error. - */ -INT WINAPI AddMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData) -{ - LPWINEMRULIST mp = (LPWINEMRULIST)hList; - LPWINEMRUITEM witem; - INT i, replace; - - if ((replace = FindMRUData (hList, lpData, cbData, NULL)) >= 0) { - /* Item exists, just move it to the front */ - LPWSTR pos = strchrW(mp->realMRU, replace + 'a'); - while (pos > mp->realMRU) - { - pos[0] = pos[-1]; - pos--; - } - } - else { - /* either add a new entry or replace oldest */ - if (mp->cursize < mp->extview.nMaxItems) { - /* Add in a new item */ - replace = mp->cursize; - mp->cursize++; - } - else { - /* get the oldest entry and replace data */ - replace = mp->realMRU[mp->cursize - 1] - 'a'; - Free(mp->array[replace]); - } - - /* Allocate space for new item and move in the data */ - mp->array[replace] = witem = Alloc(cbData + sizeof(WINEMRUITEM)); - witem->itemFlag |= WMRUIF_CHANGED; - witem->size = cbData; - memcpy( &witem->datastart, lpData, cbData); - - /* now rotate MRU list */ - for(i=mp->cursize-1; i>=1; i--) - mp->realMRU[i] = mp->realMRU[i-1]; - } - - /* The new item gets the front spot */ - mp->wineFlags |= WMRUF_CHANGED; - mp->realMRU[0] = replace + 'a'; - - TRACE("(%p, %p, %ld) adding data, /%c/ now most current\n", - hList, lpData, cbData, replace+'a'); - - if (!(mp->extview.dwFlags & MRUF_DELAYED_SAVE)) { - /* save changed stuff right now */ - MRU_SaveChanged( mp ); - } - - return replace; -} - -/********************************************************************** **** - * AddMRUStringW [COMCTL32.401] - * - * Add an item to an MRU string list. - * - * PARAMS - * hList [I] Handle to list. - * lpszString [I] The string to add. - * - * RETURNS - * Success: The number corresponding to the registry name where the string - * has been stored (0 maps to 'a', 1 to 'b' and so on). - * Failure: -1, if hList is NULL or memory allocation fails. If lpszString - * is invalid, the function returns 0, and GetLastError() returns - * ERROR_INVALID_PARAMETER. The last error value is set only in - * this case. - * - * NOTES - * -If lpszString exists in the list already, it is moved to the top of the - * MRU list (it is not duplicated). - * -If the list is full the least recently used list entry is replaced with - * lpszString. - * -If this function returns 0 you should check the last error value to - * ensure the call really succeeded. - */ -INT WINAPI AddMRUStringW(HANDLE hList, LPCWSTR lpszString) -{ - TRACE("(%p,%s)\n", hList, debugstr_w(lpszString)); - - if (!hList) - return -1; - - if (!lpszString || IsBadStringPtrW(lpszString, -1)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - return AddMRUData(hList, lpszString, - (strlenW(lpszString) + 1) * sizeof(WCHAR)); -} - -/********************************************************************** **** - * AddMRUStringA [COMCTL32.153] - * - * See AddMRUStringW. - */ -INT WINAPI AddMRUStringA(HANDLE hList, LPCSTR lpszString) -{ - DWORD len; - LPWSTR stringW; - INT ret; - - TRACE("(%p,%s)\n", hList, debugstr_a(lpszString)); - - if (!hList) - return -1; - - if (IsBadStringPtrA(lpszString, -1)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - len = MultiByteToWideChar(CP_ACP, 0, lpszString, -1, NULL, 0) * sizeof(WCHAR); - stringW = Alloc(len); - if (!stringW) - return -1; - - MultiByteToWideChar(CP_ACP, 0, lpszString, -1, stringW, len/sizeof(WCHAR)); - ret = AddMRUData(hList, stringW, len); - Free(stringW); - return ret; -} - -/********************************************************************** **** - * DelMRUString [COMCTL32.156] - * - * Removes item from either string or binary list (despite its name) - * - * PARAMS - * hList [I] list handle - * nItemPos [I] item position to remove 0 -> MRU - * - * RETURNS - * TRUE if successful, FALSE if nItemPos is out of range. - */ -BOOL WINAPI DelMRUString(HANDLE hList, INT nItemPos) -{ - FIXME("(%p, %d): stub\n", hList, nItemPos); - return TRUE; -} - -/********************************************************************** **** - * FindMRUStringW [COMCTL32.402] - * - * See FindMRUStringA. - */ -INT WINAPI FindMRUStringW (HANDLE hList, LPCWSTR lpszString, LPINT lpRegNum) -{ - return FindMRUData(hList, lpszString, - (lstrlenW(lpszString) + 1) * sizeof(WCHAR), lpRegNum); -} - -/********************************************************************** **** - * FindMRUStringA [COMCTL32.155] - * - * Searches string list for item that matches lpszString. - * Returns position in list order 0 -> MRU and if lpRegNum != NULL then value - * corresponding to item's reg. name will be stored in it ('a' -> 0). - * - * PARAMS - * hList [I] list handle - * lpszString [I] string to find - * lpRegNum [O] position in registry (maybe NULL) - * - * RETURNS - * Position in list 0 -> MRU. -1 if item not found. - */ -INT WINAPI FindMRUStringA (HANDLE hList, LPCSTR lpszString, LPINT lpRegNum) -{ - DWORD len = MultiByteToWideChar(CP_ACP, 0, lpszString, -1, NULL, 0); - LPWSTR stringW = Alloc(len * sizeof(WCHAR)); - INT ret; - - MultiByteToWideChar(CP_ACP, 0, lpszString, -1, stringW, len); - ret = FindMRUData(hList, stringW, len * sizeof(WCHAR), lpRegNum); - Free(stringW); - return ret; -} - -/********************************************************************** *** - * CreateMRUListLazy_common (internal) - */ -static HANDLE CreateMRUListLazy_common(LPWINEMRULIST mp) -{ - UINT i, err; - HKEY newkey; - DWORD datasize, dwdisp; - WCHAR realname[2]; - LPWINEMRUITEM witem; - DWORD type; - - /* get space to save indices that will turn into names - * but in order of most to least recently used - */ - mp->realMRU = Alloc((mp->extview.nMaxItems + 2) * sizeof(WCHAR)); - - /* get space to save pointers to actual data in order of - * 'a' to 'z' (0 to n). - */ - mp->array = Alloc(mp->extview.nMaxItems * sizeof(LPVOID)); - - /* open the sub key */ - if ((err = RegCreateKeyExW( mp->extview.hKey, mp->extview.lpszSubKey, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_READ | KEY_WRITE, - 0, - &newkey, - &dwdisp))) { - /* error - what to do ??? */ - ERR("(%lu %lu %lx %p %s %p): Could not open key, error=%d\n", - mp->extview.cbSize, mp->extview.nMaxItems, mp->extview.dwFlags, - mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey), - mp->extview.lpfnCompare, err); - return 0; - } - - /* get values from key 'MRUList' */ - if (newkey) { - datasize = (mp->extview.nMaxItems + 1) * sizeof(WCHAR); - if((err=RegQueryValueExW( newkey, strMRUList, 0, &type, - (LPBYTE)mp->realMRU, &datasize))) { - /* not present - set size to 1 (will become 0 later) */ - datasize = 1; - *mp->realMRU = 0; - } - else - datasize /= sizeof(WCHAR); - - TRACE("MRU list = %s, datasize = %ld\n", debugstr_w(mp->realMRU), datasize); - - mp->cursize = datasize - 1; - /* datasize now has number of items in the MRUList */ - - /* get actual values for each entry */ - realname[1] = 0; - for(i=0; i<mp->cursize; i++) { - realname[0] = 'a' + i; - if(RegQueryValueExW( newkey, realname, 0, &type, 0, &datasize)) { - /* not present - what to do ??? */ - ERR("Key %s not found 1\n", debugstr_w(realname)); - } - mp->array[i] = witem = Alloc(datasize + sizeof(WINEMRUITEM)); - witem->size = datasize; - if(RegQueryValueExW( newkey, realname, 0, &type, - &witem->datastart, &datasize)) { - /* not present - what to do ??? */ - ERR("Key %s not found 2\n", debugstr_w(realname)); - } - } - RegCloseKey( newkey ); - } - else - mp->cursize = 0; - - TRACE("(%lu %lu %lx %p %s %p): Current Size = %ld\n", - mp->extview.cbSize, mp->extview.nMaxItems, mp->extview.dwFlags, - mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey), - mp->extview.lpfnCompare, mp->cursize); - return (HANDLE)mp; -} - -/********************************************************************** **** - * CreateMRUListLazyW [COMCTL32.404] - * - * See CreateMRUListLazyA. - */ -HANDLE WINAPI CreateMRUListLazyW (LPCREATEMRULISTW lpcml, DWORD dwParam2, - DWORD dwParam3, DWORD dwParam4) -{ - LPWINEMRULIST mp; - - /* Native does not check for a NULL lpcml */ - - if (lpcml->cbSize != sizeof(CREATEMRULISTW) || !lpcml->hKey || - IsBadStringPtrW(lpcml->lpszSubKey, -1)) - return NULL; - - mp = Alloc(sizeof(WINEMRULIST)); - memcpy(&mp->extview, lpcml, sizeof(CREATEMRULISTW)); - mp->extview.lpszSubKey = Alloc((strlenW(lpcml->lpszSubKey) + 1) * sizeof(WCHAR)); - strcpyW((LPWSTR)mp->extview.lpszSubKey, lpcml->lpszSubKey); - mp->isUnicode = TRUE; - - return CreateMRUListLazy_common(mp); -} - -/********************************************************************** **** - * CreateMRUListLazyA [COMCTL32.157] - * - * Creates a most-recently-used list. - * - * PARAMS - * lpcml [I] ptr to CREATEMRULIST structure. - * dwParam2 [I] Unknown - * dwParam3 [I] Unknown - * dwParam4 [I] Unknown - * - * RETURNS - * Handle to MRU list. - */ -HANDLE WINAPI CreateMRUListLazyA (LPCREATEMRULISTA lpcml, DWORD dwParam2, - DWORD dwParam3, DWORD dwParam4) -{ - LPWINEMRULIST mp; - DWORD len; - - /* Native does not check for a NULL lpcml */ - - if (lpcml->cbSize != sizeof(CREATEMRULISTA) || !lpcml->hKey || - IsBadStringPtrA(lpcml->lpszSubKey, -1)) - return 0; - - mp = Alloc(sizeof(WINEMRULIST)); - memcpy(&mp->extview, lpcml, sizeof(CREATEMRULISTW)); - len = MultiByteToWideChar(CP_ACP, 0, lpcml->lpszSubKey, -1, NULL, 0); - mp->extview.lpszSubKey = Alloc(len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, lpcml->lpszSubKey, -1, - (LPWSTR)mp->extview.lpszSubKey, len); - mp->isUnicode = FALSE; - return CreateMRUListLazy_common(mp); -} - -/********************************************************************** **** - * CreateMRUListW [COMCTL32.400] - * - * See CreateMRUListA. - */ -HANDLE WINAPI CreateMRUListW (LPCREATEMRULISTW lpcml) -{ - return CreateMRUListLazyW(lpcml, 0, 0, 0); -} - -/********************************************************************** **** - * CreateMRUListA [COMCTL32.151] - * - * Creates a most-recently-used list. - * - * PARAMS - * lpcml [I] ptr to CREATEMRULIST structure. - * - * RETURNS - * Handle to MRU list. - */ -HANDLE WINAPI CreateMRUListA (LPCREATEMRULISTA lpcml) -{ - return CreateMRUListLazyA (lpcml, 0, 0, 0); -} - - -/********************************************************************** **** - * EnumMRUListW [COMCTL32.403] - * - * Enumerate item in a most-recenty-used list - * - * PARAMS - * hList [I] list handle - * nItemPos [I] item position to enumerate - * lpBuffer [O] buffer to receive item - * nBufferSize [I] size of buffer - * - * RETURNS - * For binary lists specifies how many bytes were copied to buffer, for - * string lists specifies full length of string. Enumerating past the end - * of list returns -1. - * If lpBuffer == NULL or nItemPos is -ve return value is no. of items in - * the list. - */ -INT WINAPI EnumMRUListW (HANDLE hList, INT nItemPos, LPVOID lpBuffer, - DWORD nBufferSize) -{ - LPWINEMRULIST mp = (LPWINEMRULIST) hList; - LPWINEMRUITEM witem; - INT desired, datasize; - - if (nItemPos >= mp->cursize) return -1; - if ((nItemPos < 0) || !lpBuffer) return mp->cursize; - desired = mp->realMRU[nItemPos]; - desired -= 'a'; - TRACE("nItemPos=%d, desired=%d\n", nItemPos, desired); - witem = mp->array[desired]; - datasize = min( witem->size, nBufferSize ); - memcpy( lpBuffer, &witem->datastart, datasize); - TRACE("(%p, %d, %p, %ld): returning len=%d\n", - hList, nItemPos, lpBuffer, nBufferSize, datasize); - return datasize; -} - -/********************************************************************** **** - * EnumMRUListA [COMCTL32.154] - * - * See EnumMRUListW. - */ -INT WINAPI EnumMRUListA (HANDLE hList, INT nItemPos, LPVOID lpBuffer, - DWORD nBufferSize) -{ - LPWINEMRULIST mp = (LPWINEMRULIST) hList; - LPWINEMRUITEM witem; - INT desired, datasize; - DWORD lenA; - - if (nItemPos >= mp->cursize) return -1; - if ((nItemPos < 0) || !lpBuffer) return mp->cursize; - desired = mp->realMRU[nItemPos]; - desired -= 'a'; - TRACE("nItemPos=%d, desired=%d\n", nItemPos, desired); - witem = mp->array[desired]; - if(mp->extview.dwFlags & MRUF_BINARY_LIST) { - datasize = min( witem->size, nBufferSize ); - memcpy( lpBuffer, &witem->datastart, datasize); - } else { - lenA = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)&witem->datastart, -1, - NULL, 0, NULL, NULL); - datasize = min( witem->size, nBufferSize ); - WideCharToMultiByte(CP_ACP, 0, (LPWSTR)&witem->datastart, -1, - lpBuffer, datasize, NULL, NULL); - } - TRACE("(%p, %d, %p, %ld): returning len=%d\n", - hList, nItemPos, lpBuffer, nBufferSize, datasize); - return datasize; -} - - -/********************************************************************** **** - * Str_GetPtrA [COMCTL32.233] - * - * Copies a string into a destination buffer. - * - * PARAMS - * lpSrc [I] Source string - * lpDest [O] Destination buffer - * nMaxLen [I] Size of buffer in characters - * - * RETURNS - * The number of characters copied. - */ -INT WINAPI Str_GetPtrA (LPCSTR lpSrc, LPSTR lpDest, INT nMaxLen) -{ - INT len; - - TRACE("(%p %p %d)\n", lpSrc, lpDest, nMaxLen); - - if (!lpDest && lpSrc) - return strlen (lpSrc); - - if (nMaxLen == 0) - return 0; - - if (lpSrc == NULL) { - lpDest[0] = '\0'; - return 0; - } - - len = strlen (lpSrc); - if (len >= nMaxLen) - len = nMaxLen - 1; - - RtlMoveMemory (lpDest, lpSrc, len); - lpDest[len] = '\0'; - - return len; -} - - -/********************************************************************** **** - * Str_SetPtrA [COMCTL32.234] - * - * Makes a copy of a string, allocating memory if necessary. - * - * PARAMS - * lppDest [O] Pointer to destination string - * lpSrc [I] Source string - * - * RETURNS - * Success: TRUE - * Failure: FALSE - * - * NOTES - * Set lpSrc to NULL to free the memory allocated by a previous call - * to this function. - */ -BOOL WINAPI Str_SetPtrA (LPSTR *lppDest, LPCSTR lpSrc) -{ - TRACE("(%p %p)\n", lppDest, lpSrc); - - if (lpSrc) { - LPSTR ptr = ReAlloc (*lppDest, strlen (lpSrc) + 1); - if (!ptr) - return FALSE; - strcpy (ptr, lpSrc); - *lppDest = ptr; - } - else { - if (*lppDest) { - Free (*lppDest); - *lppDest = NULL; - } - } - - return TRUE; -} - - -/********************************************************************** **** - * Str_GetPtrW [COMCTL32.235] - * - * See Str_GetPtrA. - */ -INT WINAPI Str_GetPtrW (LPCWSTR lpSrc, LPWSTR lpDest, INT nMaxLen) -{ - INT len; - - TRACE("(%p %p %d)\n", lpSrc, lpDest, nMaxLen); - - if (!lpDest && lpSrc) - return strlenW (lpSrc); - - if (nMaxLen == 0) - return 0; - - if (lpSrc == NULL) { - lpDest[0] = L'\0'; - return 0; - } - - len = strlenW (lpSrc); - if (len >= nMaxLen) [truncated at 1000 lines; 72822 more skipped]

18 years, 8 months

[gvg] 20628: Sync to Wine-0_9_5:

by gvg＠svn.reactos.org

Sync to Wine-0_9_5: Mike McCormack <mike(a)codeweavers.com> - msiexec: Ignore the TRANSFORMS variable. Ignore the TRANSFORMS variable when building a list of transforms for advertising. The variable is used to apply transforms when installing. Modified: trunk/reactos/subsys/system/msiexec/msiexec.c _____ Modified: trunk/reactos/subsys/system/msiexec/msiexec.c --- trunk/reactos/subsys/system/msiexec/msiexec.c 2006-01-06 20:42:46 UTC (rev 20627) +++ trunk/reactos/subsys/system/msiexec/msiexec.c 2006-01-06 20:44:09 UTC (rev 20628) @@ -452,7 +452,6 @@ DWORD RepairMode = 0; DWORD AdvertiseMode = 0; - LPWSTR Transforms = NULL; struct string_list *transform_list = NULL; LANGID Language = 0; @@ -658,10 +657,6 @@ WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); StringListAppend(&transform_list, argvW[i]); } - else if(!msi_strprefix(argvW[i], "TRANSFORMS=")) - { - StringListAppend(&transform_list, argvW[i]+11); - } else if(!msi_strequal(argvW[i], "/g")) { i++; @@ -858,7 +853,6 @@ MsiSetInternalUI(InstallUILevel, NULL); Properties = build_properties( property_list ); - Transforms = build_transforms( transform_list ); if(FunctionInstallAdmin && FunctionPatch) FunctionInstall = FALSE; @@ -880,6 +874,7 @@ } else if(FunctionAdvertise) { + LPWSTR Transforms = build_transforms( property_list ); ReturnCode = MsiAdvertiseProductW(PackageName, (LPWSTR) AdvertiseMode, Transforms, Language); } else if(FunctionPatch)

18 years, 8 months

[gvg] 20627: Sync to Wine-0_9_5:

by gvg＠svn.reactos.org

Sync to Wine-0_9_5: Jacek Caban <jacek(a)codeweavers.com> - urlmon: URL with two slashes is valid. - urlmon: Added GetSecurityId implementation. - urlmon: Removed not used code. - urlmon: Use pluggable protocol for file protocol. Rolf Kalbermatter <rolf.kalbermatter(a)citeng.com> - urlmon: Implement BindAsyncMoniker function. Modified: trunk/reactos/lib/urlmon/binding.c Modified: trunk/reactos/lib/urlmon/file.c Modified: trunk/reactos/lib/urlmon/sec_mgr.c Modified: trunk/reactos/lib/urlmon/umon.c Modified: trunk/reactos/lib/urlmon/urlmon.spec _____ Modified: trunk/reactos/lib/urlmon/binding.c --- trunk/reactos/lib/urlmon/binding.c 2006-01-06 20:35:12 UTC (rev 20626) +++ trunk/reactos/lib/urlmon/binding.c 2006-01-06 20:42:46 UTC (rev 20627) @@ -225,6 +225,16 @@ memcpy(This->mime, szStatusText, len*sizeof(WCHAR)); break; } + case BINDSTATUS_SENDINGREQUEST: + IBindStatusCallback_OnProgress(This->callback, 0, 0, BINDSTATUS_SENDINGREQUEST, + szStatusText); + break; + case BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE: + IBindStatusCallback_OnProgress(This->callback, 0, 0, + BINDSTATUS_MIMETYPEAVAILABLE, szStatusText); + break; + case BINDSTATUS_CACHEFILENAMEAVAILABLE: + break; default: FIXME("Unhandled status code %ld\n", ulStatusCode); return E_NOTIMPL; @@ -438,6 +448,8 @@ int len; HRESULT hres; + static const WCHAR wszFile[] = {'f','i','l','e',':'}; + if(!IsEqualGUID(&IID_IStream, riid)) { FIXME("Unsupported riid %s\n", debugstr_guid(riid)); return E_NOTIMPL; @@ -483,9 +495,13 @@ return hres; } - ret->bindf |= (BINDF_FROMURLMON|BINDF_NEEDFILE); + ret->bindf |= BINDF_FROMURLMON; len = strlenW(url)+1; + + if(len < sizeof(wszFile)/sizeof(WCHAR) || memcmp(wszFile, url, sizeof(wszFile))) + ret->bindf |= BINDF_NEEDFILE; + ret->url = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); memcpy(ret->url, url, len*sizeof(WCHAR)); _____ Modified: trunk/reactos/lib/urlmon/file.c --- trunk/reactos/lib/urlmon/file.c 2006-01-06 20:35:12 UTC (rev 20626) +++ trunk/reactos/lib/urlmon/file.c 2006-01-06 20:42:46 UTC (rev 20627) @@ -145,8 +145,10 @@ IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, &null_char); file_name = url+sizeof(wszFile)/sizeof(WCHAR); - if(file_name[0] == '/' && file_name[1] == '/' && file_name[2] == '/') - file_name += 3; + if(file_name[0] == '/' && file_name[1] == '/') + file_name += 2; + if(*file_name == '/') + file_name++; This->file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); _____ Modified: trunk/reactos/lib/urlmon/sec_mgr.c --- trunk/reactos/lib/urlmon/sec_mgr.c 2006-01-06 20:35:12 UTC (rev 20626) +++ trunk/reactos/lib/urlmon/sec_mgr.c 2006-01-06 20:42:46 UTC (rev 20627) @@ -109,7 +109,7 @@ size = sizeof(DWORD); res = RegQueryValueExW(hkey, schema, NULL, NULL, (PBYTE)zone, &size); if(res == ERROR_SUCCESS) - return S_OK; + return S_OK; *zone = 3; return S_OK; @@ -268,16 +268,18 @@ } static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManager *iface, - LPCWSTR pwszUrl, - BYTE *pbSecurityId, DWORD *pcbSecurityId, - DWORD_PTR dwReserved) + LPCWSTR pwszUrl, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved) { SecManagerImpl *This = SECMGR_THIS(iface); + LPWSTR buf, ptr, ptr2; + DWORD size, zone, len; HRESULT hres; - TRACE("(%p)->(%s %p %p %08lx)\n", iface, debugstr_w(pwszUrl), pbSecurityId, pcbSecurityId, - dwReserved); + static const WCHAR wszFile[] = {'f','i','l','e',':'}; + TRACE("(%p)->(%s %p %p %08lx)\n", iface, debugstr_w(pwszUrl), pbSecurityId, + pcbSecurityId, dwReserved); + if(This->custom_manager) { hres = IInternetSecurityManager_GetSecurityId(This->custom_manager, pwszUrl, pbSecurityId, pcbSecurityId, dwReserved); @@ -285,8 +287,65 @@ return hres; } - FIXME("Default action is not implemented\n"); - return E_NOTIMPL; + if(!pwszUrl || !pbSecurityId || !pcbSecurityId) + return E_INVALIDARG; + + if(dwReserved) + FIXME("dwReserved is not supported\n"); + + len = strlenW(pwszUrl)+1; + buf = HeapAlloc(GetProcessHeap(), 0, (len+16)*sizeof(WCHAR)); + + hres = CoInternetParseUrl(pwszUrl, PARSE_SECURITY_URL, 0, buf, len, &size, 0); + if(FAILED(hres)) + memcpy(buf, pwszUrl, len*sizeof(WCHAR)); + + hres = map_url_to_zone(buf, &zone); + if(FAILED(hres)) { + HeapFree(GetProcessHeap(), 0, buf); + return hres == 0x80041001 ? E_INVALIDARG : hres; + } + + /* file protocol is a special case */ + if(strlenW(pwszUrl) >= sizeof(wszFile)/sizeof(WCHAR) + && !memcmp(buf, wszFile, sizeof(wszFile))) { + + static const BYTE secidFile[] = {'f','i','l','e',':'}; + + if(*pcbSecurityId < sizeof(secidFile)+sizeof(zone)) + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + + memcpy(pbSecurityId, secidFile, sizeof(secidFile)); + *(DWORD*)(pbSecurityId+sizeof(secidFile)) = zone; + + *pcbSecurityId = sizeof(secidFile)+sizeof(zone); + return S_OK; + } + + ptr = strchrW(buf, ':'); + ptr2 = ++ptr; + while(*ptr2 == '/') + ptr2++; + if(ptr2 != ptr) + memmove(ptr, ptr2, (strlenW(ptr2)+1)*sizeof(WCHAR)); + + ptr = strchrW(ptr, '/'); + if(ptr) + *ptr = 0; + + len = WideCharToMultiByte(CP_ACP, 0, buf, -1, NULL, 0, NULL, NULL)-1; + + if(len+sizeof(DWORD) > *pcbSecurityId) + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + + WideCharToMultiByte(CP_ACP, 0, buf, -1, (LPSTR)pbSecurityId, -1, NULL, NULL); + HeapFree(GetProcessHeap(), 0, buf); + + *(DWORD*)(pbSecurityId+len) = zone; + + *pcbSecurityId = len+sizeof(DWORD); + + return S_OK; } _____ Modified: trunk/reactos/lib/urlmon/umon.c --- trunk/reactos/lib/urlmon/umon.c 2006-01-06 20:35:12 UTC (rev 20626) +++ trunk/reactos/lib/urlmon/umon.c 2006-01-06 20:42:46 UTC (rev 20627) @@ -3,6 +3,7 @@ * * Copyright 1999 Ulrich Czekalla for Corel Corporation * Copyright 2002 Huw D M Davies for CodeWeavers + * Copyright 2005 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -496,55 +497,6 @@ return E_NOTIMPL; } -typedef struct { - enum {OnProgress, OnDataAvailable} callback; -} URLMON_CallbackData; - - -#if 0 -static LRESULT CALLBACK URLMON_WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) -{ - return DefWindowProcA(hwnd, msg, wparam, lparam); -} - -static void PostOnProgress(URLMonikerImpl *This, UINT progress, UINT maxprogress, DWORD status, LPCWSTR *str) -{ -} - -static void CALLBACK URLMON_InternetCallback(HINTERNET hinet, /*DWORD_PTR*/ DWORD context, DWORD status, - void *status_info, DWORD status_info_len) -{ - URLMonikerImpl *This = (URLMonikerImpl *)context; - TRACE("handle %p this %p status %08lx\n", hinet, This, status); - - if(This->filesize == -1) { - switch(status) { - case INTERNET_STATUS_RESOLVING_NAME: - PostOnProgess(This, 0, 0, BINDSTATUS_FINDINGRESOURCE, status_info); - break; - case INTERNET_STATUS_CONNECTING_TO_SERVER: - PostOnProgress(This, 0, 0, BINDSTATUS_CONNECTING, NULL); - break; - case INTERNET_STATUS_SENDING_REQUEST: - PostOnProgress(This, 0, 0, BINDSTATUS_SENDINGREQUEST, NULL); - break; - case INTERNET_REQUEST_COMPLETE: - { - DWORD len, lensz = sizeof(len); - - HttpQueryInfoW(hrequest, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &len, &lensz, NULL); - TRACE("res = %ld gle = %08lx url len = %ld\n", hres, GetLastError(), len); - This->filesize = len; - break; - } - } - } - - return; -} -#endif - - /*********************************************************************** ******* * URLMoniker_BindToStorage ************************************************************************ ******/ @@ -601,7 +553,7 @@ if(SUCCEEDED(hres)) { WCHAR *urlcopy, *tmpwc; URL_COMPONENTSW url; - WCHAR *host, *path, *partial_path, *user, *pass; + WCHAR *host, *path, *user, *pass; DWORD lensz = sizeof(bind->expected_size); DWORD dwService = 0; BOOL bSuccess; @@ -622,17 +574,6 @@ if (*tmpwc == '\\') *tmpwc = '/'; -#if 0 - if(!registered_wndclass) { - WNDCLASSA urlmon_wndclass = {0, URLMON_WndProc,0, 0, URLMON_hInstance, 0, 0, 0, NULL, "URLMON_Callback_Window_Class"}; - RegisterClassA(&urlmon_wndclass); - registered_wndclass = TRUE; - } - - This->hwndCallback = CreateWindowA("URLMON_Callback_Window_Class", NULL, 0, 0, 0, 0, 0, 0, 0, - URLMON_hInstance, NULL); - -#endif bind->expected_size = 0; bind->total_read = 0; @@ -667,15 +608,9 @@ pass = 0; } - switch ((DWORD) url.nScheme) - { - case INTERNET_SCHEME_FTP: - case INTERNET_SCHEME_GOPHER: - case INTERNET_SCHEME_HTTP: - case INTERNET_SCHEME_HTTPS: - bind->hinternet = InternetOpenA("User Agent", 0, NULL, NULL, 0 /*INTERNET_FLAG_ASYNC*/); -/* InternetSetStatusCallback(bind->hinternet, URLMON_InternetCallback);*/ + do { + bind->hinternet = InternetOpenA("User Agent", 0, NULL, NULL, 0); if (!bind->hinternet) { hres = HRESULT_FROM_WIN32(GetLastError()); @@ -797,48 +732,8 @@ InternetCloseHandle(bind->hconnect); InternetCloseHandle(bind->hinternet); - break; + } while(0); - case INTERNET_SCHEME_FILE: - partial_path = bind->URLName + 5; /* Skip the "file:" part */ - if ((partial_path[0] != '/' && partial_path[0] != '\\') || - (partial_path[1] != '/' && partial_path[1] != '\\')) - { - hres = E_FAIL; - } - else - { - HANDLE h; - - partial_path += 2; - if (partial_path[0] == '/' || partial_path[0] == '\\') - ++partial_path; - h = CreateFileW(partial_path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); - if (h == (HANDLE) HFILE_ERROR) - { - hres = HRESULT_FROM_WIN32(GetLastError()); - } - else - { - char buf[4096]; - DWORD bufread; - - IBindStatusCallback_OnProgress(bind->pbscb, 0, 0, BINDSTATUS_CACHEFILENAMEAVAILABLE, szFileName); - - while (ReadFile(h, buf, sizeof(buf), &bufread, NULL) && bufread > 0) - hres = Binding_MoreCacheData(bind, buf, bufread); - - CloseHandle(h); - hres = S_OK; - } - } - - break; - - default: - FIXME("Unsupported URI scheme"); - break; - } Binding_CloseCacheDownload(bind); Binding_FinishedDownload(bind, hres); @@ -880,8 +775,7 @@ if(url.nScheme == INTERNET_SCHEME_HTTP || url.nScheme== INTERNET_SCHEME_HTTPS || url.nScheme== INTERNET_SCHEME_FTP - || url.nScheme == INTERNET_SCHEME_GOPHER - || url.nScheme == INTERNET_SCHEME_FILE) + || url.nScheme == INTERNET_SCHEME_GOPHER) return URLMonikerImpl_BindToStorage_hack(This->URLName, pbc, pmkToLeft, riid, ppvObject); TRACE("(%p)->(%p %p %s %p)\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppvObject); @@ -1198,9 +1092,20 @@ HeapFree(GetProcessHeap(), 0, This->URLName); return hres; } + }else { + /* FIXME: + * We probably should use CoInternetParseUrl or something similar here. + */ + + static const WCHAR wszFile[] = {'f','i','l','e',':','/','/',}; + + /* file protocol is a special case */ + if(sizeStr > sizeof(wszFile)/sizeof(WCHAR) + && !memcmp(lpszURLName, wszFile, sizeof(wszFile))) + UrlCanonicalizeW(lpszURLName, This->URLName, &sizeStr, URL_FILE_USE_PATHURL); + else + strcpyW(This->URLName,lpszURLName); } - else - strcpyW(This->URLName,lpszURLName); URLMON_LockModule(); @@ -1350,6 +1255,42 @@ } /*********************************************************************** + * BindAsyncMoniker (URLMON.@) + * + * Bind a bind status callback to an asynchronous URL Moniker. + * + * PARAMS + * pmk [I] Moniker object to bind status callback to + * grfOpt [I] Options, seems not used + * pbsc [I] Status callback to bind + * iidResult [I] Interface to return + * ppvResult [O] Resulting asynchronous moniker object + * + * RETURNS + * Success: S_OK. + * Failure: E_INVALIDARG, if any argument is invalid, or + * E_OUTOFMEMORY if memory allocation fails. + */ +HRESULT WINAPI BindAsyncMoniker(IMoniker *pmk, DWORD grfOpt, IBindStatusCallback *pbsc, REFIID iidResult, LPVOID *ppvResult) +{ + LPBC pbc = NULL; + HRESULT hr = E_INVALIDARG; + + if (pmk && ppvResult) + { + *ppvResult = NULL; + + hr = CreateAsyncBindCtx(0, pbsc, NULL, &pbc); + if (hr == NOERROR) + { + hr = IMoniker_BindToObject(pmk, pbc, NULL, iidResult, ppvResult); + IBindCtx_Release(pbc); + } + } + return hr; +} + +/********************************************************************** * * RegisterBindStatusCallback (URLMON.@) * * Register a bind status callback. _____ Modified: trunk/reactos/lib/urlmon/urlmon.spec --- trunk/reactos/lib/urlmon/urlmon.spec 2006-01-06 20:35:12 UTC (rev 20626) +++ trunk/reactos/lib/urlmon/urlmon.spec 2006-01-06 20:42:46 UTC (rev 20627) @@ -7,7 +7,7 @@ @ stub AsyncGetClassBits @ stub AsyncInstallDistributionUnit -@ stub BindAsyncMoniker +@ stdcall BindAsyncMoniker(ptr long ptr ptr ptr) @ stdcall CoGetClassObjectFromURL(ptr wstr long long wstr ptr long ptr ptr ptr) @ stub CoInstall @ stdcall CoInternetCombineUrl(wstr wstr long wstr long ptr long)

18 years, 8 months

[gvg] 20626: Sync to Wine-0_9_5:

by gvg＠svn.reactos.org

Sync to Wine-0_9_5: Jacek Caban <jacek(a)codeweavers.com> - shlwapi: Fix UrlCanonicalize. - Added support for URL_FILE_USE_PATHURL. - Fix handling of '/' and '\'. Marcus Meissner <marcus(a)jet.franken.de> - shlwapi: Print PathCombine* strings arguments in relay debugging. Modified: trunk/reactos/include/wine/shlwapi.h Modified: trunk/reactos/lib/shlwapi/shlwapi.spec Modified: trunk/reactos/lib/shlwapi/url.c _____ Modified: trunk/reactos/include/wine/shlwapi.h --- trunk/reactos/include/wine/shlwapi.h 2006-01-06 20:30:08 UTC (rev 20625) +++ trunk/reactos/include/wine/shlwapi.h 2006-01-06 20:35:12 UTC (rev 20626) @@ -12,6 +12,8 @@ #ifndef __WINE_SHLWAPI_H #define __WINE_SHLWAPI_H +#define URL_FILE_USE_PATHURL 0x00010000 + #define INTERFACE IQueryAssociations DECLARE_INTERFACE_(IQueryAssociations,IUnknown) { _____ Modified: trunk/reactos/lib/shlwapi/shlwapi.spec --- trunk/reactos/lib/shlwapi/shlwapi.spec 2006-01-06 20:30:08 UTC (rev 20625) +++ trunk/reactos/lib/shlwapi/shlwapi.spec 2006-01-06 20:35:12 UTC (rev 20626) @@ -574,8 +574,8 @@ @ stdcall PathBuildRootW (ptr long) @ stdcall PathCanonicalizeA (ptr str) @ stdcall PathCanonicalizeW (ptr wstr) -@ stdcall PathCombineA (ptr ptr ptr) -@ stdcall PathCombineW (ptr ptr ptr) +@ stdcall PathCombineA (ptr str str) +@ stdcall PathCombineW (ptr wstr wstr) @ stdcall PathCommonPrefixA(str str ptr) @ stdcall PathCommonPrefixW(wstr wstr ptr) @ stdcall PathCompactPathA(long str long) _____ Modified: trunk/reactos/lib/shlwapi/url.c --- trunk/reactos/lib/shlwapi/url.c 2006-01-06 20:30:08 UTC (rev 20625) +++ trunk/reactos/lib/shlwapi/url.c 2006-01-06 20:35:12 UTC (rev 20626) @@ -328,9 +328,10 @@ { HRESULT hr = S_OK; DWORD EscapeFlags; - LPWSTR lpszUrlCpy, wk1, wk2, mp, root; + LPWSTR lpszUrlCpy, wk1, wk2, mp, mp2, root; INT nByteLen, state; DWORD nLen, nWkLen; + WCHAR slash = dwFlags & URL_FILE_USE_PATHURL ? '\\' : '/'; TRACE("(%s %p %p 0x%08lx)\n", debugstr_w(pszUrl), pszCanonicalized, pcchCanonicalized, dwFlags); @@ -377,31 +378,49 @@ *wk2++ = *wk1++; if (*wk1 != L'/') {state = 6; break;} *wk2++ = *wk1++; + if((dwFlags & URL_FILE_USE_PATHURL) && *wk1 == '/') + wk1++; state = 4; break; case 3: nWkLen = strlenW(wk1); memcpy(wk2, wk1, (nWkLen + 1) * sizeof(WCHAR)); + mp = wk2; wk1 += nWkLen; wk2 += nWkLen; + + while(mp < wk2) { + if(*mp == '/' || *mp == '\\') + *mp = slash; + mp++; + } break; case 4: - if (!isalnumW(*wk1) && (*wk1 != L'-') && (*wk1 != L'.')) {state = 3; break;} - while(isalnumW(*wk1) || (*wk1 == L'-') || (*wk1 == L'.')) *wk2++ = *wk1++; - state = 5; + if (!isalnumW(*wk1) && (*wk1 != L'-') && (*wk1 != L'.') && (*wk1 != ':')) + {state = 3; break;} + while(isalnumW(*wk1) || (*wk1 == L'-') || (*wk1 == L'.') || (*wk1 == ':')) + *wk2++ = *wk1++; + state = 5; + break; + case 5: + if (*wk1 != '/' && *wk1 != '\\') {state = 3; break;} + while(*wk1 == '/') { + *wk2++ = slash; + wk1++; + } + state = 6; break; - case 5: - if (*wk1 != L'/') {state = 3; break;} - *wk2++ = *wk1++; - state = 6; - break; case 6: /* Now at root location, cannot back up any more. */ /* "root" will point at the '/' */ root = wk2-1; while (*wk1) { TRACE("wk1=%c\n", (CHAR)*wk1); - mp = strchrW(wk1, L'/'); + + mp = strchrW(wk1, '/'); + mp2 = strchrW(wk1, '\\'); + if(mp2 && mp2 < mp) + mp = mp2; if (!mp) { nWkLen = strlenW(wk1); memcpy(wk2, wk1, (nWkLen + 1) * sizeof(WCHAR)); @@ -409,35 +428,41 @@ wk2 += nWkLen; continue; } - nLen = mp - wk1 + 1; - memcpy(wk2, wk1, nLen * sizeof(WCHAR)); - wk2 += nLen; - wk1 += nLen; + nLen = mp - wk1; + if(nLen) { + memcpy(wk2, wk1, nLen * sizeof(WCHAR)); + wk2 += nLen; + wk1 += nLen; + } + *wk2++ = slash; + wk1++; + if (*wk1 == L'.') { TRACE("found '/.'\n"); - if (*(wk1+1) == L'/') { + if (wk1[1] == '/' || wk1[1] == '\\') { /* case of /./ -> skip the ./ */ wk1 += 2; } - else if (*(wk1+1) == L'.') { + else if (wk1[1] == '.') { /* found /.. look for next / */ TRACE("found '/..'\n"); - if (*(wk1+2) == L'/' || *(wk1+2) == L'?' || *(wk1+2) == L'#' || *(wk1+2) == 0) { + if (wk1[2] == '/' || wk1[2] == '\\' ||wk1[2] == '?' + || wk1[2] == '#' || !wk1[2]) { /* case /../ -> need to backup wk2 */ TRACE("found '/../'\n"); *(wk2-1) = L'\0'; /* set end of string */ - mp = strrchrW(root, L'/'); + mp = strrchrW(root, slash); if (mp && (mp >= root)) { /* found valid backup point */ wk2 = mp + 1; - if(*(wk1+2) != L'/') + if(wk1[2] != '/' && wk1[2] != '\\') wk1 += 2; else wk1 += 3; } else { - /* did not find point, restore '/' */ - *(wk2-1) = L'/'; + /* did not find point, restore '/' */ + *(wk2-1) = slash; } } } @@ -459,7 +484,7 @@ while ((nLen > 0) && ((lpszUrlCpy[nLen-1] == '\r')||(lpszUrlCpy[nLen-1] == '\n'))) lpszUrlCpy[--nLen]=0; - if(dwFlags & URL_UNESCAPE) + if(dwFlags & (URL_UNESCAPE | URL_FILE_USE_PATHURL)) UrlUnescapeW(lpszUrlCpy, NULL, &nLen, URL_UNESCAPE_INPLACE); if((EscapeFlags = dwFlags & (URL_ESCAPE_UNSAFE |

18 years, 8 months

[gvg] 20625: Sync to Wine-0_9_5:

by gvg＠svn.reactos.org

Sync to Wine-0_9_5: Vitaliy Margolen <wine-patch(a)kievinfo.com> - shell32: Create Local AppData for user profile. Move history and internet tmp files to Local Settings. - shell32: Update Russian resources. Michael Jung <mjung(a)iss.tu-darmstadt.de> - shell32: Helper function for unicode support in folder and file pidls. - shell32/unixfs: Added unicode support in folder and file pidls. Modified: trunk/reactos/lib/shell32/pidl.c Modified: trunk/reactos/lib/shell32/pidl.h Modified: trunk/reactos/lib/shell32/shell32_Bg.rc Modified: trunk/reactos/lib/shell32/shell32_De.rc Modified: trunk/reactos/lib/shell32/shell32_En.rc Modified: trunk/reactos/lib/shell32/shell32_Es.rc Modified: trunk/reactos/lib/shell32/shell32_Fi.rc Modified: trunk/reactos/lib/shell32/shell32_Fr.rc Modified: trunk/reactos/lib/shell32/shell32_No.rc Modified: trunk/reactos/lib/shell32/shell32_Pt.rc Modified: trunk/reactos/lib/shell32/shell32_Ru.rc Modified: trunk/reactos/lib/shell32/shellpath.c _____ Modified: trunk/reactos/lib/shell32/pidl.c --- trunk/reactos/lib/shell32/pidl.c 2006-01-06 20:24:26 UTC (rev 20624) +++ trunk/reactos/lib/shell32/pidl.c 2006-01-06 20:30:08 UTC (rev 20625) @@ -1811,15 +1811,21 @@ */ DWORD _ILSimpleGetTextW (LPCITEMIDLIST pidl, LPWSTR szOut, UINT uOutSize) { - DWORD dwReturn; + DWORD dwReturn; char szTemp[MAX_PATH]; + FileStructW *pFileStructW = _ILGetFileStructW(pidl); TRACE("(%p %p %x)\n",pidl,szOut,uOutSize); - dwReturn = _ILSimpleGetText(pidl, szTemp, uOutSize); + if (pFileStructW) { + lstrcpynW(szOut, pFileStructW->wszName, uOutSize); + dwReturn = lstrlenW(pFileStructW->wszName); + } else { + dwReturn = _ILSimpleGetText(pidl, szTemp, MAX_PATH); - if (!MultiByteToWideChar(CP_ACP, 0, szTemp, -1, szOut, MAX_PATH)) - *szOut = 0; + if (!MultiByteToWideChar(CP_ACP, 0, szTemp, -1, szOut, uOutSize)) + *szOut = 0; + } TRACE("-- (%p=%s 0x%08lx)\n",szOut,debugstr_w(szOut),dwReturn); return dwReturn; @@ -1938,6 +1944,45 @@ return NULL; } +/********************************************************************** ******** + * _ILGetFileStructW [Internal] + * + * Get pointer the a SHITEMID's FileStructW field if present + * + * PARAMS + * pidl [I] The SHITEMID + * + * RETURNS + * Success: Pointer to pidl's FileStructW field. + * Failure: NULL + */ +FileStructW* _ILGetFileStructW(LPCITEMIDLIST pidl) { + FileStructW *pFileStructW; + WORD cbOffset; + + if (!(_ILIsValue(pidl) || _ILIsFolder(pidl))) + return NULL; + + cbOffset = *(WORD*)((LPBYTE)pidl + pidl->mkid.cb - sizeof(WORD)); + pFileStructW = (FileStructW*)((LPBYTE)pidl + cbOffset); + + /* Currently I don't see a fool prove way to figure out if a pidl is for sure of WinXP + * style with a FileStructW member. If we switch all our shellfolder-implementations to + * the new format, this won't be a problem. For now, we do as many sanity checks as possible. */ + if (cbOffset & 0x1 || /* FileStructW member is word aligned in the pidl */ + /* FileStructW is positioned after FileStruct */ + cbOffset < sizeof(pidl->mkid.cb) + sizeof(PIDLTYPE) + sizeof(FileStruct) || + /* There has to be enough space at cbOffset in the pidl to hold FileStructW and cbOffset */ + cbOffset > pidl->mkid.cb - sizeof(cbOffset) - sizeof(FileStructW) || + pidl->mkid.cb != cbOffset + pFileStructW->cbLen) + { + WARN("Invalid pidl format (cbOffset = %d)!\n", cbOffset); + return NULL; + } + + return pFileStructW; +} + /*********************************************************************** ** * _ILGetFileDateTime * _____ Modified: trunk/reactos/lib/shell32/pidl.h --- trunk/reactos/lib/shell32/pidl.h 2006-01-06 20:24:26 UTC (rev 20624) +++ trunk/reactos/lib/shell32/pidl.h 2006-01-06 20:30:08 UTC (rev 20625) @@ -143,6 +143,20 @@ The second the dos name when needed or just 0x00 */ } FileStruct; +/* At least on WinXP, this struct is appended with 2-byte-alignment to FileStruct. There follows + * a WORD member after the wszName string, which gives the offset from the beginning of the PIDL + * to the FileStructW member. */ +typedef struct tagFileStructW { + WORD cbLen; + BYTE dummy1[6]; + WORD uCreationDate; + WORD uCreationTime; + WORD uLastAccessDate; + WORD uLastAccessTime; + BYTE dummy2[4]; + WCHAR wszName[1]; +} FileStructW; + typedef struct tagValueW { WCHAR name[1]; @@ -240,6 +254,7 @@ LPSTR _ILGetTextPointer (LPCITEMIDLIST); LPSTR _ILGetSTextPointer (LPCITEMIDLIST); IID *_ILGetGUIDPointer (LPCITEMIDLIST pidl); +FileStructW *_ILGetFileStructW (LPCITEMIDLIST pidl); /* * debug helper _____ Modified: trunk/reactos/lib/shell32/shell32_Bg.rc --- trunk/reactos/lib/shell32/shell32_Bg.rc 2006-01-06 20:24:26 UTC (rev 20624) +++ trunk/reactos/lib/shell32/shell32_Bg.rc 2006-01-06 20:30:08 UTC (rev 20625) @@ -190,9 +190,9 @@ IDS_APPDATA "Application Data" IDS_PRINTHOOD "PrintHood" IDS_LOCAL_APPDATA "Local Settings\\Application Data" - IDS_INTERNET_CACHE "Temporary Internet Files" + IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" IDS_COOKIES "Cookies" - IDS_HISTORY "History" + IDS_HISTORY "Local Settings\\History" IDS_PROGRAM_FILES "Program Files" IDS_MYPICTURES "My Documents\\My Pictures" IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" _____ Modified: trunk/reactos/lib/shell32/shell32_De.rc --- trunk/reactos/lib/shell32/shell32_De.rc 2006-01-06 20:24:26 UTC (rev 20624) +++ trunk/reactos/lib/shell32/shell32_De.rc 2006-01-06 20:30:08 UTC (rev 20625) @@ -190,9 +190,9 @@ IDS_APPDATA "Anwendungsdaten" IDS_PRINTHOOD "Druckumgebung" IDS_LOCAL_APPDATA "Lokale Einstellungen\\Anwendungsdaten" - IDS_INTERNET_CACHE "Temporary Internet Files" + IDS_INTERNET_CACHE "Lokale Einstellungen\\Temporary Internet Files" IDS_COOKIES "Cookies" - IDS_HISTORY "Verlauf" + IDS_HISTORY "Lokale Einstellungen\\Verlauf" IDS_PROGRAM_FILES "Programme" IDS_MYPICTURES "Eigene Dateien\\Eigene Bilder" IDS_PROGRAM_FILES_COMMON "Programme\\Gemeinsame Dateien" _____ Modified: trunk/reactos/lib/shell32/shell32_En.rc --- trunk/reactos/lib/shell32/shell32_En.rc 2006-01-06 20:24:26 UTC (rev 20624) +++ trunk/reactos/lib/shell32/shell32_En.rc 2006-01-06 20:30:08 UTC (rev 20625) @@ -189,9 +189,9 @@ IDS_APPDATA "Application Data" IDS_PRINTHOOD "PrintHood" IDS_LOCAL_APPDATA "Local Settings\\Application Data" - IDS_INTERNET_CACHE "Temporary Internet Files" + IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" IDS_COOKIES "Cookies" - IDS_HISTORY "History" + IDS_HISTORY "Local Settings\\History" IDS_PROGRAM_FILES "Program Files" IDS_MYPICTURES "My Documents\\My Pictures" IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" _____ Modified: trunk/reactos/lib/shell32/shell32_Es.rc --- trunk/reactos/lib/shell32/shell32_Es.rc 2006-01-06 20:24:26 UTC (rev 20624) +++ trunk/reactos/lib/shell32/shell32_Es.rc 2006-01-06 20:30:08 UTC (rev 20625) @@ -207,9 +207,9 @@ IDS_APPDATA "Application Data" IDS_PRINTHOOD "PrintHood" IDS_LOCAL_APPDATA "Configuraci¾n local\\Datos de programa" - IDS_INTERNET_CACHE "Archivos temporales de Internet" + IDS_INTERNET_CACHE "Configuraci¾n local\\Archivos temporales de Internet" IDS_COOKIES "Cookies" - IDS_HISTORY "Historial" + IDS_HISTORY "Configuraci¾n local\\Historial" IDS_PROGRAM_FILES "Archivos de programa" IDS_MYPICTURES "Mis documentos\\Mis imßgenes" IDS_PROGRAM_FILES_COMMON "Archivos de programa\\Archivos comunes" _____ Modified: trunk/reactos/lib/shell32/shell32_Fi.rc --- trunk/reactos/lib/shell32/shell32_Fi.rc 2006-01-06 20:24:26 UTC (rev 20624) +++ trunk/reactos/lib/shell32/shell32_Fi.rc 2006-01-06 20:30:08 UTC (rev 20625) @@ -189,9 +189,9 @@ IDS_APPDATA "Ohjelmien Tiedot" IDS_PRINTHOOD "Tulostinympõrist÷" IDS_LOCAL_APPDATA "Paikalliset Asetukset\\Ohjelmien Tiedot" - IDS_INTERNET_CACHE "Võliaikaiset Internet-tiedostot" + IDS_INTERNET_CACHE "Paikalliset Asetukset\\Võliaikaiset Internet-tiedostot" IDS_COOKIES "Evõsteet" - IDS_HISTORY "Historia" + IDS_HISTORY "Paikalliset Asetukset\\Historia" IDS_PROGRAM_FILES "Ohjelmat" IDS_MYPICTURES "Omat tiedostot\\Omat kuvatiedostot" IDS_PROGRAM_FILES_COMMON "Ohjelmat\\Yhteiset Tiedostot" _____ Modified: trunk/reactos/lib/shell32/shell32_Fr.rc --- trunk/reactos/lib/shell32/shell32_Fr.rc 2006-01-06 20:24:26 UTC (rev 20624) +++ trunk/reactos/lib/shell32/shell32_Fr.rc 2006-01-06 20:30:08 UTC (rev 20625) @@ -209,9 +209,9 @@ IDS_APPDATA "Application Data" IDS_PRINTHOOD "Voisinage d'impression" IDS_LOCAL_APPDATA "Local Settings\\Application Data" - IDS_INTERNET_CACHE "Temporary Internet Files" + IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" IDS_COOKIES "Cookies" - IDS_HISTORY "Historique" + IDS_HISTORY "Local Settings\\Historique" IDS_PROGRAM_FILES "Program Files" IDS_MYPICTURES "Mes documents\\Mes images" IDS_PROGRAM_FILES_COMMON "Program Files\\Fichiers communs" _____ Modified: trunk/reactos/lib/shell32/shell32_No.rc --- trunk/reactos/lib/shell32/shell32_No.rc 2006-01-06 20:24:26 UTC (rev 20624) +++ trunk/reactos/lib/shell32/shell32_No.rc 2006-01-06 20:30:08 UTC (rev 20625) @@ -189,9 +189,9 @@ IDS_APPDATA "Application Data" IDS_PRINTHOOD "PrintHood" IDS_LOCAL_APPDATA "Local Settings\\Application Data" - IDS_INTERNET_CACHE "Temporary Internet Files" + IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" IDS_COOKIES "Cookies" - IDS_HISTORY "History" + IDS_HISTORY "Local Settings\\History" IDS_PROGRAM_FILES "Program Files" IDS_MYPICTURES "Mine dokumenter\\Mine bilder" IDS_PROGRAM_FILES_COMMON "Programfiler\\Fellesfiler" _____ Modified: trunk/reactos/lib/shell32/shell32_Pt.rc --- trunk/reactos/lib/shell32/shell32_Pt.rc 2006-01-06 20:24:26 UTC (rev 20624) +++ trunk/reactos/lib/shell32/shell32_Pt.rc 2006-01-06 20:30:08 UTC (rev 20625) @@ -190,9 +190,9 @@ IDS_APPDATA "Application Data" IDS_PRINTHOOD "PrintHood" IDS_LOCAL_APPDATA "Configuraþ§es locais\\Dados de aplicativos" - IDS_INTERNET_CACHE "Temporary Internet Files" + IDS_INTERNET_CACHE "Configuraþ§es locais\\Temporary Internet Files" IDS_COOKIES "Cookies" - IDS_HISTORY "Hist¾rico" + IDS_HISTORY "Configuraþ§es locais\\Hist¾rico" IDS_PROGRAM_FILES "Arquivos de programas" IDS_MYPICTURES "Meus Documentos\\Minhas Imagens" IDS_PROGRAM_FILES_COMMON "Arquivos de programas\\Arquivos comuns" _____ Modified: trunk/reactos/lib/shell32/shell32_Ru.rc --- trunk/reactos/lib/shell32/shell32_Ru.rc 2006-01-06 20:24:26 UTC (rev 20624) +++ trunk/reactos/lib/shell32/shell32_Ru.rc 2006-01-06 20:30:08 UTC (rev 20625) @@ -1,5 +1,6 @@ /* * Copyright 1998 Juergen Schmied + * Copyright 2006 Vitaliy Margolen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,6 +19,92 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +MENU_001 MENU DISCARDABLE +BEGIN + MENUITEM "&?¯Ù³°ÞÕ ?Û¯ÝÛÞ", FCIDM_SHVIEW_BIGICON + MENUITEM "&?ÕÙÛÞÕ ?Û¯ÝÛÞ", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Ð´Þ±¯Û", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&¤¯õ¯ßÝ¯", FCIDM_SHVIEW_REPORTVIEW +END + +/* + shellview background menu +*/ +MENU_002 MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&¤¯±ý¯?" + BEGIN + MENUITEM "&?¯Ù³°ÞÕ ?Û¯ÝÛÞ", FCIDM_SHVIEW_BIGICON + MENUITEM "&?ÕÙÛÞÕ ?Û¯ÝÛÞ", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Ð´Þ±¯Û", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&¤¯õ¯ßÝ¯", FCIDM_SHVIEW_REPORTVIEW + END + MENUITEM SEPARATOR + POPUP "Arrange &Icons" + BEGIN + MENUITEM "¤¯ &?ýÕÝÞ", 0x30 /* column 0 */ + MENUITEM "¤¯ &ÊÞ´¾", 0x32 /* column 2 */ + MENUITEM "¤¯ &ðÓþýÕ¾", 0x31 /* ... */ + MENUITEM "¤¯ &?Ó?Õ", 0x33 + MENUITEM SEPARATOR + MENUITEM "&?Ô?¯ýÓ?Þ¸Õ±ÛÞ", FCIDM_SHVIEW_AUTOARRANGE + END + MENUITEM "?&¹¯ÔÝ ?³ ÞÛ¯ÝÛÞ", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM SEPARATOR + MENUITEM "?&ßÝ¯ÔÞ?³", FCIDM_SHVIEW_REFRESH + MENUITEM SEPARATOR + MENUITEM "&?±?ÓÔÞ?³", FCIDM_SHVIEW_INSERT + MENUITEM "?±?ÓÔÞ?³ & ÛÙ¹Û", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + POPUP "Ð¯þõÓ?³" + BEGIN + MENUITEM "&¤Ó´ÛÓ", FCIDM_SHVIEW_NEWFOLDER + MENUITEM "&?Ù¹Û", FCIDM_SHVIEW_NEWLINK + MENUITEM SEPARATOR + END + MENUITEM SEPARATOR + MENUITEM "ÐÔ¯&Ú±?ÔÓ", FCIDM_SHVIEW_PROPERTIES + END +END + +/* + shellview item menu +*/ +MENU_SHV_FILE MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&¤¯Ô¯õÝÞÛ", FCIDM_SHVIEW_EXPLORE + MENUITEM "&??Û¹?³", FCIDM_SHVIEW_OPEN + MENUITEM SEPARATOR + MENUITEM "&?¹ÕþÓ?³", FCIDM_SHVIEW_CUT + MENUITEM "&?¯´Þ¯ÔÓ?³", FCIDM_SHVIEW_COPY + MENUITEM SEPARATOR + MENUITEM "Ð¯þõÓ?³ &?¯Ù¹Û", FCIDM_SHVIEW_CREATELINK + MENUITEM "&ËõÓÙý?³", FCIDM_SHVIEW_DELETE + MENUITEM "¤ÕÕÞ&ýÕÝ¯ÔÓ?³", FCIDM_SHVIEW_RENAME + MENUITEM SEPARATOR + MENUITEM "ÐÔ¯&Ú±?ÔÓ", FCIDM_SHVIEW_PROPERTIES + END +END + +SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "?ßþ¯" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "?Ó", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "??ýÕÝÞ?³", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP + LTEXT "", IDD_TITLE, 4, 4, 180, 12 + LTEXT "", IDD_STATUS, 4, 25, 180, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 4, 40, 180, 120 +} + SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "? %s" @@ -44,3 +131,75 @@ PUSHBUTTON "??ýÕÝÓ", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "?ß&þ¯...", 12288, 170, 63, 50, 14, WS_TABSTOP } + +STRINGTABLE DISCARDABLE +{ + /* columns in the shellview */ + IDS_SHV_COLUMN1 "?ý " + IDS_SHV_COLUMN2 "ðÓþýÕ" + IDS_SHV_COLUMN3 "ÊÞ´" + IDS_SHV_COLUMN4 "?þýÕÝÕÝ" + IDS_SHV_COLUMN5 "??Þß¾?¹" + IDS_SHV_COLUMN6 "¤¯ÙÝ¹Ú ¯ß·Õý" + IDS_SHV_COLUMN7 "ÐÔ¯ß¯õÝ¯" + IDS_SHV_COLUMN8 "?ý " + IDS_SHV_COLUMN9 "?¯ýýÕÝ?ÓÞÚ" + IDS_SHV_COLUMN10 "?ÙÓõÕÙÕ÷" + IDS_SHV_COLUMN11 "?¾´´Ó" + + /* special folders */ + IDS_DESKTOP "ðÓß¯¸ÞÚ ±?¯Ù" + IDS_MYCOMPUTER "?¯Ú Û¯ý´³??Õ" + + /* context menus */ + IDS_VIEW_LARGE "&?¯Ù³°ÞÕ ?Û¯ÝÛÞ" + IDS_VIEW_SMALL "&?ÕÙÛÞÕ ?Û¯ÝÛÞ" + IDS_VIEW_LIST "&Ð´Þ±¯Û" + IDS_VIEW_DETAILS "&¤¯õ¯ßÝ¯" + IDS_SELECT "&?¹ßÓ?³" + IDS_OPEN "&??Û¹?³" + + IDS_CREATEFOLDER_DENIED "?ÕÔ¯þý¯µÝ¯ ±¯þõÓ?³ ´Ó´Û¾ - ÝÕ? ´¯ÙÝ¯ý¯¸ÞÚ." + IDS_CREATEFOLDER_CAPTION "?°ÞßÛÓ Ô¯ ÔÕý ±¯þõÓÝÞ ´Ó´ÛÞ" + IDS_DELETEITEM_CAPTION "¤¯õ?ÔÕµõÕÝÞÕ ¾õÓÙÕÝÞ ¶ÓÚÙÓ" + IDS_DELETEFOLDER_CAPTION "¤¯õ?ÔÕµõÕÝÞÕ ¾õÓÙÕÝÞ ´Ó´ÛÞ" + IDS_DELETEITEM_TEXT "ËõÓÙÞ?³ '%1'?" + IDS_DELETEMULTIPLE_TEXT "ËõÓÙÞ?³ ²?Þ ¯ß³ÕÛ?¹ (%1?" + IDS_OVERWRITEFILE_TEXT "ÃÓýÕÝÞ?³ ¶ÓÚÙ(¹) %1?" + IDS_OVERWRITEFILE_CAPTION "¤¯õ?ÔÕµõÕÝÞÕ þÓýÕÝ¹ ¶ÓÚÙÓ" + + /* message box strings */ + IDS_RESTART_TITLE "¤ÕÕþÓÒ¾þÞ?³" + IDS_RESTART_PROMPT "?¹ §¯?Þ?Õ ±Þý¾ÙÞ¯ÔÓ?³ ´ÕÕþÓ´¾±Û Windows?" + IDS_SHUTDOWN_TITLE "?¹ÛÙ?¸Þ?³ ´Þ?ÓÝÞÕ" + IDS_SHUTDOWN_PROMPT "?¹ §¯?Þ?Õ þÓÛÞÝ¸Þ?³ Óß¯?¾ ± Wine?" + + /* shell folder path default values */ + IDS_PROGRAMS "?ÙÓÔÝ¯Õ ýÕÝ?\\¤¯ÒÓýý¹" + IDS_PERSONAL "?¯Þ õ¯Û¾ýÕÝ?¹" + IDS_FAVORITES "?þßÓÝÝ¯Õ" + IDS_STARTUP "?ÙÓÔÝ¯Õ ýÕÝ?\\¤¯ÒÓýý¹\\?Ô?¯þÓÒ¾þÛÓ" + IDS_RECENT "Recent" + IDS_SENDTO "??´ÔÔÞ?³" + IDS_STARTMENU "?ÙÓÔÝ¯Õ ýÕÝ?" + IDS_MYMUSIC "?¯Þ õ¯Û¾ýÕÝ?¹\\?¯ ý¾þ¹ÛÓ" + IDS_MYVIDEO "?¯Þ õ¯Û¾ýÕÝ?¹\\?¯Þ ¶ÞÙ³ý¹" + IDS_DESKTOPDIRECTORY "ðÓß¯¸ÞÚ ±?¯Ù" + IDS_NETHOOD "NetHood" + IDS_TEMPLATES "ÏÓßÙ¯Ý¹" + IDS_APPDATA "Application Data" + IDS_PRINTHOOD "PrintHood" + IDS_LOCAL_APPDATA "Local Settings\\Application Data" + IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" + IDS_COOKIES "Cookies" + IDS_HISTORY "Local Settings\\History" + IDS_PROGRAM_FILES "Program Files" + IDS_MYPICTURES "?¯Þ õ¯Û¾ýÕÝ?¹\\?¯Þ Þ±¾ÝÛÞ" + IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" + IDS_COMMON_DOCUMENTS "?ß¨ÞÕ õ¯Û¾ýÕÝ?¹" + IDS_ADMINTOOLS "?ÙÓÔÝ¯Õ ýÕÝ?\\¤¯Ò Óýý¹\\Administrative Tools" + IDS_COMMON_MUSIC "?ß¨ÞÕ õ¯Û¾ýÕÝ?¹\\?¯ ý¾þ¹ÛÓ" + IDS_COMMON_PICTURES "?ß¨ÞÕ õ¯Û¾ýÕÝ?¹\\?¯Þ Þ±¾ÝÛÞ" + IDS_COMMON_VIDEO "?ß¨ÞÕ õ¯Û¾ýÕÝ?¹\\?¯Þ ¶ÞÙ³ý¹" + IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" +} _____ Modified: trunk/reactos/lib/shell32/shellpath.c --- trunk/reactos/lib/shell32/shellpath.c 2006-01-06 20:24:26 UTC (rev 20624) +++ trunk/reactos/lib/shell32/shellpath.c 2006-01-06 20:30:08 UTC (rev 20625) @@ -1816,6 +1816,8 @@ CSIDL_NETHOOD, CSIDL_TEMPLATES, CSIDL_PRINTHOOD, + CSIDL_LOCAL_APPDATA, + CSIDL_INTERNET_CACHE, CSIDL_COOKIES, CSIDL_HISTORY, CSIDL_MYPICTURES

18 years, 8 months

[gvg] 20624: Sync to Wine-0_9_5:

by gvg＠svn.reactos.org

Sync to Wine-0_9_5: Robert Shearman <rob(a)codeweavers.com> - rpcrt4: Fix race condition in RpcServerListen. The DontWait parameter is used for forcing the function not to wait for the server to finish. - rpcrt4: Implement callback conformance. Modified: trunk/reactos/lib/rpcrt4/ndr_marshall.c Modified: trunk/reactos/lib/rpcrt4/rpc_server.c _____ Modified: trunk/reactos/lib/rpcrt4/ndr_marshall.c --- trunk/reactos/lib/rpcrt4/ndr_marshall.c 2006-01-06 20:21:22 UTC (rev 20623) +++ trunk/reactos/lib/rpcrt4/ndr_marshall.c 2006-01-06 20:24:26 UTC (rev 20624) @@ -375,9 +375,17 @@ ptr = *(LPVOID*)ptr; break; case RPC_FC_CALLBACK: + { + unsigned char *old_stack_top = pStubMsg->StackTop; + pStubMsg->StackTop = ptr; + /* ofs is index into StubDesc->apfnExprEval */ - FIXME("handle callback\n"); + TRACE("callback conformance into apfnExprEval[%d]\n", ofs); + pStubMsg->StubDesc->apfnExprEval[ofs](pStubMsg); + + pStubMsg->StackTop = old_stack_top; goto finish_conf; + } default: break; } _____ Modified: trunk/reactos/lib/rpcrt4/rpc_server.c --- trunk/reactos/lib/rpcrt4/rpc_server.c 2006-01-06 20:21:22 UTC (rev 20623) +++ trunk/reactos/lib/rpcrt4/rpc_server.c 2006-01-06 20:24:26 UTC (rev 20624) @@ -989,6 +989,9 @@ status = RPCRT4_start_listen(FALSE); + if (status == RPC_S_OK) + RPCRT4_sync_with_server_thread(); + if (DontWait || (status != RPC_S_OK)) return status; return RpcMgmtWaitServerListen(); @@ -1010,8 +1013,6 @@ LeaveCriticalSection(&listen_cs); - RPCRT4_sync_with_server_thread(); - return RPC_S_OK; }

18 years, 8 months

← Newer
1
...
43
44
45
46
47
48
49
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2006