Ros-dev

ros-dev@reactos.org

5788 discussions

Re: [ros-dev] [ros-diffs] [hbelusca] 66575: Start source tree (final, I hope!) restructuration. Part 1/X Win32, Shell, Services, MVDM

by daniel.reimer

Hii, Well... In theory the restructuring might be logical and maybe even a good idea to separate some of the DLL/win32 folder etc, but this can't be done as one man show. It breaks the patches in jira, breaks the stuff our devs might have locally and maybe someone has something to say to your plans.How to resolve this? Tbh, no clue. But a open discussion BEFORE commiting would be a start IMO. So guys, what now? Can we keep it or not? Greetings Daniel Von meinem Samsung Gerät gesendet. -------- Ursprüngliche Nachricht -------- Von: Hermès BÉLUSCA - MAÏTO <hermes.belusca(a)sfr.fr> Datum: 06.03.2015 12:03 (GMT+01:00) An: 'ReactOS Development List' <ros-dev(a)reactos.org> Betreff: Re: [ros-dev] [ros-diffs] [hbelusca] 66575: Start source tree (final, I hope!) restructuration. Part 1/X Win32, Shell, Services, MVDM So... ... must I revert trunk pre-66575 ? Hermès. -----Message d'origine----- De : Ros-dev [mailto:ros-dev-bounces@reactos.org] De la part de Aleksey Bragin Envoyé : vendredi 6 mars 2015 10:48 À : ReactOS Development List Objet : Re: [ros-dev] [ros-diffs] [hbelusca] 66575: Start source tree (final, I hope!) restructuration. Part 1/X Win32, Shell, Services, MVDM On 06.03.2015 2:58, Hermès BÉLUSCA - MAÏTO wrote: > Hi, > > So first, please receive my apologies for not having warned in ros-dev > about this (continuation of) tree restructure I did starting with > r66575. Indeed this was the first thing to do before doing anything, > even if I talked about that on IRC and JIRA! Wrong. You did not need to warn, you need to get majority of devs to support this change, to get comments from them, to make sure they continue to feel "at home" in ReactOS source code. Right now, for the sake of subjective beautification you just forced everyone but you to adapt their patches (myself included, I have many working copies) just because you feel the tree structure was wrong. This is just ridiculous. As Pierre said, we are a team here. And teamwork without big issues is what is making our project a good place to work in, to get pleasure and satisfaction from the work done. > In fact, the tree restructure discussion started 5 years ago, along > with the cmake bringup: see the big thread here: > http://www.reactos.org/pipermail/ros-dev/2010-July/013257.html . Imagine what, I was part of it. > At that > time the main argument was that we were also in the middle of changing > the old build system (rbuild) to a new one (cmake) so it was > problematic to do those two big changes at once. Also at that time, > seeing the argumentation of Ged, Timo, Jérôme and the few others > (active developers) who dared to participate to this discussion, it > was clear that a tree restructure was necessary anyway, sooner or later. This is called https://en.wikipedia.org/wiki/Post-purchase_rationalization . After you made the change you start explaining that everyone was supporting it, it was so much needed, and let's just forget about any side-effects it may have caused. > In 2012 some tree restructure happened (r56305) by moving around and > in a more logical manner some core components of win32. Yep. > What happens now in 2015, i.e. 5 years after ? We have CMake well > established, everything works, but only win32 core was reorganized. Sure, 5 years is a magic number which means you can safely ignore everyone else and just force your own change. > I made http://jira.reactos.org/browse/CORE-9111 , people started to > give proposals. You came back with the almost same argument, that is > to finish the existing things first (adapt that: at the time of CMake, > it was CMake, now, it's fix all ReactOS 0.4 bugs), and then improve > structure of source tree. Since not all the existing bugs will be > fixed by then, we can continue this way and wait another 5 years in order to have a real tree restructure? > I don't think so. > So I took that for granted and committed r66575. You know, users don't care about source code tree structure. Tree is for developers. Users (and hence, popularity and usability of ReactOS) like when ReactOS does not crash, when ReactOS runs their apps, when ReactOS loads native binary drivers. And my point is that internal changes (code refactorings, tree restructures, reformatting) must happen only when the advantage of that is more than the disadvantage/side effects. Are you going to say that ReactOS 0.4 is closer now because you restructured the tree according to your taste? Was there any urge to do the restructure? > Active developers really think (at least, myself) it's a pain in the > *** The key part: "myself". Let's face it: you silently ignored my opinion and decided not to ask anyone else. This is PITA, not the tree structure. > that when we code on some given module (example: shell), we need to > modify some bit of code in base/shell/whatever, some bit of code in > dll/win32/shell32, some bit of code here and there. All the code of > the shell should be tied together. This goes also for everything else: > the core of NT (kernel, ntdll, "base" drivers...), the win32 subsystem > (win32k; for it the change in r56305 started to make things more > logical: you would not have to modify code in some win32k/ directory > while also changing > dll/win32/gdi32 or dll/win32/user32 that were by the way amongst all > the rest of wine dlls, etc...) . It's not "more logical", it's just different logical approaches. > Because I didn't want to wait yet another 5 years I decided to start > something. Just remember, trunk is not your private branch. You have to take other devs opinion into account. And you are not always right. Sometimes even Alex Ionescu fails, though I must say it happens very rare. Get used to convince people. Remember Arwinss? Did I just delete the existing trunk win32ss back then? Imagine if I did? My reasoning was perfect, the subsystem was superior to trunk back then in many ways, and "I did not want to wait another 10 years for someone to finish trunk's win32ss". > OK my fault I would have to get a synthesis of the different proposals > of tree restructures I got, then put in ros-dev, then wait 1 month > until everybody starts to vote. Of course you would get people > thinking it's better to do à la Wine and sort the files by extension > type (that's what we almost have currently) and it was already > repeated that it is BAD because it doesn't translate the fact that > ROS/windows is built by modules; others would have thought it's nice > to have this piece of thing next to another one whereas this can be > postponed later on until the *obvious* parts of code have been properly packed together. Yes, unless I don't know something and suddenly all your ideas are absolutely true without the need for verification. Mine aren't, I always consult with other skilled people. > And because of that, here is my proposal: UNTIL details get fixed, I > propose > to: > - keep the /boot/, /include/, /lib/, /media/ and /tools/ directories > (as well as /cmake/ and the files in / ) untouched. > - ntoskrnl, ntdll and the drivers we have in /drivers/ (SAUF, the > multimedia > ones) go into some main "ntcore" directory (ntcore, ntos, call it > whatever you prefer. I'm inclined to the second name, but I'm ok with the first one). > - the keyboard layouts can be moved either to win32ss/ or to / (in > case we can give sense to keyboard layouts in "pure" NT, for example > when we run usetup, etc...) > - ok... my already-done (but revertable) modifs from 66575 (directory > renamings can be done, it's not set in stone). > - putting all printing support in some /win32/printsup (or > "printing"...) directory : that means: localspl, ntprint, printui, > spoolsv and spoolss, and winspool (so far...) Oh, now you shared your secret plan with us. Thank you so much! Actually, I would like to invent something better than just copying the NT source code tree layout. > That's what I'm 99.99% sure (and what I think is quite clear). > Concerning the rest (that can create discussion) I still keep it in old directories. ... > Regards, > Hermès. > > > > -----Message d'origine----- > De : Ros-dev [mailto:ros-dev-bounces@reactos.org] De la part de > Aleksey Bragin Envoyé : vendredi 6 mars 2015 00:15 À : > ros-dev(a)reactos.org Objet : Re: [ros-dev] [ros-diffs] [hbelusca] > 66575: Start source tree (final, I hope!) restructuration. Part 1/X > Win32, Shell, Services, MVDM > > Hermes, > > What the fuck, may I ask? > > I don't understand since when we started doing big changes in trunk > without talking (or listening) to anyone at all, just at your own discretion? > > Are you so sure the change is accepted by majority of our developers? > Did you get approval of those devs? Give them some respect which they > earned over years with their skills and commitment. > > I understand ReactOS is a very loosely managed project (to favor ease > of development), but totally ignoring everyone? > I checked CORE-9111 and I don't see any single comment from Timo, > Jerome, James, whoever else counts. > > Regards, > Aleksey Bragin > P.S. I'm not talking about actual changes, I'm talking about the > process and attitude. > > On 06.03.2015 2:03, hbelusca(a)svn.reactos.org wrote: >> Author: hbelusca >> Date: Thu Mar 5 23:03:33 2015 >> New Revision: 66575 >> >> URL: http://svn.reactos.org/svn/reactos?rev=66575&view=rev >> Log: >> Start source tree (final, I hope!) restructuration. Part 1/X Win32, >> Shell, Services, MVDM >> > _______________________________________________ Ros-dev mailing list Ros-dev(a)reactos.org http://www.reactos.org/mailman/listinfo/ros-dev _______________________________________________ Ros-dev mailing list Ros-dev(a)reactos.org http://www.reactos.org/mailman/listinfo/ros-dev

9 years, 6 months

GSoC :: application rejected

by Pierre Schweitzer

Dear all, The ReactOS Foundation application to GSoC has been rejected this year again. Statistics are not reliable after all. In any case, keep up the good work. We don't need Google to be the bests at what we do. Cheers, -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

9 years, 6 months

Re: [ros-dev] [ros-diffs] [hbelusca] 66575: Start source tree (final, I hope!) restructuration. Part 1/X Win32, Shell, Services, MVDM

by Aleksey Bragin

Hermes, What the fuck, may I ask? I don't understand since when we started doing big changes in trunk without talking (or listening) to anyone at all, just at your own discretion? Are you so sure the change is accepted by majority of our developers? Did you get approval of those devs? Give them some respect which they earned over years with their skills and commitment. I understand ReactOS is a very loosely managed project (to favor ease of development), but totally ignoring everyone? I checked CORE-9111 and I don't see any single comment from Timo, Jerome, James, whoever else counts. Regards, Aleksey Bragin P.S. I'm not talking about actual changes, I'm talking about the process and attitude. On 06.03.2015 2:03, hbelusca(a)svn.reactos.org wrote: > Author: hbelusca > Date: Thu Mar 5 23:03:33 2015 > New Revision: 66575 > > URL: http://svn.reactos.org/svn/reactos?rev=66575&view=rev > Log: > Start source tree (final, I hope!) restructuration. Part 1/X > Win32, Shell, Services, MVDM >

9 years, 6 months

Intel Edison + ReactOS

by Aleksey Bragin

Hi! I visited Intel's office in Moscow this week where I was given the brand new Intel Edison along with the Arduino-compatible prototype board. This story started by Alexander Rechitsky who brought all this to my attention, communicated with Novosibirsk's and Moscow's Intel staff and explained the ReactOS-on-Edison idea. Now I can get my hands on this board, and I invite everyone who's interested to play with it together. I am just getting started with it - the basics, like attaching serial output, etc. Some photos of this thing can be seen in my public Facebook album: https://www.facebook.com/media/set/?set=a.10204517582234470.1073741833.1080… Regards, Aleksey Bragin

9 years, 6 months

Re: [ros-dev] [ros-diffs] [cwittich] 66547: [WLANAPI] add stubs for WlanQueryInterface and WlanGetInterfaceCapability

by Thomas Faber

On 2015-03-02 20:27, cwittich(a)svn.reactos.org wrote: > --- trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] (original) > +++ trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] Mon Mar 2 19:27:45 2015 > @@ -24,7 +24,7 @@ > wlan_opcode_value_type_set_by_group_policy, > wlan_opcode_value_type_set_by_user, > wlan_opcode_value_type_invalid > -} WLAN_OPCODE_VALUE_TYPE; > +} WLAN_OPCODE_VALUE_TYPE; /* HACK: WIDL is broken , *PWLAN_OPCODE_VALUE_TYPE; */ > > typedef enum _WLAN_SECURABLE_OBJECT { > wlan_secure_permit_list = 0, What's broken, exactly? Let's see if we can get it fixed...

9 years, 6 months

Re: [ros-dev] [ros-diffs] [akhaldi] 66551: [PSDK] Fix winternl.h version of SECTION_IMAGE_INFORMATION and add missing MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION definition.

by Alex Ionescu

This is wintrnl.h which should match the Windows one. Make sure you're not accidentally adding fields that only NDK should have. Best regards, Alex Ionescu On Mon, Mar 2, 2015 at 3:38 PM, <akhaldi(a)svn.reactos.org> wrote: > Author: akhaldi > Date: Mon Mar 2 23:38:49 2015 > New Revision: 66551 > > URL: http://svn.reactos.org/svn/reactos?rev=66551&view=rev > Log: > [PSDK] Fix winternl.h version of SECTION_IMAGE_INFORMATION and add missing > MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION definition. > > Modified: > trunk/reactos/include/psdk/winternl.h > > Modified: trunk/reactos/include/psdk/winternl.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re… > > ============================================================================== > --- trunk/reactos/include/psdk/winternl.h [iso-8859-1] (original) > +++ trunk/reactos/include/psdk/winternl.h [iso-8859-1] Mon Mar 2 > 23:38:49 2015 > @@ -705,6 +705,7 @@ > > #define MEM_EXECUTE_OPTION_DISABLE 0x01 > #define MEM_EXECUTE_OPTION_ENABLE 0x02 > +#define MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION 0x04 > #define MEM_EXECUTE_OPTION_PERMANENT 0x08 > > typedef enum _SECTION_INHERIT { > @@ -1685,23 +1686,28 @@ > } SECTION_INFORMATION_CLASS; > > typedef struct _SECTION_BASIC_INFORMATION { > - ULONG BaseAddress; > + PVOID BaseAddress; > ULONG Attributes; > LARGE_INTEGER Size; > } SECTION_BASIC_INFORMATION, *PSECTION_BASIC_INFORMATION; > > typedef struct _SECTION_IMAGE_INFORMATION { > - PVOID EntryPoint; > - ULONG StackZeroBits; > - ULONG StackReserved; > - ULONG StackCommit; > - ULONG ImageSubsystem; > + PVOID TransferAddress; > + ULONG ZeroBits; > + SIZE_T MaximumStackSize; > + SIZE_T CommittedStackSize; > + ULONG SubSystemType; > WORD SubsystemVersionLow; > WORD SubsystemVersionHigh; > - ULONG Unknown1; > + ULONG GpValue; > ULONG ImageCharacteristics; > - ULONG ImageMachineType; > - ULONG Unknown2[3]; > + USHORT DllCharacteristics; > + USHORT Machine; > + BOOLEAN ImageContainsCode; > + UCHAR ImageFlags; > + ULONG LoaderFlags; > + ULONG ImageFileSize; > + ULONG CheckSum; > } SECTION_IMAGE_INFORMATION, *PSECTION_IMAGE_INFORMATION; > > typedef struct _LPC_SECTION_WRITE { > > >

9 years, 6 months

Re: [ros-dev] [ros-diffs] [cgutman] 66511: [PCI] - Handle 64-bit PCI base address registers (BARs) - Fix maximum address in resource requirements for 20-bit resources - Fix flags on memory and I/O port resources [NTOS] - Fi...

by Alex Ionescu

Just make pcix work already Best regards, Alex Ionescu On Sat, Feb 28, 2015 at 11:52 PM, <cgutman(a)svn.reactos.org> wrote: > Author: cgutman > Date: Sun Mar 1 07:52:32 2015 > New Revision: 66511 > > URL: http://svn.reactos.org/svn/reactos?rev=66511&view=rev > Log: > [PCI] > - Handle 64-bit PCI base address registers (BARs) > - Fix maximum address in resource requirements for 20-bit resources > - Fix flags on memory and I/O port resources > [NTOS] > - Fix handling of 64-bit resources > > Modified: > trunk/reactos/drivers/bus/pci/pdo.c > trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c > > Modified: trunk/reactos/drivers/bus/pci/pdo.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pdo.c?rev=… > > ============================================================================== > --- trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] (original) > +++ trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] Sun Mar 1 07:52:32 > 2015 > @@ -21,6 +21,9 @@ > #define DBGPRINT(...) > #endif > > +#define PCI_ADDRESS_MEMORY_ADDRESS_MASK_64 0xfffffffffffffff0ull > +#define PCI_ADDRESS_IO_ADDRESS_MASK_64 0xfffffffffffffffcull > + > /*** PRIVATE > *****************************************************************/ > > static NTSTATUS > @@ -191,80 +194,159 @@ > return STATUS_SUCCESS; > } > > +static BOOLEAN > +PdoReadPciBar(PPDO_DEVICE_EXTENSION DeviceExtension, > + ULONG Offset, > + PULONG OriginalValue, > + PULONG NewValue) > +{ > + ULONG Size; > + ULONG AllOnes; > + > + /* Read the original value */ > + Size = HalGetBusDataByOffset(PCIConfiguration, > + DeviceExtension->PciDevice->BusNumber, > + > DeviceExtension->PciDevice->SlotNumber.u.AsULONG, > + OriginalValue, > + Offset, > + sizeof(ULONG)); > + if (Size != sizeof(ULONG)) > + { > + DPRINT1("Wrong size %lu\n", Size); > + return FALSE; > + } > + > + /* Write all ones to determine which bits are held to zero */ > + AllOnes = MAXULONG; > + Size = HalSetBusDataByOffset(PCIConfiguration, > + DeviceExtension->PciDevice->BusNumber, > + > DeviceExtension->PciDevice->SlotNumber.u.AsULONG, > + &AllOnes, > + Offset, > + sizeof(ULONG)); > + if (Size != sizeof(ULONG)) > + { > + DPRINT1("Wrong size %lu\n", Size); > + return FALSE; > + } > + > + /* Get the range length */ > + Size = HalGetBusDataByOffset(PCIConfiguration, > + DeviceExtension->PciDevice->BusNumber, > + > DeviceExtension->PciDevice->SlotNumber.u.AsULONG, > + NewValue, > + Offset, > + sizeof(ULONG)); > + if (Size != sizeof(ULONG)) > + { > + DPRINT1("Wrong size %lu\n", Size); > + return FALSE; > + } > + > + /* Restore original value */ > + Size = HalSetBusDataByOffset(PCIConfiguration, > + DeviceExtension->PciDevice->BusNumber, > + > DeviceExtension->PciDevice->SlotNumber.u.AsULONG, > + OriginalValue, > + Offset, > + sizeof(ULONG)); > + if (Size != sizeof(ULONG)) > + { > + DPRINT1("Wrong size %lu\n", Size); > + return FALSE; > + } > + > + return TRUE; > +} > > static BOOLEAN > PdoGetRangeLength(PPDO_DEVICE_EXTENSION DeviceExtension, > - ULONG Offset, > - PULONG Base, > - PULONG Length, > - PULONG Flags) > -{ > - ULONG OrigValue; > - ULONG BaseValue; > - ULONG NewValue; > - ULONG Size; > - ULONG XLength; > - > - /* Save original value */ > - Size= HalGetBusDataByOffset(PCIConfiguration, > - DeviceExtension->PciDevice->BusNumber, > - > DeviceExtension->PciDevice->SlotNumber.u.AsULONG, > - &OrigValue, > - Offset, > - sizeof(ULONG)); > - if (Size != sizeof(ULONG)) > - { > - DPRINT1("Wrong size %lu\n", Size); > + UCHAR Bar, > + PULONGLONG Base, > + PULONGLONG Length, > + PULONG Flags, > + PUCHAR NextBar, > + PULONGLONG MaximumAddress) > +{ > + union { > + struct { > + ULONG Bar0; > + ULONG Bar1; > + } Bars; > + ULONGLONG Bar; > + } OriginalValue; > + union { > + struct { > + ULONG Bar0; > + ULONG Bar1; > + } Bars; > + ULONGLONG Bar; > + } NewValue; > + ULONG Offset; > + > + /* Compute the offset of this BAR in PCI config space */ > + Offset = 0x10 + Bar * 4; > + > + /* Assume this is a 32-bit BAR until we find wrong */ > + *NextBar = Bar + 1; > + > + /* Initialize BAR values to zero */ > + OriginalValue.Bar = 0ULL; > + NewValue.Bar = 0ULL; > + > + /* Read the first BAR */ > + if (!PdoReadPciBar(DeviceExtension, Offset, > + &OriginalValue.Bars.Bar0, > + &NewValue.Bars.Bar0)) > + { > return FALSE; > } > - > - BaseValue = (OrigValue & PCI_ADDRESS_IO_SPACE) > - ? (OrigValue & PCI_ADDRESS_IO_ADDRESS_MASK) > - : (OrigValue & PCI_ADDRESS_MEMORY_ADDRESS_MASK); > - > - *Base = BaseValue; > - > - /* Set magic value */ > - NewValue = MAXULONG; > - Size= HalSetBusDataByOffset(PCIConfiguration, > - DeviceExtension->PciDevice->BusNumber, > - > DeviceExtension->PciDevice->SlotNumber.u.AsULONG, > - &NewValue, > - Offset, > - sizeof(ULONG)); > - if (Size != sizeof(ULONG)) > - { > - DPRINT1("Wrong size %lu\n", Size); > - return FALSE; > - } > - > - /* Get the range length */ > - Size= HalGetBusDataByOffset(PCIConfiguration, > - DeviceExtension->PciDevice->BusNumber, > - > DeviceExtension->PciDevice->SlotNumber.u.AsULONG, > - &NewValue, > - Offset, > - sizeof(ULONG)); > - if (Size != sizeof(ULONG)) > - { > - DPRINT1("Wrong size %lu\n", Size); > - return FALSE; > - } > - > - /* Restore original value */ > - Size= HalSetBusDataByOffset(PCIConfiguration, > - DeviceExtension->PciDevice->BusNumber, > - > DeviceExtension->PciDevice->SlotNumber.u.AsULONG, > - &OrigValue, > - Offset, > - sizeof(ULONG)); > - if (Size != sizeof(ULONG)) > - { > - DPRINT1("Wrong size %lu\n", Size); > - return FALSE; > - } > - > - if (NewValue == 0) > + > + /* Check if this is a memory BAR */ > + if (!(OriginalValue.Bars.Bar0 & PCI_ADDRESS_IO_SPACE)) > + { > + /* Write the maximum address if the caller asked for it */ > + if (MaximumAddress != NULL) > + { > + if ((OriginalValue.Bars.Bar0 & PCI_ADDRESS_MEMORY_TYPE_MASK) > == PCI_TYPE_32BIT) > + { > + *MaximumAddress = 0x00000000FFFFFFFFULL; > + } > + else if ((OriginalValue.Bars.Bar0 & > PCI_ADDRESS_MEMORY_TYPE_MASK) == PCI_TYPE_20BIT) > + { > + *MaximumAddress = 0x00000000000FFFFFULL; > + } > + else if ((OriginalValue.Bars.Bar0 & > PCI_ADDRESS_MEMORY_TYPE_MASK) == PCI_TYPE_64BIT) > + { > + *MaximumAddress = 0xFFFFFFFFFFFFFFFFULL; > + } > + } > + > + /* Check if this is a 64-bit BAR */ > + if ((OriginalValue.Bars.Bar0 & PCI_ADDRESS_MEMORY_TYPE_MASK) == > PCI_TYPE_64BIT) > + { > + /* We've now consumed the next BAR too */ > + *NextBar = Bar + 2; > + > + /* Read the next BAR */ > + if (!PdoReadPciBar(DeviceExtension, Offset + 4, > + &OriginalValue.Bars.Bar1, > + &NewValue.Bars.Bar1)) > + { > + return FALSE; > + } > + } > + } > + else > + { > + /* Write the maximum I/O port address */ > + if (MaximumAddress != NULL) > + { > + *MaximumAddress = 0x00000000FFFFFFFFULL; > + } > + } > + > + if (NewValue.Bar == 0) > { > DPRINT("Unused address register\n"); > *Base = 0; > @@ -272,48 +354,16 @@ > *Flags = 0; > return TRUE; > } > - > - XLength = ~((NewValue & PCI_ADDRESS_IO_SPACE) > - ? (NewValue & PCI_ADDRESS_IO_ADDRESS_MASK) > - : (NewValue & PCI_ADDRESS_MEMORY_ADDRESS_MASK)) + 1; > - > -#if 0 > - DbgPrint("BaseAddress 0x%08lx Length 0x%08lx", > - BaseValue, XLength); > - > - if (NewValue & PCI_ADDRESS_IO_SPACE) > - { > - DbgPrint(" IO range"); > - } > - else > - { > - DbgPrint(" Memory range"); > - if ((NewValue & PCI_ADDRESS_MEMORY_TYPE_MASK) == 0) > - { > - DbgPrint(" in 32-Bit address space"); > - } > - else if ((NewValue & PCI_ADDRESS_MEMORY_TYPE_MASK) == 2) > - { > - DbgPrint(" below 1BM "); > - } > - else if ((NewValue & PCI_ADDRESS_MEMORY_TYPE_MASK) == 4) > - { > - DbgPrint(" in 64-Bit address space"); > - } > - > - if (NewValue & PCI_ADDRESS_MEMORY_PREFETCHABLE) > - { > - DbgPrint(" prefetchable"); > - } > - } > - > - DbgPrint("\n"); > -#endif > - > - *Length = XLength; > - *Flags = (NewValue & PCI_ADDRESS_IO_SPACE) > - ? (NewValue & ~PCI_ADDRESS_IO_ADDRESS_MASK) > - : (NewValue & ~PCI_ADDRESS_MEMORY_ADDRESS_MASK); > + > + *Base = OriginalValue.Bar & PCI_ADDRESS_MEMORY_ADDRESS_MASK_64; > + > + *Length = ~((NewValue.Bar & PCI_ADDRESS_IO_SPACE) > + ? (NewValue.Bar & PCI_ADDRESS_IO_ADDRESS_MASK_64) > + : (NewValue.Bar & PCI_ADDRESS_MEMORY_ADDRESS_MASK_64)) + > 1; > + > + *Flags = (NewValue.Bar & PCI_ADDRESS_IO_SPACE) > + ? (NewValue.Bar & ~PCI_ADDRESS_IO_ADDRESS_MASK_64) > + : (NewValue.Bar & ~PCI_ADDRESS_MEMORY_ADDRESS_MASK_64); > > return TRUE; > } > @@ -332,10 +382,11 @@ > ULONG Size; > ULONG ResCount = 0; > ULONG ListSize; > - ULONG i; > - ULONG Base; > - ULONG Length; > + UCHAR Bar; > + ULONGLONG Base; > + ULONGLONG Length; > ULONG Flags; > + ULONGLONG MaximumAddress; > > UNREFERENCED_PARAMETER(IrpSp); > DPRINT("PdoQueryResourceRequirements() called\n"); > @@ -361,13 +412,15 @@ > ResCount = 0; > if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_DEVICE_TYPE) > { > - for (i = 0; i < PCI_TYPE0_ADDRESSES; i++) > + for (Bar = 0; Bar < PCI_TYPE0_ADDRESSES;) > { > if (!PdoGetRangeLength(DeviceExtension, > - 0x10 + i * 4, > + Bar, > &Base, > &Length, > - &Flags)) > + &Flags, > + &Bar, > + NULL)) > break; > > if (Length != 0) > @@ -381,13 +434,15 @@ > } > else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_BRIDGE_TYPE) > { > - for (i = 0; i < PCI_TYPE1_ADDRESSES; i++) > + for (Bar = 0; Bar < PCI_TYPE1_ADDRESSES;) > { > if (!PdoGetRangeLength(DeviceExtension, > - 0x10 + i * 4, > + Bar, > &Base, > &Length, > - &Flags)) > + &Flags, > + &Bar, > + NULL)) > break; > > if (Length != 0) > @@ -442,13 +497,15 @@ > Descriptor = &ResourceList->List[0].Descriptors[0]; > if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_DEVICE_TYPE) > { > - for (i = 0; i < PCI_TYPE0_ADDRESSES; i++) > + for (Bar = 0; Bar < PCI_TYPE0_ADDRESSES;) > { > if (!PdoGetRangeLength(DeviceExtension, > - 0x10 + i * 4, > + Bar, > &Base, > &Length, > - &Flags)) > + &Flags, > + &Bar, > + &MaximumAddress)) > { > DPRINT1("PdoGetRangeLength() failed\n"); > break; > @@ -472,19 +529,20 @@ > > Descriptor->u.Port.Length = Length; > Descriptor->u.Port.Alignment = 1; > - Descriptor->u.Port.MinimumAddress.QuadPart = > (ULONGLONG)Base; > - Descriptor->u.Port.MaximumAddress.QuadPart = > (ULONGLONG)(Base + Length - 1); > + Descriptor->u.Port.MinimumAddress.QuadPart = Base; > + Descriptor->u.Port.MaximumAddress.QuadPart = Base + > Length - 1; > } > else > { > Descriptor->Type = CmResourceTypeMemory; > Descriptor->ShareDisposition = > CmResourceShareDeviceExclusive; > - Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE; > + Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE | > + (Flags & PCI_ADDRESS_MEMORY_PREFETCHABLE) ? > CM_RESOURCE_MEMORY_PREFETCHABLE : 0; > > Descriptor->u.Memory.Length = Length; > Descriptor->u.Memory.Alignment = 1; > - Descriptor->u.Memory.MinimumAddress.QuadPart = > (ULONGLONG)Base; > - Descriptor->u.Memory.MaximumAddress.QuadPart = > (ULONGLONG)(Base + Length - 1); > + Descriptor->u.Memory.MinimumAddress.QuadPart = Base; > + Descriptor->u.Memory.MaximumAddress.QuadPart = Base + > Length - 1; > } > Descriptor++; > > @@ -500,19 +558,20 @@ > > Descriptor->u.Port.Length = Length; > Descriptor->u.Port.Alignment = Length; > - Descriptor->u.Port.MinimumAddress.QuadPart = (ULONGLONG)0; > - Descriptor->u.Port.MaximumAddress.QuadPart = > (ULONGLONG)0x00000000FFFFFFFF; > + Descriptor->u.Port.MinimumAddress.QuadPart = 0; > + Descriptor->u.Port.MaximumAddress.QuadPart = > MaximumAddress; > } > else > { > Descriptor->Type = CmResourceTypeMemory; > Descriptor->ShareDisposition = > CmResourceShareDeviceExclusive; > - Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE; > + Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE | > + (Flags & PCI_ADDRESS_MEMORY_PREFETCHABLE) ? > CM_RESOURCE_MEMORY_PREFETCHABLE : 0; > > Descriptor->u.Memory.Length = Length; > Descriptor->u.Memory.Alignment = Length; > - Descriptor->u.Port.MinimumAddress.QuadPart = (ULONGLONG)0; > - Descriptor->u.Port.MaximumAddress.QuadPart = > (ULONGLONG)0x00000000FFFFFFFF; > + Descriptor->u.Port.MinimumAddress.QuadPart = 0; > + Descriptor->u.Port.MaximumAddress.QuadPart = > MaximumAddress; > } > Descriptor++; > } > @@ -532,13 +591,15 @@ > } > else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_BRIDGE_TYPE) > { > - for (i = 0; i < PCI_TYPE1_ADDRESSES; i++) > + for (Bar = 0; Bar < PCI_TYPE1_ADDRESSES;) > { > if (!PdoGetRangeLength(DeviceExtension, > - 0x10 + i * 4, > + Bar, > &Base, > &Length, > - &Flags)) > + &Flags, > + &Bar, > + &MaximumAddress)) > { > DPRINT1("PdoGetRangeLength() failed\n"); > break; > @@ -562,19 +623,20 @@ > > Descriptor->u.Port.Length = Length; > Descriptor->u.Port.Alignment = 1; > - Descriptor->u.Port.MinimumAddress.QuadPart = > (ULONGLONG)Base; > - Descriptor->u.Port.MaximumAddress.QuadPart = > (ULONGLONG)(Base + Length - 1); > + Descriptor->u.Port.MinimumAddress.QuadPart = Base; > + Descriptor->u.Port.MaximumAddress.QuadPart = Base + > Length - 1; > } > else > { > Descriptor->Type = CmResourceTypeMemory; > Descriptor->ShareDisposition = > CmResourceShareDeviceExclusive; > - Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE; > + Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE | > + (Flags & PCI_ADDRESS_MEMORY_PREFETCHABLE) ? > CM_RESOURCE_MEMORY_PREFETCHABLE : 0; > > Descriptor->u.Memory.Length = Length; > Descriptor->u.Memory.Alignment = 1; > - Descriptor->u.Memory.MinimumAddress.QuadPart = > (ULONGLONG)Base; > - Descriptor->u.Memory.MaximumAddress.QuadPart = > (ULONGLONG)(Base + Length - 1); > + Descriptor->u.Memory.MinimumAddress.QuadPart = Base; > + Descriptor->u.Memory.MaximumAddress.QuadPart = Base + > Length - 1; > } > Descriptor++; > > @@ -590,19 +652,20 @@ > > Descriptor->u.Port.Length = Length; > Descriptor->u.Port.Alignment = Length; > - Descriptor->u.Port.MinimumAddress.QuadPart = (ULONGLONG)0; > - Descriptor->u.Port.MaximumAddress.QuadPart = > (ULONGLONG)0x00000000FFFFFFFF; > + Descriptor->u.Port.MinimumAddress.QuadPart = 0; > + Descriptor->u.Port.MaximumAddress.QuadPart = > MaximumAddress; > } > else > { > Descriptor->Type = CmResourceTypeMemory; > Descriptor->ShareDisposition = > CmResourceShareDeviceExclusive; > - Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE; > + Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE | > + (Flags & PCI_ADDRESS_MEMORY_PREFETCHABLE) ? > CM_RESOURCE_MEMORY_PREFETCHABLE : 0; > > Descriptor->u.Memory.Length = Length; > Descriptor->u.Memory.Alignment = Length; > - Descriptor->u.Port.MinimumAddress.QuadPart = (ULONGLONG)0; > - Descriptor->u.Port.MaximumAddress.QuadPart = > (ULONGLONG)0x00000000FFFFFFFF; > + Descriptor->u.Port.MinimumAddress.QuadPart = 0; > + Descriptor->u.Port.MaximumAddress.QuadPart = > MaximumAddress; > } > Descriptor++; > } > @@ -645,9 +708,9 @@ > ULONG Size; > ULONG ResCount = 0; > ULONG ListSize; > - ULONG i; > - ULONG Base; > - ULONG Length; > + UCHAR Bar; > + ULONGLONG Base; > + ULONGLONG Length; > ULONG Flags; > > DPRINT("PdoQueryResources() called\n"); > @@ -674,13 +737,15 @@ > ResCount = 0; > if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_DEVICE_TYPE) > { > - for (i = 0; i < PCI_TYPE0_ADDRESSES; i++) > + for (Bar = 0; Bar < PCI_TYPE0_ADDRESSES;) > { > if (!PdoGetRangeLength(DeviceExtension, > - 0x10 + i * 4, > + Bar, > &Base, > &Length, > - &Flags)) > + &Flags, > + &Bar, > + NULL)) > break; > > if (Length) > @@ -694,13 +759,15 @@ > } > else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_BRIDGE_TYPE) > { > - for (i = 0; i < PCI_TYPE1_ADDRESSES; i++) > + for (Bar = 0; Bar < PCI_TYPE1_ADDRESSES;) > { > if (!PdoGetRangeLength(DeviceExtension, > - 0x10 + i * 4, > + Bar, > &Base, > &Length, > - &Flags)) > + &Flags, > + &Bar, > + NULL)) > break; > > if (Length != 0) > @@ -749,17 +816,16 @@ > Descriptor = &PartialList->PartialDescriptors[0]; > if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_DEVICE_TYPE) > { > - for (i = 0; i < PCI_TYPE0_ADDRESSES; i++) > + for (Bar = 0; Bar < PCI_TYPE0_ADDRESSES;) > { > if (!PdoGetRangeLength(DeviceExtension, > - 0x10 + i * 4, > + Bar, > &Base, > &Length, > - &Flags)) > - { > - DPRINT1("PdoGetRangeLength() failed\n"); > + &Flags, > + &Bar, > + NULL)) > break; > - } > > if (Length == 0) > { > @@ -771,7 +837,9 @@ > { > Descriptor->Type = CmResourceTypePort; > Descriptor->ShareDisposition = > CmResourceShareDeviceExclusive; > - Descriptor->Flags = CM_RESOURCE_PORT_IO; > + Descriptor->Flags = CM_RESOURCE_PORT_IO | > + CM_RESOURCE_PORT_16_BIT_DECODE | > + CM_RESOURCE_PORT_POSITIVE_DECODE; > Descriptor->u.Port.Start.QuadPart = (ULONGLONG)Base; > Descriptor->u.Port.Length = Length; > > @@ -782,7 +850,8 @@ > { > Descriptor->Type = CmResourceTypeMemory; > Descriptor->ShareDisposition = > CmResourceShareDeviceExclusive; > - Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE; > + Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE | > + (Flags & PCI_ADDRESS_MEMORY_PREFETCHABLE) ? > CM_RESOURCE_MEMORY_PREFETCHABLE : 0; > Descriptor->u.Memory.Start.QuadPart = (ULONGLONG)Base; > Descriptor->u.Memory.Length = Length; > > @@ -811,17 +880,16 @@ > } > else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_BRIDGE_TYPE) > { > - for (i = 0; i < PCI_TYPE1_ADDRESSES; i++) > + for (Bar = 0; Bar < PCI_TYPE1_ADDRESSES;) > { > if (!PdoGetRangeLength(DeviceExtension, > - 0x10 + i * 4, > + Bar, > &Base, > &Length, > - &Flags)) > - { > - DPRINT1("PdoGetRangeLength() failed\n"); > + &Flags, > + &Bar, > + NULL)) > break; > - } > > if (Length == 0) > { > @@ -833,7 +901,9 @@ > { > Descriptor->Type = CmResourceTypePort; > Descriptor->ShareDisposition = > CmResourceShareDeviceExclusive; > - Descriptor->Flags = CM_RESOURCE_PORT_IO; > + Descriptor->Flags = CM_RESOURCE_PORT_IO | > + CM_RESOURCE_PORT_16_BIT_DECODE | > + CM_RESOURCE_PORT_POSITIVE_DECODE; > Descriptor->u.Port.Start.QuadPart = (ULONGLONG)Base; > Descriptor->u.Port.Length = Length; > > @@ -844,7 +914,8 @@ > { > Descriptor->Type = CmResourceTypeMemory; > Descriptor->ShareDisposition = > CmResourceShareDeviceExclusive; > - Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE; > + Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE | > + (Flags & PCI_ADDRESS_MEMORY_PREFETCHABLE) ? > CM_RESOURCE_MEMORY_PREFETCHABLE : 0; > Descriptor->u.Memory.Start.QuadPart = (ULONGLONG)Base; > Descriptor->u.Memory.Length = Length; > > > Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.… > > ============================================================================== > --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] Sun Mar 1 > 07:52:32 2015 > @@ -73,7 +73,7 @@ > IN PIO_RESOURCE_DESCRIPTOR IoDesc, > OUT PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDesc) > { > - LONGLONG Start; > + ULONGLONG Start; > CM_PARTIAL_RESOURCE_DESCRIPTOR ConflictingDesc; > > ASSERT(IoDesc->Type == CmDesc->Type); > @@ -82,16 +82,16 @@ > /* HACK */ > if (IoDesc->u.Memory.Alignment == 0) IoDesc->u.Memory.Alignment = 1; > > - for (Start = IoDesc->u.Memory.MinimumAddress.QuadPart; > - Start <= IoDesc->u.Memory.MaximumAddress.QuadPart - > IoDesc->u.Memory.Length + 1; > + for (Start = (ULONGLONG)IoDesc->u.Memory.MinimumAddress.QuadPart; > + Start <= (ULONGLONG)IoDesc->u.Memory.MaximumAddress.QuadPart - > IoDesc->u.Memory.Length + 1; > Start += IoDesc->u.Memory.Alignment) > { > CmDesc->u.Memory.Length = IoDesc->u.Memory.Length; > - CmDesc->u.Memory.Start.QuadPart = Start; > + CmDesc->u.Memory.Start.QuadPart = (LONGLONG)Start; > > if (IopCheckDescriptorForConflict(CmDesc, &ConflictingDesc)) > { > - Start += ConflictingDesc.u.Memory.Start.QuadPart + > + Start += (ULONGLONG)ConflictingDesc.u.Memory.Start.QuadPart + > ConflictingDesc.u.Memory.Length; > } > else > @@ -110,7 +110,7 @@ > IN PIO_RESOURCE_DESCRIPTOR IoDesc, > OUT PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDesc) > { > - LONGLONG Start; > + ULONGLONG Start; > CM_PARTIAL_RESOURCE_DESCRIPTOR ConflictingDesc; > > ASSERT(IoDesc->Type == CmDesc->Type); > @@ -119,16 +119,16 @@ > /* HACK */ > if (IoDesc->u.Port.Alignment == 0) IoDesc->u.Port.Alignment = 1; > > - for (Start = IoDesc->u.Port.MinimumAddress.QuadPart; > - Start <= IoDesc->u.Port.MaximumAddress.QuadPart - > IoDesc->u.Port.Length + 1; > + for (Start = (ULONGLONG)IoDesc->u.Port.MinimumAddress.QuadPart; > + Start <= (ULONGLONG)IoDesc->u.Port.MaximumAddress.QuadPart - > IoDesc->u.Port.Length + 1; > Start += IoDesc->u.Port.Alignment) > { > CmDesc->u.Port.Length = IoDesc->u.Port.Length; > - CmDesc->u.Port.Start.QuadPart = Start; > + CmDesc->u.Port.Start.QuadPart = (LONGLONG)Start; > > if (IopCheckDescriptorForConflict(CmDesc, &ConflictingDesc)) > { > - Start += ConflictingDesc.u.Port.Start.QuadPart + > ConflictingDesc.u.Port.Length; > + Start += (ULONGLONG)ConflictingDesc.u.Port.Start.QuadPart + > ConflictingDesc.u.Port.Length; > } > else > { > @@ -300,8 +300,8 @@ > case CmResourceTypePort: > /* Make sure the length matches and it satisfies > our address range */ > if (CmDesc->u.Memory.Length == > IoDesc->u.Memory.Length && > - CmDesc->u.Memory.Start.QuadPart >= > IoDesc->u.Memory.MinimumAddress.QuadPart && > - CmDesc->u.Memory.Start.QuadPart + > CmDesc->u.Memory.Length - 1 <= IoDesc->u.Memory.MaximumAddress.QuadPart) > + (ULONGLONG)CmDesc->u.Memory.Start.QuadPart >= > (ULONGLONG)IoDesc->u.Memory.MinimumAddress.QuadPart && > + (ULONGLONG)CmDesc->u.Memory.Start.QuadPart + > CmDesc->u.Memory.Length - 1 <= > (ULONGLONG)IoDesc->u.Memory.MaximumAddress.QuadPart) > { > /* Found it */ > Matched = TRUE; > @@ -564,11 +564,11 @@ > switch (ResDesc->Type) > { > case CmResourceTypeMemory: > - if ((ResDesc->u.Memory.Start.QuadPart < > ResDesc2->u.Memory.Start.QuadPart && > - ResDesc->u.Memory.Start.QuadPart + > ResDesc->u.Memory.Length > > - ResDesc2->u.Memory.Start.QuadPart) || > (ResDesc2->u.Memory.Start.QuadPart < > - ResDesc->u.Memory.Start.QuadPart && > ResDesc2->u.Memory.Start.QuadPart + > - ResDesc2->u.Memory.Length > > ResDesc->u.Memory.Start.QuadPart)) > + if (((ULONGLONG)ResDesc->u.Memory.Start.QuadPart < > (ULONGLONG)ResDesc2->u.Memory.Start.QuadPart && > + (ULONGLONG)ResDesc->u.Memory.Start.QuadPart + > ResDesc->u.Memory.Length > > + (ULONGLONG)ResDesc2->u.Memory.Start.QuadPart) || > ((ULONGLONG)ResDesc2->u.Memory.Start.QuadPart < > + (ULONGLONG)ResDesc->u.Memory.Start.QuadPart && > (ULONGLONG)ResDesc2->u.Memory.Start.QuadPart + > + ResDesc2->u.Memory.Length > > (ULONGLONG)ResDesc->u.Memory.Start.QuadPart)) > { > if (!Silent) > { > @@ -585,11 +585,11 @@ > break; > > case CmResourceTypePort: > - if ((ResDesc->u.Port.Start.QuadPart < > ResDesc2->u.Port.Start.QuadPart && > - ResDesc->u.Port.Start.QuadPart + > ResDesc->u.Port.Length > > - ResDesc2->u.Port.Start.QuadPart) || > (ResDesc2->u.Port.Start.QuadPart < > - ResDesc->u.Port.Start.QuadPart && > ResDesc2->u.Port.Start.QuadPart + > - ResDesc2->u.Port.Length > > ResDesc->u.Port.Start.QuadPart)) > + if (((ULONGLONG)ResDesc->u.Port.Start.QuadPart < > (ULONGLONG)ResDesc2->u.Port.Start.QuadPart && > + (ULONGLONG)ResDesc->u.Port.Start.QuadPart + > ResDesc->u.Port.Length > > + (ULONGLONG)ResDesc2->u.Port.Start.QuadPart) || > ((ULONGLONG)ResDesc2->u.Port.Start.QuadPart < > + (ULONGLONG)ResDesc->u.Port.Start.QuadPart && > (ULONGLONG)ResDesc2->u.Port.Start.QuadPart + > + ResDesc2->u.Port.Length > > (ULONGLONG)ResDesc->u.Port.Start.QuadPart)) > { > if (!Silent) > { > > >

9 years, 6 months

Windows Server 2003 Testbot is live!

by Colin Finck

Hi all, After a long, long time, we finally have a Testbot regularly running our Wine tests and API tests under our target platform Windows Server 2003. The VM is actually based on Windows Home Server, which is a cheap Windows Server 2003 SP2 edition. The first successful test results are here: https://reactos.org/sites/all/modules/reactos/testman/compare.php?ids=34839 Okay, I have to admit this already required manual intervention. Test msi:install reproducibly hangs with the error message "The process cannot access the file because another process has locked a portion of the file". I expect all of this to still need some tweaking here and there. Please reply to this mail with all your tweaking suggestions and I see what I can do. Have fun, Colin

9 years, 6 months

Re: [ros-dev] [ros-diffs] [hbelusca] 66538: [SHLWAPI]: Remove some Wine madness. CORE-8936.

by Thomas Faber

Hmm what's the point of this? If it doesn't break anything, let's not create a ROS-diff? On 2015-03-02 02:15, hbelusca(a)svn.reactos.org wrote: > Author: hbelusca > Date: Mon Mar 2 01:15:00 2015 > New Revision: 66538 > > URL: http://svn.reactos.org/svn/reactos?rev=66538&view=rev > Log: > [SHLWAPI]: Remove some Wine madness. CORE-8936. > > Modified: > trunk/reactos/dll/win32/shlwapi/path.c > > Modified: trunk/reactos/dll/win32/shlwapi/path.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/path.c?r… > ============================================================================== > --- trunk/reactos/dll/win32/shlwapi/path.c [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/shlwapi/path.c [iso-8859-1] Mon Mar 2 01:15:00 2015 > @@ -21,22 +21,7 @@ > > #include "precomp.h" > > -/* Get a function pointer from a DLL handle */ > -#define GET_FUNC(func, module, name, fail) \ > - do { \ > - if (!func) { \ > - if (!SHLWAPI_h##module && !(SHLWAPI_h##module = LoadLibraryA(#module ".dll"))) return fail; \ > - func = (fn##func)GetProcAddress(SHLWAPI_h##module, name); \ > - if (!func) return fail; \ > - } \ > - } while (0) > - > -/* DLL handles for late bound calls */ > -static HMODULE SHLWAPI_hshell32; > - > -/* Function pointers for GET_FUNC macro; these need to be global because of gcc bug */ > -typedef BOOL (WINAPI *fnpIsNetDrive)(int); > -static fnpIsNetDrive pIsNetDrive; > +int WINAPI IsNetDrive(int drive); > > HRESULT WINAPI SHGetWebFolderFilePathW(LPCWSTR,LPWSTR,DWORD); > > @@ -3699,8 +3684,7 @@ > dwDriveNum = PathGetDriveNumberA(lpszPath); > if (dwDriveNum == -1) > return FALSE; > - GET_FUNC(pIsNetDrive, shell32, (LPCSTR)66, FALSE); /* ord 66 = shell32.IsNetDrive */ > - return pIsNetDrive(dwDriveNum); > + return IsNetDrive(dwDriveNum); > } > > /************************************************************************* > @@ -3721,8 +3705,7 @@ > dwDriveNum = PathGetDriveNumberW(lpszPath); > if (dwDriveNum == -1) > return FALSE; > - GET_FUNC(pIsNetDrive, shell32, (LPCSTR)66, FALSE); /* ord 66 = shell32.IsNetDrive */ > - return pIsNetDrive(dwDriveNum); > + return IsNetDrive(dwDriveNum); > } > > /************************************************************************* > >

9 years, 6 months

Cant log in jira

by Alexander Rechitskiy

9 years, 6 months

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-dev