Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 40215: - Fix ICMP
by cgutman＠svn.reactos.org 25 Mar '09

25 Mar '09

Author: cgutman Date: Wed Mar 25 05:28:40 2009 New Revision: 40215 URL: http://svn.reactos.org/svn/reactos?rev=40215&view=rev Log: - Fix ICMP Modified: trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c Modified: trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/r… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] Wed Mar 25 05:28:40 2009 @@ -191,7 +191,7 @@ { IP_PACKET Packet; PTA_IP_ADDRESS RemoteAddressTa = (PTA_IP_ADDRESS)ConnInfo->RemoteAddress; - IP_ADDRESS RemoteAddress; + IP_ADDRESS RemoteAddress, LocalAddress; USHORT RemotePort; NTSTATUS Status; PNEIGHBOR_CACHE_ENTRY NCE; @@ -212,10 +212,17 @@ return STATUS_UNSUCCESSFUL; } + LocalAddress = AddrFile->Address; + if (AddrIsUnspecified(&LocalAddress)) + { + if (!IPGetDefaultAddress(&LocalAddress)) + return STATUS_UNSUCCESSFUL; + } + Status = BuildRawIpPacket( &Packet, &RemoteAddress, RemotePort, - &AddrFile->Address, + &LocalAddress, AddrFile->Port, BufferData, DataSize );

1 0

[cgutman] 40214: - Return STATUS_NETWORK_UNREACHABLE if we can't get a route to the remote address
by cgutman＠svn.reactos.org 25 Mar '09

25 Mar '09

Author: cgutman Date: Wed Mar 25 05:10:49 2009 New Revision: 40214 URL: http://svn.reactos.org/svn/reactos?rev=40214&view=rev Log: - Return STATUS_NETWORK_UNREACHABLE if we can't get a route to the remote address Modified: trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/r… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] Wed Mar 25 05:10:49 2009 @@ -227,7 +227,7 @@ if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) { FreeNdisPacket(Packet.NdisPacket); - return STATUS_UNSUCCESSFUL; + return STATUS_NETWORK_UNREACHABLE; } TI_DbgPrint(MID_TRACE,("About to send datagram\n")); Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Wed Mar 25 05:10:49 2009 @@ -526,6 +526,9 @@ case OSK_EAGAIN: Status = STATUS_PENDING; break; default: Status = STATUS_INVALID_CONNECTION; break; } + + if (Status != STATUS_SUCCESS) + DbgPrint("%d -> %x\n", OskitError, Status); TI_DbgPrint(DEBUG_TCP,("Error %d -> %x\n", OskitError, Status)); return Status;

1 0

[cgutman] 40213: - Set the IP_PACKET_FLAG_RAW flag on Raw IP packets
by cgutman＠svn.reactos.org 25 Mar '09

25 Mar '09

Author: cgutman Date: Wed Mar 25 05:04:01 2009 New Revision: 40213 URL: http://svn.reactos.org/svn/reactos?rev=40213&view=rev Log: - Set the IP_PACKET_FLAG_RAW flag on Raw IP packets Modified: trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c Modified: trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/r… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] Wed Mar 25 05:04:01 2009 @@ -156,6 +156,8 @@ RtlCopyMemory( Packet->Data, DataBuffer, DataLen ); + Packet->Flags |= IP_PACKET_FLAG_RAW; + TI_DbgPrint(MID_TRACE, ("Displaying packet\n")); DISPLAY_IP_PACKET(Packet);

1 0

[jimtabor] 40212: - Write new simplified NtGdiDeleteObjectApp based on test case. - Include internal function GetObjectOwner to support retrieval of owner process ID. - Update GDI_TABLE_ENTRY.
by jimtabor＠svn.reactos.org 25 Mar '09

25 Mar '09

Author: jimtabor Date: Wed Mar 25 04:07:02 2009 New Revision: 40212 URL: http://svn.reactos.org/svn/reactos?rev=40212&view=rev Log: - Write new simplified NtGdiDeleteObjectApp based on test case. - Include internal function GetObjectOwner to support retrieval of owner process ID. - Update GDI_TABLE_ENTRY. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/subsystems/win32/win32k/include/gdiobj.h trunk/reactos/subsystems/win32/win32k/objects/dclife.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] Wed Mar 25 04:07:02 2009 @@ -219,9 +219,9 @@ union{ /* temp union structure. */ LONG Type; /* the first 16 bit is the object type including the stock obj flag, the last 16 bits is just the object type */ struct{ - SHORT FullUnique; /* unique */ - CHAR ObjectType; /* objt */ - CHAR Flags; /* Flags */ + USHORT FullUnique; /* unique */ + UCHAR ObjectType; /* objt */ + UCHAR Flags; /* Flags */ };}; PVOID UserData; /* pUser Points to the user mode structure, usually NULL though */ } GDI_TABLE_ENTRY, *PGDI_TABLE_ENTRY; Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] Wed Mar 25 04:07:02 2009 @@ -121,4 +121,6 @@ } #endif +INT FASTCALL GreGetObjectOwner(HGDIOBJ, GDIOBJTYPE); + #endif Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Wed Mar 25 04:07:02 2009 @@ -665,3 +665,34 @@ return IntGdiDeleteDC(DCHandle, FALSE); } +BOOL +APIENTRY +NewNtGdiDeleteObjectApp(HANDLE DCHandle) +{ + GDIOBJTYPE ObjType; + + if (GDI_HANDLE_IS_STOCKOBJ(DCHandle)) return TRUE; + + ObjType = GDI_HANDLE_GET_TYPE(DCHandle) >> GDI_ENTRY_UPPER_SHIFT; + + if (GreGetObjectOwner( DCHandle, ObjType)) + { + switch(ObjType) + { + case GDIObjType_DC_TYPE: + return IntGdiDeleteDC(DCHandle, FALSE); + + case GDIObjType_RGN_TYPE: + case GDIObjType_SURF_TYPE: + case GDIObjType_PAL_TYPE: + case GDIObjType_LFONT_TYPE: + case GDIObjType_BRUSH_TYPE: + return NtGdiDeleteObject((HGDIOBJ) DCHandle); + + default: + return FALSE; + } + } + return (DCHandle != NULL); +} + Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Wed Mar 25 04:07:02 2009 @@ -1608,6 +1608,26 @@ return TRUE; } +INT +FASTCALL +GreGetObjectOwner(HGDIOBJ Handle, GDIOBJTYPE ObjType) +{ + INT Ret = GDI_OBJ_HMGR_RESTRICTED; + + if ( GDI_HANDLE_GET_INDEX(Handle) < GDI_HANDLE_COUNT ) + { + PGDI_TABLE_ENTRY pEntry = &GdiHandleTable->Entries[GDI_HANDLE_GET_INDEX(Handle)]; + + if (pEntry->ObjectType == ObjType) + { + if (pEntry->FullUnique == (GDI_HANDLE_GET_UPPER(Handle) >> GDI_ENTRY_UPPER_SHIFT)) + Ret = pEntry->ProcessId & ~1; + } + } + return Ret; +} + + W32KAPI HANDLE APIENTRY

1 0

[cfinck] 40211: Output "SYSREG_ROSAUTOTEST_FAILURE" for sysreg2 in case of a failure inside rosautotest
by cfinck＠svn.reactos.org 24 Mar '09

24 Mar '09

Author: cfinck Date: Tue Mar 24 23:49:04 2009 New Revision: 40211 URL: http://svn.reactos.org/svn/reactos?rev=40211&view=rev Log: Output "SYSREG_ROSAUTOTEST_FAILURE" for sysreg2 in case of a failure inside rosautotest Modified: trunk/rostests/rosautotest/main.cpp Modified: trunk/rostests/rosautotest/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/main.cpp?rev=… ============================================================================== --- trunk/rostests/rosautotest/main.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/main.cpp [iso-8859-1] Tue Mar 24 23:49:04 2009 @@ -59,7 +59,7 @@ /* Run the tests */ WineTest.Run(); - /* For sysreg */ + /* For sysreg2 */ DbgPrint("SYSREG_CHECKPOINT:THIRDBOOT_COMPLETE\n"); ReturnValue = 0; @@ -84,6 +84,10 @@ StringOut(ss.str()); } + /* For sysreg2 to notice if rosautotest itself failed */ + if(ReturnValue == 1) + DbgPrint("SYSREG_ROSAUTOTEST_FAILURE\n"); + /* Shut down the system if requested, also in case of an exception above */ if(Configuration.DoShutdown() && !ShutdownSystem()) ReturnValue = 1;

1 0

[cfinck] 40210: - Remove the readln function, it did more than it should and had quite a hacky interface The same functionality is implemented inside ProcessDebugData now, with cleaner and no duplicated code :-) - Add more error and result messages - Change the value for "maxcrashes" to 10 (the value used on the Buildslave) - Add more comments - Fix indentation a bit
by cfinck＠svn.reactos.org 24 Mar '09

24 Mar '09

Author: cfinck Date: Tue Mar 24 23:36:53 2009 New Revision: 40210 URL: http://svn.reactos.org/svn/reactos?rev=40210&view=rev Log: - Remove the readln function, it did more than it should and had quite a hacky interface The same functionality is implemented inside ProcessDebugData now, with cleaner and no duplicated code :-) - Add more error and result messages - Change the value for "maxcrashes" to 10 (the value used on the Buildslave) - Add more comments - Fix indentation a bit Modified: trunk/tools/sysreg2/console.c trunk/tools/sysreg2/sysreg.h trunk/tools/sysreg2/sysreg.xml trunk/tools/sysreg2/utils.c trunk/tools/sysreg2/virt.c Modified: trunk/tools/sysreg2/console.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/console.c?rev=40210&… ============================================================================== --- trunk/tools/sysreg2/console.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/console.c [iso-8859-1] Tue Mar 24 23:36:53 2009 @@ -1,20 +1,29 @@ #include "sysreg.h" -bool ProcessDebugData(const char* tty, int timeout, int stage ) +int ProcessDebugData(const char* tty, int timeout, int stage ) { + char buf[512]; + char rbuf[512]; + char* bp; + int got; int ttyfd, i; struct termios ttyattr, rawattr; - bool Ret = true; + int Ret = EXIT_NONCONTINUABLE_ERROR; int KdbgHit = 0; + /* ttyfd is the file descriptor of the virtual COM port */ if ((ttyfd = open(tty, O_NOCTTY | O_RDWR)) < 0) { SysregPrintf("error opening tty\n"); return false; } + /* We also monitor STDIN_FILENO, so a user can cancel the process with ESC */ if (tcgetattr(STDIN_FILENO, &ttyattr) < 0) - return false; + { + SysregPrintf("tcgetattr failed with error %d\n", errno); + return false; + } rawattr = ttyattr; rawattr.c_iflag &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP @@ -25,98 +34,132 @@ rawattr.c_cflag |= CS8; if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &rawattr) < 0) + { + SysregPrintf("tcsetattr failed with error %d\n", errno); return false; + } while (1) { - int ret; struct pollfd fds[] = { { STDIN_FILENO, POLLIN, 0 }, { ttyfd, POLLIN, 0 }, }; - ret = poll(fds, (sizeof(fds) / sizeof(struct pollfd)), timeout); - if (ret < 0) + got = poll(fds, (sizeof(fds) / sizeof(struct pollfd)), timeout); + if (got < 0) { + /* Just try it again on simple errors */ if (errno == EINTR || errno == EAGAIN) continue; + + SysregPrintf("poll failed with error %d\n", errno); goto cleanup; } - else if (ret == 0) + else if (got == 0) { /* timeout */ SysregPrintf("timeout\n"); - Ret = false; + Ret = EXIT_ERROR; goto cleanup; } - for (i=0; i<(sizeof(fds) / sizeof(struct pollfd)); i++) + for (i = 0; i < (sizeof(fds) / sizeof(struct pollfd)); i++) { - if (!fds[i].revents) + /* Wait till we get some input from the fd */ + if (!(fds[i].revents & POLLIN)) continue; - if (fds[i].revents & POLLIN) + + bp = buf; + + /* Read one line or a maximum of 512 bytes into a buffer */ + while (bp - buf < sizeof(buf)) { - char buf[512]; - char rbuf[512]; - int got, sent = 0; - - memset(buf, 0, sizeof(buf)); - got = readln(fds[i].fd, buf, sizeof(buf)); + got = read(fds[i].fd, bp, 1); - if (got == KDBG_READY) + if (got < 0) { - KdbgHit++; - switch (KdbgHit) + SysregPrintf("read failed with error %d\n", errno); + goto cleanup; + } + else if (got == 0) + { + /* No more data */ + break; + } + + /* Also break on newlines */ + if(*bp++ == '\n') + break; + } + + if (bp == buf) + { + /* This usually means the machine shut down (like in 1st or 2nd stage) */ + Ret = EXIT_SHUTDOWN; + goto cleanup; + } + + *bp = 0; + + /* Now check the output */ + if (fds[i].fd == STDIN_FILENO) + { + /* Check whether the user pressed ESC and cancel in that case */ + if (strchr(buf, '\33')) + goto cleanup; + } + else + { + /* Check for "magic" sequences */ + if (strstr(buf, "kdb:>")) + { + ++KdbgHit; + + if (KdbgHit == 1) { - case 1: - safewrite(ttyfd, "bt\r", 3); - continue; - default: - Ret = false; - goto cleanup; - + /* We hit Kdbg for the first time, get a backtrace for the log */ + safewrite(ttyfd, "bt\r", 3); + continue; + } + else + { + /* We hit it yet another time, give up here */ + Ret = EXIT_ERROR; + goto cleanup; } } - else if (got == KDBG_CONFIRM) + else if (strstr(buf, "--- Press q")) { - /* send <Return> - * to get more data */ + /* Send Return to get more data from Kdbg */ safewrite(ttyfd, "\r", 1); continue; } - else if (got <= 0) { + else if (strstr(buf, "SYSREG_ROSAUTOTEST_FAILURE")) + { + /* rosautotest itself has problems, so there's no reason to continue */ + goto cleanup; + } + else if (*AppSettings.Stage[stage].Checkpoint && strstr(buf, AppSettings.Stage[stage].Checkpoint)) + { + /* We reached a checkpoint, so return success */ + Ret = EXIT_CHECKPOINT_REACHED; goto cleanup; } - if (fds[i].fd != STDIN_FILENO) - { - if ((AppSettings.Stage[stage].Checkpoint[0] != '\0') && - (strstr(buf,AppSettings.Stage[stage].Checkpoint) != NULL)) - { - /* Checkpoint reached, - * kill the vm and return success */ - goto cleanup; - } - - if (ResolveAddressFromFile(rbuf, sizeof(rbuf), buf)) - printf("%s", rbuf); - else - printf("%s", buf); - } + if (ResolveAddressFromFile(rbuf, sizeof(rbuf), buf)) + printf("%s", rbuf); else - { - if (got == 1 && buf[0] == '\33') - goto cleanup; - } - + printf("%s", buf); } } - } + } cleanup: tcsetattr(STDIN_FILENO, TCSAFLUSH, &ttyattr); close(ttyfd); + return Ret; } Modified: trunk/tools/sysreg2/sysreg.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/sysreg.h?rev=40210&r… ============================================================================== --- trunk/tools/sysreg2/sysreg.h [iso-8859-1] (original) +++ trunk/tools/sysreg2/sysreg.h [iso-8859-1] Tue Mar 24 23:36:53 2009 @@ -15,29 +15,31 @@ #include <libxml/xpathInternals.h> #include <sys/sysinfo.h> -#define KDBG_CONFIRM -3 -#define KDBG_READY -2 +#define EXIT_CHECKPOINT_REACHED 0 +#define EXIT_SHUTDOWN 1 +#define EXIT_ERROR 2 +#define EXIT_NONCONTINUABLE_ERROR 3 +#define NUM_STAGES 3 typedef struct { - char BootDevice[8]; - char Checkpoint[80]; + char BootDevice[8]; + char Checkpoint[80]; } stage; typedef struct { - int MaxCrashes; - int Timeout; - char Filename[255]; - char Name[80]; - char HardDiskImage[255]; - int ImageSize; - stage Stage[3]; + int MaxCrashes; + int Timeout; + char Filename[255]; + char Name[80]; + char HardDiskImage[255]; + int ImageSize; + stage Stage[3]; } Settings; Settings AppSettings; /* utils.c */ char* ReadFile (const char* filename); -int readln(int fd, char* buffer, int size); ssize_t safewrite(int fd, const void *buf, size_t count); void SysregPrintf(const char* format, ...); @@ -45,7 +47,7 @@ bool LoadSettings(const char* XmlConfig); /* console.c */ -bool ProcessDebugData(const char* tty, int timeout, int stage); +int ProcessDebugData(const char* tty, int timeout, int stage); /* raddr2line.c */ bool GetPackagePath(char* Buffer, int BuffSize, char* Module); Modified: trunk/tools/sysreg2/sysreg.xml URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/sysreg.xml?rev=40210… ============================================================================== --- trunk/tools/sysreg2/sysreg.xml [iso-8859-1] (original) +++ trunk/tools/sysreg2/sysreg.xml [iso-8859-1] Tue Mar 24 23:36:53 2009 @@ -7,7 +7,7 @@ <hdd size="512"/>  - <maxcrashes value="20" /> + <maxcrashes value="10" /> </general> <firststage bootdevice="cdrom"> </firststage> Modified: trunk/tools/sysreg2/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/utils.c?rev=40210&r1… ============================================================================== --- trunk/tools/sysreg2/utils.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/utils.c [iso-8859-1] Tue Mar 24 23:36:53 2009 @@ -1,33 +1,4 @@ #include "sysreg.h" - -int readln(int fd, char* buffer, int size) -{ - char* bp = buffer, ch; - int got; - - while ((bp - buffer < size) && (got = read(fd, bp, 1))) - { - if (fd == STDIN_FILENO) - { - if (*bp == '\33') - return 1; - } - else - { - if (strstr(buffer, "kdb:>")) - return -2; - if (strstr(buffer, "--- Press q")) - return -3; - } - if (*bp++ == '\n') - return (bp - buffer); - } - if (got < 0) - return -1; - if (bp - buffer == size) - while (read(fd, &ch, 1)) - return (bp - buffer); -} ssize_t safewrite(int fd, const void *buf, size_t count) { Modified: trunk/tools/sysreg2/virt.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/virt.c?rev=40210&r1=… ============================================================================== --- trunk/tools/sysreg2/virt.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/virt.c [iso-8859-1] Tue Mar 24 23:36:53 2009 @@ -142,16 +142,15 @@ int main(int argc, char **argv) { - virConnectPtr vConn; + virConnectPtr vConn = NULL; virDomainPtr vDom; virDomainInfo info; int Crashes; int Stage; - int Stages = 3; char qemu_img_cmdline[300]; FILE* file; char config[255]; - int Ret = EXIT_FAILURE; + int Ret = EXIT_NONCONTINUABLE_ERROR; char console[50]; if (argc == 2) @@ -172,12 +171,14 @@ goto cleanup; } + /* If the HD image already exists, delete it */ if (file = fopen(AppSettings.HardDiskImage, "r")) { fclose(file); remove(AppSettings.HardDiskImage); } + /* Create a new HD image */ sprintf(qemu_img_cmdline, "qemu-img create -f qcow2 %s %dM", AppSettings.HardDiskImage, AppSettings.ImageSize); FILE* p = popen(qemu_img_cmdline, "r"); @@ -187,11 +188,9 @@ fgets(buf,100,p); SysregPrintf("%s\n",buf); } - pclose(p); - - Stage = 0; - - while(Stage < Stages) + pclose(p); + + for(Stage = 0; Stage < NUM_STAGES; Stage++) { for(Crashes = 0; Crashes < AppSettings.MaxCrashes; Crashes++) { @@ -209,7 +208,7 @@ SysregPrintf("Domain %s started.\n", virDomainGetName(vDom)); GetConsole(vDom, console); - Ret = (ProcessDebugData(console, AppSettings.Timeout, Stage) ? EXIT_SUCCESS : EXIT_FAILURE); + Ret = ProcessDebugData(console, AppSettings.Timeout, Stage); /* Kill the VM */ virDomainGetInfo(vDom, &info); @@ -223,7 +222,7 @@ /* If we have a checkpoint to reach for success, assume that the application used for running the tests (probably "rosautotest") continues with the next test after a VM restart. */ - if (Ret == EXIT_FAILURE && *AppSettings.Stage[Stage].Checkpoint) + if (Ret == EXIT_ERROR && *AppSettings.Stage[Stage].Checkpoint) SysregPrintf("Crash %d encountered, resuming the testing process\n", Crashes); else break; @@ -235,21 +234,33 @@ break; } - if (Ret == EXIT_FAILURE) - break; - - ++Stage; + if (Ret == EXIT_ERROR || Ret == EXIT_NONCONTINUABLE_ERROR) + break; } cleanup: - virConnectClose(vConn); - - if (Ret == EXIT_SUCCESS) - SysregPrintf("Test status: Reached the checkpoint!\n"); - else - SysregPrintf("Test status: Failed to reach the checkpoint!\n"); + if (vConn) + virConnectClose(vConn); + + switch (Ret) + { + case EXIT_CHECKPOINT_REACHED: + SysregPrintf("Status: Reached the checkpoint!\n"); + break; + + case EXIT_SHUTDOWN: + SysregPrintf("Status: Machine shut down, but did not reach the checkpoint!\n"); + break; + + case EXIT_ERROR: + SysregPrintf("Status: Failed to reach the checkpoint!\n"); + break; + + case EXIT_NONCONTINUABLE_ERROR: + SysregPrintf("Status: Testing process aborted!\n"); + break; + } return Ret; } -

1 0

[cfinck] 40209: Change these calls back to printf, so [SYSREG] is not prepended for the whole debug output
by cfinck＠svn.reactos.org 24 Mar '09

24 Mar '09

Author: cfinck Date: Tue Mar 24 15:54:35 2009 New Revision: 40209 URL: http://svn.reactos.org/svn/reactos?rev=40209&view=rev Log: Change these calls back to printf, so [SYSREG] is not prepended for the whole debug output Modified: trunk/tools/sysreg2/console.c Modified: trunk/tools/sysreg2/console.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/console.c?rev=40209&… ============================================================================== --- trunk/tools/sysreg2/console.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/console.c [iso-8859-1] Tue Mar 24 15:54:35 2009 @@ -99,9 +99,9 @@ } if (ResolveAddressFromFile(rbuf, sizeof(rbuf), buf)) - SysregPrintf("%s", rbuf); + printf("%s", rbuf); else - SysregPrintf("%s", buf); + printf("%s", buf); } else {

1 0

[cfinck] 40208: Take the line number as an integer, the STRINGIZER macro didn't work as expected
by cfinck＠svn.reactos.org 24 Mar '09

24 Mar '09

Author: cfinck Date: Tue Mar 24 15:37:54 2009 New Revision: 40208 URL: http://svn.reactos.org/svn/reactos?rev=40208&view=rev Log: Take the line number as an integer, the STRINGIZER macro didn't work as expected Modified: trunk/rostests/rosautotest/CFatalException.cpp trunk/rostests/rosautotest/CFatalException.h trunk/rostests/rosautotest/precomp.h Modified: trunk/rostests/rosautotest/CFatalException.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CFatalExcepti… ============================================================================== --- trunk/rostests/rosautotest/CFatalException.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CFatalException.cpp [iso-8859-1] Tue Mar 24 15:37:54 2009 @@ -15,12 +15,12 @@ * Constant pointer to a char array with the source file where the exception occured (__FILE__) * * @param Line - * Constant pointer to a char array with the appropriate source line (#__LINE__) + * Integer value with the appropriate source line (__LINE__) * * @param Message * Constant pointer to a char array containing a short message about the exception */ -CFatalException::CFatalException(const char* File, const char* Line, const char* Message) +CFatalException::CFatalException(const char* File, int Line, const char* Message) : m_File(File), m_Line(Line), m_Message(Message) { } Modified: trunk/rostests/rosautotest/CFatalException.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CFatalExcepti… ============================================================================== --- trunk/rostests/rosautotest/CFatalException.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CFatalException.h [iso-8859-1] Tue Mar 24 15:37:54 2009 @@ -9,13 +9,13 @@ { private: string m_File; - string m_Line; + int m_Line; string m_Message; public: - CFatalException(const char* File, const char* Line, const char* Message); + CFatalException(const char* File, int Line, const char* Message); const string& GetFile() const { return m_File; } - const string& GetLine() const { return m_Line; } + int GetLine() const { return m_Line; } const string& GetMessage() const { return m_Message; } }; Modified: trunk/rostests/rosautotest/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/precomp.h?rev… ============================================================================== --- trunk/rostests/rosautotest/precomp.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/precomp.h [iso-8859-1] Tue Mar 24 15:37:54 2009 @@ -33,9 +33,8 @@ #include "CWineTest.h" /* Useful macros */ -#define STRINGIZER(Value) #Value #define EXCEPTION(Message) throw CSimpleException(Message) -#define FATAL(Message) throw CFatalException(__FILE__, STRINGIZER(__LINE__), Message) +#define FATAL(Message) throw CFatalException(__FILE__, __LINE__, Message) #define SSEXCEPTION throw CSimpleException(ss.str().c_str()) /* main.c */

1 0

[dchapyshev] 40207: - Replace stub msdmo on msdmo from Wine
by dchapyshev＠svn.reactos.org 24 Mar '09

24 Mar '09

Author: dchapyshev Date: Tue Mar 24 14:20:24 2009 New Revision: 40207 URL: http://svn.reactos.org/svn/reactos?rev=40207&view=rev Log: - Replace stub msdmo on msdmo from Wine Added: trunk/reactos/dll/directx/msdmo/dmoreg.c (with props) trunk/reactos/dll/directx/msdmo/dmort.c (with props) trunk/reactos/dll/directx/msdmo/rsrc.rc (with props) Removed: trunk/reactos/dll/directx/msdmo/msdmo.c trunk/reactos/dll/directx/msdmo/msdmo.rc Modified: trunk/reactos/dll/directx/msdmo/msdmo.rbuild Added: trunk/reactos/dll/directx/msdmo/dmoreg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdmo/dmoreg.c… ============================================================================== --- trunk/reactos/dll/directx/msdmo/dmoreg.c (added) +++ trunk/reactos/dll/directx/msdmo/dmoreg.c [iso-8859-1] Tue Mar 24 14:20:24 2009 @@ -1,0 +1,835 @@ +/* + * Copyright (C) 2003 Michael GÃ¼nnewig + * Copyright (C) 2003 CodeWeavers Inc. (Ulrich Czekalla) + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winerror.h" +#include "winreg.h" +#include "objbase.h" +#include "wine/unicode.h" +#include "wine/debug.h" +#include "initguid.h" +#include "dmo.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msdmo); + +#define MSDMO_MAJOR_VERSION 6 + +static const WCHAR szDMORootKey[] = +{ + 'D','i','r','e','c','t','S','h','o','w','\\', + 'M','e','d','i','a','O','b','j','e','c','t','s',0 +}; + +static const WCHAR szDMOInputType[] = +{ + 'I','n','p','u','t','T','y','p','e','s',0 +}; + +static const WCHAR szDMOOutputType[] = +{ + 'O','u','t','p','u','t','T','y','p','e','s',0 +}; + +static const WCHAR szDMOKeyed[] = +{ + 'K','e','y','e','d',0 +}; + +static const WCHAR szDMOCategories[] = +{ + 'C','a','t','e','g','o','r','i','e','s',0 +}; + +static const WCHAR szGUIDFmt[] = +{ + '%','0','8','X','-','%','0','4','X','-','%','0','4','X','-','%','0', + '2','X','%','0','2','X','-','%','0','2','X','%','0','2','X','%','0','2', + 'X','%','0','2','X','%','0','2','X','%','0','2','X',0 +}; + +static const WCHAR szCat3Fmt[] = +{ + '%','s','\\','%','s','\\','%','s',0 +}; + +static const WCHAR szCat2Fmt[] = +{ + '%','s','\\','%','s',0 +}; + +static const WCHAR szToGuidFmt[] = +{ + '{','%','s','}',0 +}; + + +typedef struct +{ + const IEnumDMOVtbl *lpVtbl; + LONG ref; + DWORD index; + const GUID* guidCategory; + DWORD dwFlags; + DWORD cInTypes; + DMO_PARTIAL_MEDIATYPE *pInTypes; + DWORD cOutTypes; + DMO_PARTIAL_MEDIATYPE *pOutTypes; + HKEY hkey; +} IEnumDMOImpl; + +static HRESULT read_types(HKEY root, LPCWSTR key, ULONG *supplied, ULONG requested, DMO_PARTIAL_MEDIATYPE* types); + +static const IEnumDMOVtbl edmovt; + +static LPWSTR GUIDToString(LPWSTR lpwstr, REFGUID lpcguid) +{ + wsprintfW(lpwstr, szGUIDFmt, lpcguid->Data1, lpcguid->Data2, + lpcguid->Data3, lpcguid->Data4[0], lpcguid->Data4[1], + lpcguid->Data4[2], lpcguid->Data4[3], lpcguid->Data4[4], + lpcguid->Data4[5], lpcguid->Data4[6], lpcguid->Data4[7]); + + return lpwstr; +} + +static BOOL IsMediaTypeEqual(const DMO_PARTIAL_MEDIATYPE* mt1, const DMO_PARTIAL_MEDIATYPE* mt2) +{ + + return (IsEqualCLSID(&mt1->type, &mt2->type) || + IsEqualCLSID(&mt2->type, &GUID_NULL) || + IsEqualCLSID(&mt1->type, &GUID_NULL)) && + (IsEqualCLSID(&mt1->subtype, &mt2->subtype) || + IsEqualCLSID(&mt2->subtype, &GUID_NULL) || + IsEqualCLSID(&mt1->subtype, &GUID_NULL)); +} + +static HRESULT write_types(HKEY hkey, LPCWSTR name, const DMO_PARTIAL_MEDIATYPE* types, DWORD count) +{ + HRESULT hres = S_OK; + if (MSDMO_MAJOR_VERSION > 5) + { + hres = RegSetValueExW(hkey, name, 0, REG_BINARY, (const BYTE*) types, + count* sizeof(DMO_PARTIAL_MEDIATYPE)); + } + else + { + HKEY skey1,skey2,skey3; + DWORD index = 0; + WCHAR szGuidKey[64]; + + hres = RegCreateKeyExW(hkey, name, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_WRITE, NULL, &skey1, NULL); + while (index < count) + { + GUIDToString(szGuidKey,&types[index].type); + hres = RegCreateKeyExW(skey1, szGuidKey, 0, NULL, + REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &skey2, NULL); + GUIDToString(szGuidKey,&types[index].subtype); + hres = RegCreateKeyExW(skey2, szGuidKey, 0, NULL, + REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &skey3, NULL); + RegCloseKey(skey3); + RegCloseKey(skey2); + index ++; + } + RegCloseKey(skey1); + } + + return hres; +} + +/*************************************************************** + * DMORegister (MSDMO.@) + * + * Register a DirectX Media Object. + */ +HRESULT WINAPI DMORegister( + LPCWSTR szName, + REFCLSID clsidDMO, + REFGUID guidCategory, + DWORD dwFlags, + DWORD cInTypes, + const DMO_PARTIAL_MEDIATYPE *pInTypes, + DWORD cOutTypes, + const DMO_PARTIAL_MEDIATYPE *pOutTypes +) +{ + WCHAR szguid[64]; + HRESULT hres; + HKEY hrkey = 0; + HKEY hkey = 0; + HKEY hckey = 0; + HKEY hclskey = 0; + + TRACE("%s\n", debugstr_w(szName)); + + hres = RegCreateKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, NULL, + REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hrkey, NULL); + if (ERROR_SUCCESS != hres) + goto lend; + + /* Create clsidDMO key under MediaObjects */ + hres = RegCreateKeyExW(hrkey, GUIDToString(szguid, clsidDMO), 0, NULL, + REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkey, NULL); + if (ERROR_SUCCESS != hres) + goto lend; + + /* Set default Name value */ + hres = RegSetValueExW(hkey, NULL, 0, REG_SZ, (const BYTE*) szName, + (strlenW(szName) + 1) * sizeof(WCHAR)); + + /* Set InputTypes */ + hres = write_types(hkey, szDMOInputType, pInTypes, cInTypes); + + /* Set OutputTypes */ + hres = write_types(hkey, szDMOOutputType, pOutTypes, cOutTypes); + + if (dwFlags & DMO_REGISTERF_IS_KEYED) + { + /* Create Keyed key */ + hres = RegCreateKeyExW(hkey, szDMOKeyed, 0, NULL, + REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hckey, NULL); + if (ERROR_SUCCESS != hres) + goto lend; + RegCloseKey(hckey); + } + + /* Register the category */ + hres = RegCreateKeyExW(hrkey, szDMOCategories, 0, NULL, + REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hckey, NULL); + if (ERROR_SUCCESS != hres) + goto lend; + + RegCloseKey(hkey); + + hres = RegCreateKeyExW(hckey, GUIDToString(szguid, guidCategory), 0, NULL, + REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkey, NULL); + if (ERROR_SUCCESS != hres) + goto lend; + hres = RegCreateKeyExW(hkey, GUIDToString(szguid, clsidDMO), 0, NULL, + REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hclskey, NULL); + if (ERROR_SUCCESS != hres) + goto lend; + +lend: + if (hkey) + RegCloseKey(hkey); + if (hckey) + RegCloseKey(hckey); + if (hclskey) + RegCloseKey(hclskey); + if (hrkey) + RegCloseKey(hrkey); + + TRACE(" hresult=0x%08x\n", hres); + return hres; +} + + +/*************************************************************** + * DMOUnregister (MSDMO.@) + * + * Unregister a DirectX Media Object. + */ +HRESULT WINAPI DMOUnregister(REFCLSID clsidDMO, REFGUID guidCategory) +{ + HRESULT hres; + WCHAR szguid[64]; + HKEY hrkey = 0; + HKEY hckey = 0; + + GUIDToString(szguid, clsidDMO); + + TRACE("%s %p\n", debugstr_w(szguid), guidCategory); + + hres = RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, KEY_WRITE, &hrkey); + if (ERROR_SUCCESS != hres) + goto lend; + + hres = RegDeleteKeyW(hrkey, szguid); + if (ERROR_SUCCESS != hres) + goto lend; + + hres = RegOpenKeyExW(hrkey, szDMOCategories, 0, KEY_WRITE, &hckey); + if (ERROR_SUCCESS != hres) + goto lend; + + hres = RegDeleteKeyW(hckey, szguid); + if (ERROR_SUCCESS != hres) + goto lend; + +lend: + if (hckey) + RegCloseKey(hckey); + if (hrkey) + RegCloseKey(hrkey); + + return hres; +} + + +/*************************************************************** + * DMOGetName (MSDMO.@) + * + * Get DMP Name from the registry + */ +HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR szName[]) +{ + WCHAR szguid[64]; + HRESULT hres; + HKEY hrkey = 0; + HKEY hkey = 0; + static const INT max_name_len = 80; + DWORD count; + + TRACE("%s\n", debugstr_guid(clsidDMO)); + + hres = RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, + 0, KEY_READ, &hrkey); + if (ERROR_SUCCESS != hres) + goto lend; + + hres = RegOpenKeyExW(hrkey, GUIDToString(szguid, clsidDMO), + 0, KEY_READ, &hkey); + if (ERROR_SUCCESS != hres) + goto lend; + + count = max_name_len * sizeof(WCHAR); + hres = RegQueryValueExW(hkey, NULL, NULL, NULL, + (LPBYTE) szName, &count); + + TRACE(" szName=%s\n", debugstr_w(szName)); +lend: + if (hkey) + RegCloseKey(hrkey); + if (hkey) + RegCloseKey(hkey); + + return hres; +} + + +/************************************************************************** +* IEnumDMO_Destructor +*/ +static BOOL IEnumDMO_Destructor(IEnumDMO* iface) +{ + IEnumDMOImpl *This = (IEnumDMOImpl *)iface; + + TRACE("%p\n", This); + + if (This->hkey) + RegCloseKey(This->hkey); + + HeapFree(GetProcessHeap(), 0, This->pInTypes); + HeapFree(GetProcessHeap(), 0, This->pOutTypes); + + return TRUE; +} + + +/************************************************************************** + * IEnumDMO_Constructor + */ +static IEnumDMO * IEnumDMO_Constructor( + REFGUID guidCategory, + DWORD dwFlags, + DWORD cInTypes, + const DMO_PARTIAL_MEDIATYPE *pInTypes, + DWORD cOutTypes, + const DMO_PARTIAL_MEDIATYPE *pOutTypes) +{ + UINT size; + IEnumDMOImpl* lpedmo; + BOOL ret = FALSE; + + lpedmo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IEnumDMOImpl)); + + if (lpedmo) + { + lpedmo->ref = 1; + lpedmo->lpVtbl = &edmovt; + lpedmo->index = -1; + lpedmo->guidCategory = guidCategory; + lpedmo->dwFlags = dwFlags; + + if (cInTypes > 0) + { + size = cInTypes * sizeof(DMO_PARTIAL_MEDIATYPE); + lpedmo->pInTypes = HeapAlloc(GetProcessHeap(), 0, size); + if (!lpedmo->pInTypes) + goto lerr; + memcpy(lpedmo->pInTypes, pInTypes, size); + lpedmo->cInTypes = cInTypes; + } + + if (cOutTypes > 0) + { + size = cOutTypes * sizeof(DMO_PARTIAL_MEDIATYPE); + lpedmo->pOutTypes = HeapAlloc(GetProcessHeap(), 0, size); + if (!lpedmo->pOutTypes) + goto lerr; + memcpy(lpedmo->pOutTypes, pOutTypes, size); + lpedmo->cOutTypes = cOutTypes; + } + + /* If not filtering by category enum from media objects root */ + if (IsEqualGUID(guidCategory, &GUID_NULL)) + { + if (ERROR_SUCCESS == RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, + 0, KEY_READ, &lpedmo->hkey)) + ret = TRUE; + } + else + { + WCHAR szguid[64]; + WCHAR szKey[MAX_PATH]; + + wsprintfW(szKey, szCat3Fmt, szDMORootKey, szDMOCategories, + GUIDToString(szguid, guidCategory)); + if (ERROR_SUCCESS == RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, + 0, KEY_READ, &lpedmo->hkey)) + ret = TRUE; + } + +lerr: + if(!ret) + { + IEnumDMO_Destructor((IEnumDMO*)lpedmo); + HeapFree(GetProcessHeap(),0,lpedmo); + lpedmo = NULL; + } + } + + TRACE("returning %p\n", lpedmo); + + return (IEnumDMO*)lpedmo; +} + + +/****************************************************************************** + * IEnumDMO_fnAddRef + */ +static ULONG WINAPI IEnumDMO_fnAddRef(IEnumDMO * iface) +{ + IEnumDMOImpl *This = (IEnumDMOImpl *)iface; + return InterlockedIncrement(&This->ref); +} + + +/************************************************************************** + * EnumDMO_QueryInterface + */ +static HRESULT WINAPI IEnumDMO_fnQueryInterface( + IEnumDMO* iface, + REFIID riid, + LPVOID *ppvObj) +{ + IEnumDMOImpl *This = (IEnumDMOImpl *)iface; + + *ppvObj = NULL; + + if(IsEqualIID(riid, &IID_IUnknown)) + *ppvObj = This; + else if(IsEqualIID(riid, &IID_IEnumDMO)) + *ppvObj = This; + + if(*ppvObj) + { + IEnumDMO_fnAddRef(*ppvObj); + return S_OK; + } + + return E_NOINTERFACE; +} + + +/****************************************************************************** + * IEnumDMO_fnRelease + */ +static ULONG WINAPI IEnumDMO_fnRelease(IEnumDMO * iface) +{ + IEnumDMOImpl *This = (IEnumDMOImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + if (!refCount) + { + IEnumDMO_Destructor((IEnumDMO*)This); + HeapFree(GetProcessHeap(),0,This); + } + return refCount; +} + + +/****************************************************************************** + * IEnumDMO_fnNext + */ +static HRESULT WINAPI IEnumDMO_fnNext( + IEnumDMO * iface, + DWORD cItemsToFetch, + CLSID * pCLSID, + WCHAR ** Names, + DWORD * pcItemsFetched) +{ + FILETIME ft; + HKEY hkey; + WCHAR szNextKey[MAX_PATH]; + WCHAR szGuidKey[64]; + WCHAR szKey[MAX_PATH]; + WCHAR szValue[MAX_PATH]; + DWORD len; + UINT count = 0; + HRESULT hres = S_OK; + + IEnumDMOImpl *This = (IEnumDMOImpl *)iface; + + TRACE("--> (%p) %d %p %p %p\n", iface, cItemsToFetch, pCLSID, Names, pcItemsFetched); + + if (!pCLSID || !Names || !pcItemsFetched) + return E_POINTER; + + while (count < cItemsToFetch) + { + This->index++; + + len = MAX_PATH; + hres = RegEnumKeyExW(This->hkey, This->index, szNextKey, &len, NULL, NULL, NULL, &ft); + if (hres != ERROR_SUCCESS) + break; + + TRACE("found %s\n", debugstr_w(szNextKey)); + + if (!(This->dwFlags & DMO_ENUMF_INCLUDE_KEYED)) + { + wsprintfW(szKey, szCat3Fmt, szDMORootKey, szNextKey, szDMOKeyed); + hres = RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &hkey); + if (ERROR_SUCCESS == hres) + { + RegCloseKey(hkey); + /* Skip Keyed entries */ + continue; + } + } + + wsprintfW(szKey, szCat2Fmt, szDMORootKey, szNextKey); + hres = RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &hkey); + + if (This->pInTypes) + { + UINT i, j; + DWORD cInTypes; + DMO_PARTIAL_MEDIATYPE* pInTypes; + + hres = read_types(hkey, szDMOInputType, &cInTypes, + sizeof(szValue)/sizeof(DMO_PARTIAL_MEDIATYPE), + (DMO_PARTIAL_MEDIATYPE*)szValue); + + if (ERROR_SUCCESS != hres) + { + RegCloseKey(hkey); + continue; + } + + pInTypes = (DMO_PARTIAL_MEDIATYPE*) szValue; + + for (i = 0; i < This->cInTypes; i++) + { + for (j = 0; j < cInTypes; j++) + { + if (IsMediaTypeEqual(&pInTypes[j], &This->pInTypes[i])) + break; + } + + if (j >= cInTypes) + break; + } + + if (i < This->cInTypes) + { + RegCloseKey(hkey); + continue; + } + } + + if (This->pOutTypes) + { + UINT i, j; + DWORD cOutTypes; + DMO_PARTIAL_MEDIATYPE* pOutTypes; + + hres = read_types(hkey, szDMOOutputType, &cOutTypes, + sizeof(szValue)/sizeof(DMO_PARTIAL_MEDIATYPE), + (DMO_PARTIAL_MEDIATYPE*)szValue); + + if (ERROR_SUCCESS != hres) + { + RegCloseKey(hkey); + continue; + } + + pOutTypes = (DMO_PARTIAL_MEDIATYPE*) szValue; + + for (i = 0; i < This->cOutTypes; i++) + { + for (j = 0; j < cOutTypes; j++) + { + if (IsMediaTypeEqual(&pOutTypes[j], &This->pOutTypes[i])) + break; + } + + if (j >= cOutTypes) + break; + } + + if (i < This->cOutTypes) + { + RegCloseKey(hkey); + continue; + } + } + + /* Media object wasn't filtered so add it to return list */ + Names[count] = NULL; + len = MAX_PATH * sizeof(WCHAR); + hres = RegQueryValueExW(hkey, NULL, NULL, NULL, (LPBYTE) szValue, &len); + if (ERROR_SUCCESS == hres) + { + Names[count] = HeapAlloc(GetProcessHeap(), 0, strlenW(szValue) + 1); + if (Names[count]) + strcmpW(Names[count], szValue); + } + wsprintfW(szGuidKey,szToGuidFmt,szNextKey); + CLSIDFromString(szGuidKey, &pCLSID[count]); + + TRACE("found match %s %s\n", debugstr_w(szValue), debugstr_w(szNextKey)); + RegCloseKey(hkey); + count++; + } + + *pcItemsFetched = count; + if (*pcItemsFetched < cItemsToFetch) + hres = S_FALSE; + + TRACE("<-- %i found\n",count); + return hres; +} + + +/****************************************************************************** + * IEnumDMO_fnSkip + */ +static HRESULT WINAPI IEnumDMO_fnSkip(IEnumDMO * iface, DWORD cItemsToSkip) +{ + IEnumDMOImpl *This = (IEnumDMOImpl *)iface; + + This->index += cItemsToSkip; + + return S_OK; +} + + +/****************************************************************************** + * IEnumDMO_fnReset + */ +static HRESULT WINAPI IEnumDMO_fnReset(IEnumDMO * iface) +{ + IEnumDMOImpl *This = (IEnumDMOImpl *)iface; + + This->index = -1; + + return S_OK; +} + + +/****************************************************************************** + * IEnumDMO_fnClone + */ +static HRESULT WINAPI IEnumDMO_fnClone(IEnumDMO * iface, IEnumDMO **ppEnum) +{ + IEnumDMOImpl *This = (IEnumDMOImpl *)iface; + + FIXME("(%p)->() to (%p)->() E_NOTIMPL\n", This, ppEnum); + + return E_NOTIMPL; +} + + +/*************************************************************** + * DMOEnum (MSDMO.@) + * + * Enumerate DirectX Media Objects in the registry. + */ +HRESULT WINAPI DMOEnum( + REFGUID guidCategory, + DWORD dwFlags, + DWORD cInTypes, + const DMO_PARTIAL_MEDIATYPE *pInTypes, + DWORD cOutTypes, + const DMO_PARTIAL_MEDIATYPE *pOutTypes, + IEnumDMO **ppEnum) +{ + HRESULT hres = E_FAIL; + + TRACE("guidCategory=%p dwFlags=0x%08x cInTypes=%d cOutTypes=%d\n", + guidCategory, dwFlags, cInTypes, cOutTypes); + + *ppEnum = IEnumDMO_Constructor(guidCategory, dwFlags, cInTypes, + pInTypes, cOutTypes, pOutTypes); + if (*ppEnum) + hres = S_OK; + + return hres; +} + + +static const IEnumDMOVtbl edmovt = +{ + IEnumDMO_fnQueryInterface, + IEnumDMO_fnAddRef, + IEnumDMO_fnRelease, + IEnumDMO_fnNext, + IEnumDMO_fnSkip, + IEnumDMO_fnReset, + IEnumDMO_fnClone, +}; + + +HRESULT read_types(HKEY root, LPCWSTR key, ULONG *supplied, ULONG requested, DMO_PARTIAL_MEDIATYPE* types ) +{ + HRESULT ret = S_OK; + if (MSDMO_MAJOR_VERSION > 5) + { + DWORD len; + len = requested * sizeof(DMO_PARTIAL_MEDIATYPE); + ret = RegQueryValueExW(root, key, NULL, NULL, (LPBYTE) types, &len); + *supplied = len / sizeof(DMO_PARTIAL_MEDIATYPE); + } + else + { + HKEY hkey; + WCHAR szGuidKey[64]; + + *supplied = 0; + if (ERROR_SUCCESS == RegOpenKeyExW(root, key, 0, KEY_READ, &hkey)) + { + int index = 0; + WCHAR szNextKey[MAX_PATH]; + DWORD len; + LONG rc = ERROR_SUCCESS; + + while (rc == ERROR_SUCCESS) + { + len = MAX_PATH; + rc = RegEnumKeyExW(hkey, index, szNextKey, &len, NULL, NULL, NULL, NULL); + if (rc == ERROR_SUCCESS) + { + HKEY subk; + int sub_index = 0; + LONG rcs = ERROR_SUCCESS; + WCHAR szSubKey[MAX_PATH]; + + RegOpenKeyExW(hkey, szNextKey, 0, KEY_READ, &subk); + while (rcs == ERROR_SUCCESS) + { + len = MAX_PATH; + rcs = RegEnumKeyExW(subk, sub_index, szSubKey, &len, NULL, NULL, NULL, NULL); + if (rcs == ERROR_SUCCESS) + { + if (*supplied >= requested) + { + /* Bailing */ + ret = S_FALSE; + rc = ERROR_MORE_DATA; + rcs = ERROR_MORE_DATA; + break; + } + + wsprintfW(szGuidKey,szToGuidFmt,szNextKey); + CLSIDFromString(szGuidKey, &types[*supplied].type); + wsprintfW(szGuidKey,szToGuidFmt,szSubKey); + CLSIDFromString(szGuidKey, &types[*supplied].subtype); + TRACE("Adding type %s subtype %s at index %i\n", + debugstr_guid(&types[*supplied].type), + debugstr_guid(&types[*supplied].subtype), + *supplied); + (*supplied)++; + } + sub_index++; + } + index++; + } + } + RegCloseKey(hkey); + } + } + return ret; +} + +/*************************************************************** + * DMOGetTypes (MSDMO.@) + */ +HRESULT WINAPI DMOGetTypes(REFCLSID clsidDMO, + unsigned long ulInputTypesRequested, + unsigned long* pulInputTypesSupplied, + DMO_PARTIAL_MEDIATYPE* pInputTypes, + unsigned long ulOutputTypesRequested, + unsigned long* pulOutputTypesSupplied, + DMO_PARTIAL_MEDIATYPE* pOutputTypes) +{ + HKEY root,hkey; + HRESULT ret = S_OK; + WCHAR szguid[64]; + + TRACE ("(%s,%u,%p,%p,%u,%p,%p),stub!\n", debugstr_guid(clsidDMO), + ulInputTypesRequested, pulInputTypesSupplied, pInputTypes, + ulOutputTypesRequested, pulOutputTypesSupplied, pOutputTypes); + + if (ERROR_SUCCESS != RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, + KEY_READ, &root)) + return E_FAIL; + + if (ERROR_SUCCESS != RegOpenKeyExW(root,GUIDToString(szguid,clsidDMO) , 0, + KEY_READ, &hkey)) + { + RegCloseKey(root); + return E_FAIL; + } + + if (ulInputTypesRequested > 0) + { + ret = read_types(hkey, szDMOInputType, (ULONG*)pulInputTypesSupplied, ulInputTypesRequested, pInputTypes ); + } + else + *pulInputTypesSupplied = 0; + + if (ulOutputTypesRequested > 0) + { + HRESULT ret2; + ret2 = read_types(hkey, szDMOOutputType, (ULONG*)pulOutputTypesSupplied, ulOutputTypesRequested, pOutputTypes ); + + if (ret == S_OK) + ret = ret2; + } + else + *pulOutputTypesSupplied = 0; + + return ret; +} Propchange: trunk/reactos/dll/directx/msdmo/dmoreg.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/msdmo/dmort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdmo/dmort.c?… ============================================================================== --- trunk/reactos/dll/directx/msdmo/dmort.c (added) +++ trunk/reactos/dll/directx/msdmo/dmort.c [iso-8859-1] Tue Mar 24 14:20:24 2009 @@ -1,0 +1,200 @@ +/* + * Copyright (C) 2003 Michael GÃ¼nnewig + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "mediaobj.h" +#include "dmort.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msdmo); + +/*********************************************************************** + * MoCreateMediaType (MSDMO.@) + * + * Allocate a new media type structure + */ +HRESULT WINAPI MoCreateMediaType(DMO_MEDIA_TYPE** ppmedia, DWORD cbFormat) +{ + HRESULT r; + + TRACE("%p %u\n", ppmedia, cbFormat); + + if (!ppmedia) + return E_POINTER; + + *ppmedia = CoTaskMemAlloc(sizeof(DMO_MEDIA_TYPE)); + if (!*ppmedia) + return E_OUTOFMEMORY; + + r = MoInitMediaType(*ppmedia, cbFormat); + if (FAILED(r)) + { + CoTaskMemFree(*ppmedia); + *ppmedia = NULL; + } + + return r; +} + +/*********************************************************************** + * MoInitMediaType (MSDMO.@) + * + * Initialize media type structure + */ +HRESULT WINAPI MoInitMediaType(DMO_MEDIA_TYPE* pmedia, DWORD cbFormat) +{ + TRACE("%p %u\n", pmedia, cbFormat); + + if (!pmedia) + return E_POINTER; + + memset(pmedia, 0, sizeof(DMO_MEDIA_TYPE)); + + if (cbFormat > 0) + { + pmedia->pbFormat = CoTaskMemAlloc(cbFormat); + if (!pmedia->pbFormat) + return E_OUTOFMEMORY; + + pmedia->cbFormat = cbFormat; + } + + return S_OK; +} + +/*********************************************************************** + * MoDeleteMediaType (MSDMO.@) + * + * Delete a media type structure + */ +HRESULT WINAPI MoDeleteMediaType(DMO_MEDIA_TYPE* pmedia) +{ + TRACE("%p\n", pmedia); + + if (!pmedia) + return E_POINTER; + + MoFreeMediaType(pmedia); + CoTaskMemFree(pmedia); + + return S_OK; +} + +/*********************************************************************** + * MoFreeMediaType (MSDMO.@) + * + * Free allocated members of a media type structure + */ +HRESULT WINAPI MoFreeMediaType(DMO_MEDIA_TYPE* pmedia) +{ + TRACE("%p\n", pmedia); + + if (!pmedia) + return E_POINTER; + + if (pmedia->pUnk) + { + IUnknown_Release(pmedia->pUnk); + pmedia->pUnk = NULL; + } + + CoTaskMemFree(pmedia->pbFormat); + pmedia->pbFormat = NULL; + + return S_OK; +} + +/*********************************************************************** + * MoDuplicateMediaType (MSDMO.@) + * + * Duplicates a media type structure + */ +HRESULT WINAPI MoDuplicateMediaType(DMO_MEDIA_TYPE** ppdst, + const DMO_MEDIA_TYPE* psrc) +{ + HRESULT r; + + TRACE("%p %p\n", ppdst, psrc); + + if (!ppdst || !psrc) + return E_POINTER; + + *ppdst = CoTaskMemAlloc(sizeof(DMO_MEDIA_TYPE)); + if (!*ppdst) + return E_OUTOFMEMORY; + + r = MoCopyMediaType(*ppdst, psrc); + if (FAILED(r)) + { + MoFreeMediaType(*ppdst); + *ppdst = NULL; + } + + return r; +} + +/*********************************************************************** + * MoCopyMediaType (MSDMO.@) + * + * Copy a new media type structure + */ +HRESULT WINAPI MoCopyMediaType(DMO_MEDIA_TYPE* pdst, + const DMO_MEDIA_TYPE* psrc) +{ + TRACE("%p %p\n", pdst, psrc); + + if (!pdst || !psrc) + return E_POINTER; + + pdst->majortype = psrc->majortype; + pdst->subtype = psrc->subtype; + pdst->formattype = psrc->formattype; + + pdst->bFixedSizeSamples = psrc->bFixedSizeSamples; + pdst->bTemporalCompression = psrc->bTemporalCompression; + pdst->lSampleSize = psrc->lSampleSize; + pdst->cbFormat = psrc->cbFormat; + + if (psrc->pbFormat && psrc->cbFormat > 0) + { + pdst->pbFormat = CoTaskMemAlloc(psrc->cbFormat); + if (!pdst->pbFormat) + return E_OUTOFMEMORY; + + memcpy(pdst->pbFormat, psrc->pbFormat, psrc->cbFormat); + } + else + pdst->pbFormat = NULL; + + if (psrc->pUnk) + { + pdst->pUnk = psrc->pUnk; + IUnknown_AddRef(pdst->pUnk); + } + else + pdst->pUnk = NULL; + + return S_OK; +} Propchange: trunk/reactos/dll/directx/msdmo/dmort.c ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/dll/directx/msdmo/msdmo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdmo/msdmo.c?… ============================================================================== --- trunk/reactos/dll/directx/msdmo/msdmo.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msdmo/msdmo.c (removed) @@ -1,124 +1,0 @@ -/* - * MSDMO.DLL - ReactOS DMO Runtime - * - * Copyright 2008 Dmitry Chapyshev - * - * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <windows.h> -#include <stdio.h> -#include <wchar.h> -#include <tchar.h> - -typedef struct _DMO_PARTIAL_MEDIATYPE -{ - GUID type; - GUID subtype; -} DMO_PARTIAL_MEDIATYPE, *PDMO_PARTIAL_MEDIATYPE; - -typedef struct _IEnumDMO IEnumDMO; - -typedef struct _DMOMediaType -{ - GUID majortype; - GUID subtype; - BOOL bFixedSizeSamples; - BOOL bTemporalCompression; - ULONG lSampleSize; - GUID formattype; - IUnknown *pUnk; - ULONG cbFormat; - BYTE *pbFormat; -} DMO_MEDIA_TYPE; - -HRESULT WINAPI DMOEnum( - REFGUID guidCategory, - DWORD dwFlags, - DWORD cInTypes, - const DMO_PARTIAL_MEDIATYPE *pInTypes, - DWORD cOutTypes, - const DMO_PARTIAL_MEDIATYPE *pOutTypes, - IEnumDMO **ppEnum) -{ - return S_OK; -} - -HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR szName[]) -{ - return S_OK; -} - -HRESULT WINAPI DMOGetTypes(REFCLSID clsidDMO, - ULONG ulInputTypesRequested, - ULONG* pulInputTypesSupplied, - DMO_PARTIAL_MEDIATYPE* pInputTypes, - ULONG ulOutputTypesRequested, - ULONG* pulOutputTypesSupplied, - DMO_PARTIAL_MEDIATYPE* pOutputTypes) -{ - return S_OK; -} - -HRESULT WINAPI DMORegister( - LPCWSTR szName, - REFCLSID clsidDMO, - REFGUID guidCategory, - DWORD dwFlags, - DWORD cInTypes, - const DMO_PARTIAL_MEDIATYPE *pInTypes, - DWORD cOutTypes, - const DMO_PARTIAL_MEDIATYPE *pOutTypes -) -{ - return S_OK; -} - -HRESULT WINAPI DMOUnregister(REFCLSID clsidDMO, REFGUID guidCategory) -{ - return S_OK; -} - -HRESULT WINAPI MoCopyMediaType(DMO_MEDIA_TYPE* pdst, - const DMO_MEDIA_TYPE* psrc) -{ - return S_OK; -} - -HRESULT WINAPI MoCreateMediaType(DMO_MEDIA_TYPE** ppmedia, DWORD cbFormat) -{ - return S_OK; -} - -HRESULT WINAPI MoDeleteMediaType(DMO_MEDIA_TYPE* pmedia) -{ - return S_OK; -} - -HRESULT WINAPI MoDuplicateMediaType(DMO_MEDIA_TYPE** ppdst, - const DMO_MEDIA_TYPE* psrc) -{ - return S_OK; -} - -HRESULT WINAPI MoFreeMediaType(DMO_MEDIA_TYPE* pmedia) -{ - return S_OK; -} - -HRESULT WINAPI MoInitMediaType(DMO_MEDIA_TYPE* pmedia, DWORD cbFormat) -{ - return S_OK; -} Modified: trunk/reactos/dll/directx/msdmo/msdmo.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdmo/msdmo.rb… ============================================================================== --- trunk/reactos/dll/directx/msdmo/msdmo.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msdmo/msdmo.rbuild [iso-8859-1] Tue Mar 24 14:20:24 2009 @@ -1,13 +1,16 @@ -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<group> -<module name="msdmo" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MSDMO}" installbase="system32" installname="msdmo.dll"> +<module name="msdmo" type="win32dll" baseaddress="${BASEADDRESS_MSDMO}" installbase="system32" installname="msdmo.dll" allowwarnings="true" entrypoint="0"> <importlibrary definition="msdmo.spec" /> <include base="msdmo">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <file>dmoreg.c</file> + <file>dmort.c</file> + <file>rsrc.rc</file> + <library>wine</library> + <library>uuid</library> + <library>ole32</library> + <library>user32</library> <library>advapi32</library> <library>kernel32</library> <library>ntdll</library> - <file>msdmo.c</file> - <file>msdmo.rc</file> </module> -</group> Removed: trunk/reactos/dll/directx/msdmo/msdmo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdmo/msdmo.rc… ============================================================================== --- trunk/reactos/dll/directx/msdmo/msdmo.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msdmo/msdmo.rc (removed) @@ -1,9 +1,0 @@ - -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS DMO Runtime\0" -#define REACTOS_STR_INTERNAL_NAME "msdmo\0" -#define REACTOS_STR_ORIGINAL_FILENAME "msdmo.dll\0" - -#include <reactos/reactx.h> - -#include <reactos/version.rc> Added: trunk/reactos/dll/directx/msdmo/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdmo/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/directx/msdmo/rsrc.rc (added) +++ trunk/reactos/dll/directx/msdmo/rsrc.rc [iso-8859-1] Tue Mar 24 14:20:24 2009 @@ -1,0 +1,26 @@ +/* + * Copyright 2003 Michael Günnewig + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "DMO Runtime" +#define WINE_FILENAME_STR "msdmo.dll" +#define WINE_FILEVERSION 6,5,1,900 +#define WINE_FILEVERSION_STR "6.5.1.900" +#define WINE_PRODUCTVERSION 6,5,1,900 +#define WINE_PRODUCTVERSION_STR "6.5" + +#include "wine/wine_common_ver.rc" Propchange: trunk/reactos/dll/directx/msdmo/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dchapyshev] 40206: - Replace stub qedit on qedit from Wine
by dchapyshev＠svn.reactos.org 24 Mar '09

24 Mar '09

Author: dchapyshev Date: Tue Mar 24 14:17:08 2009 New Revision: 40206 URL: http://svn.reactos.org/svn/reactos?rev=40206&view=rev Log: - Replace stub qedit on qedit from Wine Added: trunk/reactos/dll/directx/qedit/main.c (with props) trunk/reactos/dll/directx/qedit/mediadet.c (with props) trunk/reactos/dll/directx/qedit/qedit_private.h (with props) trunk/reactos/dll/directx/qedit/regsvr.c (with props) Removed: trunk/reactos/dll/directx/qedit/qedit.c trunk/reactos/dll/directx/qedit/qedit.rc Modified: trunk/reactos/dll/directx/qedit/qedit.rbuild Added: trunk/reactos/dll/directx/qedit/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/main.c?r… ============================================================================== --- trunk/reactos/dll/directx/qedit/main.c (added) +++ trunk/reactos/dll/directx/qedit/main.c [iso-8859-1] Tue Mar 24 14:17:08 2009 @@ -1,0 +1,184 @@ +/* DirectShow Editing Services (qedit.dll) + * + * Copyright 2008 Google (Lei Zhang) + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "qedit_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qedit); + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + switch(fdwReason) { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + +/****************************************************************************** + * DirectShow ClassFactory + */ +typedef struct { + IClassFactory ITF_IClassFactory; + + LONG ref; + HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); +} IClassFactoryImpl; + +struct object_creation_info +{ + const CLSID *clsid; + HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); +}; + +static const struct object_creation_info object_creation[] = +{ + { &CLSID_MediaDet, MediaDet_create }, +}; + +static HRESULT WINAPI +DSCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) +{ + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IClassFactory)) + { + IClassFactory_AddRef(iface); + *ppobj = This; + return S_OK; + } + + *ppobj = NULL; + WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + return E_NOINTERFACE; +} + +static ULONG WINAPI DSCF_AddRef(LPCLASSFACTORY iface) +{ + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI DSCF_Release(LPCLASSFACTORY iface) +{ + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + + ULONG ref = InterlockedDecrement(&This->ref); + + if (ref == 0) + CoTaskMemFree(This); + + return ref; +} + +static HRESULT WINAPI DSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) +{ + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + HRESULT hres; + LPUNKNOWN punk; + + TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); + + *ppobj = NULL; + hres = This->pfnCreateInstance(pOuter, (LPVOID *) &punk); + if (SUCCEEDED(hres)) { + hres = IUnknown_QueryInterface(punk, riid, ppobj); + IUnknown_Release(punk); + } + return hres; +} + +static HRESULT WINAPI DSCF_LockServer(LPCLASSFACTORY iface, BOOL dolock) +{ + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + FIXME("(%p)->(%d),stub!\n",This,dolock); + return S_OK; +} + +static const IClassFactoryVtbl DSCF_Vtbl = +{ + DSCF_QueryInterface, + DSCF_AddRef, + DSCF_Release, + DSCF_CreateInstance, + DSCF_LockServer +}; + + +/*********************************************************************** + * DllCanUnloadNow (QEDIT.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_OK; +} + +/******************************************************************************* + * DllGetClassObject [QEDIT.@] + * Retrieves class object from a DLL object + * + * PARAMS + * rclsid [I] CLSID for the class object + * riid [I] Reference to identifier of interface for class object + * ppv [O] Address of variable to receive interface pointer for riid + * + * RETURNS + * Success: S_OK + * Failure: CLASS_E_CLASSNOTAVAILABLE, E_OUTOFMEMORY, E_INVALIDARG, + * E_UNEXPECTED, E_NOINTERFACE + */ + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + unsigned int i; + IClassFactoryImpl *factory; + + TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + if ( !IsEqualGUID( &IID_IClassFactory, riid ) + && ! IsEqualGUID( &IID_IUnknown, riid) ) + return E_NOINTERFACE; + + for (i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + { + if (IsEqualGUID(object_creation[i].clsid, rclsid)) + break; + } + + if (i == sizeof(object_creation)/sizeof(object_creation[0])) + { + FIXME("%s: no class found.\n", debugstr_guid(rclsid)); + return CLASS_E_CLASSNOTAVAILABLE; + } + + factory = CoTaskMemAlloc(sizeof(*factory)); + if (factory == NULL) return E_OUTOFMEMORY; + + factory->ITF_IClassFactory.lpVtbl = &DSCF_Vtbl; + factory->ref = 1; + + factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; + + *ppv = &(factory->ITF_IClassFactory); + return S_OK; +} Propchange: trunk/reactos/dll/directx/qedit/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/qedit/mediadet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/mediadet… ============================================================================== --- trunk/reactos/dll/directx/qedit/mediadet.c (added) +++ trunk/reactos/dll/directx/qedit/mediadet.c [iso-8859-1] Tue Mar 24 14:17:08 2009 @@ -1,0 +1,610 @@ +/* DirectShow Media Detector object (QEDIT.DLL) + * + * Copyright 2008 Google (Lei Zhang, Dan Hipschman) + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" + +#include "qedit_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qedit); + +typedef struct MediaDetImpl { + const IMediaDetVtbl *MediaDet_Vtbl; + LONG refCount; + IGraphBuilder *graph; + IBaseFilter *source; + IBaseFilter *splitter; + long num_streams; + long cur_stream; + IPin *cur_pin; +} MediaDetImpl; + +static void MD_cleanup(MediaDetImpl *This) +{ + if (This->cur_pin) IPin_Release(This->cur_pin); + This->cur_pin = NULL; + if (This->source) IBaseFilter_Release(This->source); + This->source = NULL; + if (This->splitter) IBaseFilter_Release(This->splitter); + This->splitter = NULL; + if (This->graph) IGraphBuilder_Release(This->graph); + This->graph = NULL; + This->num_streams = -1; + This->cur_stream = 0; +} + +static ULONG WINAPI MediaDet_AddRef(IMediaDet* iface) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->refCount); + TRACE("(%p)->() AddRef from %d\n", This, refCount - 1); + return refCount; +} + +static ULONG WINAPI MediaDet_Release(IMediaDet* iface) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->refCount); + TRACE("(%p)->() Release from %d\n", This, refCount + 1); + + if (refCount == 0) + { + MD_cleanup(This); + CoTaskMemFree(This); + return 0; + } + + return refCount; +} + +static HRESULT WINAPI MediaDet_QueryInterface(IMediaDet* iface, REFIID riid, + void **ppvObject) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IMediaDet)) { + MediaDet_AddRef(iface); + *ppvObject = This; + return S_OK; + } + *ppvObject = NULL; + WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppvObject); + return E_NOINTERFACE; +} + +static HRESULT WINAPI MediaDet_get_Filter(IMediaDet* iface, IUnknown **pVal) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + FIXME("(%p)->(%p): not implemented!\n", This, pVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaDet_put_Filter(IMediaDet* iface, IUnknown *newVal) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + FIXME("(%p)->(%p): not implemented!\n", This, newVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaDet_get_OutputStreams(IMediaDet* iface, long *pVal) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + IEnumPins *pins; + IPin *pin; + HRESULT hr; + + TRACE("(%p)\n", This); + + if (!This->splitter) + return E_INVALIDARG; + + if (This->num_streams != -1) + { + *pVal = This->num_streams; + return S_OK; + } + + *pVal = 0; + + hr = IBaseFilter_EnumPins(This->splitter, &pins); + if (FAILED(hr)) + return hr; + + while (IEnumPins_Next(pins, 1, &pin, NULL) == S_OK) + { + PIN_DIRECTION dir; + hr = IPin_QueryDirection(pin, &dir); + IPin_Release(pin); + if (FAILED(hr)) + { + IEnumPins_Release(pins); + return hr; + } + + if (dir == PINDIR_OUTPUT) + ++*pVal; + } + IEnumPins_Release(pins); + + This->num_streams = *pVal; + return S_OK; +} + +static HRESULT WINAPI MediaDet_get_CurrentStream(IMediaDet* iface, long *pVal) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + TRACE("(%p)\n", This); + + if (!pVal) + return E_POINTER; + + *pVal = This->cur_stream; + return S_OK; +} + +static HRESULT SetCurPin(MediaDetImpl *This, long strm) +{ + IEnumPins *pins; + IPin *pin; + HRESULT hr; + + assert(This->splitter); + assert(0 <= strm && strm < This->num_streams); + + if (This->cur_pin) + { + IPin_Release(This->cur_pin); + This->cur_pin = NULL; + } + + hr = IBaseFilter_EnumPins(This->splitter, &pins); + if (FAILED(hr)) + return hr; + + while (IEnumPins_Next(pins, 1, &pin, NULL) == S_OK && !This->cur_pin) + { + PIN_DIRECTION dir; + hr = IPin_QueryDirection(pin, &dir); + if (FAILED(hr)) + { + IPin_Release(pin); + IEnumPins_Release(pins); + return hr; + } + + if (dir == PINDIR_OUTPUT && strm-- == 0) + This->cur_pin = pin; + else + IPin_Release(pin); + } + IEnumPins_Release(pins); + + assert(This->cur_pin); + return S_OK; +} + +static HRESULT WINAPI MediaDet_put_CurrentStream(IMediaDet* iface, long newVal) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + HRESULT hr; + + TRACE("(%p)->(%ld)\n", This, newVal); + + if (This->num_streams == -1) + { + long n; + hr = MediaDet_get_OutputStreams(iface, &n); + if (FAILED(hr)) + return hr; + } + + if (newVal < 0 || This->num_streams <= newVal) + return E_INVALIDARG; + + hr = SetCurPin(This, newVal); + if (FAILED(hr)) + return hr; + + This->cur_stream = newVal; + return S_OK; +} + +static HRESULT WINAPI MediaDet_get_StreamType(IMediaDet* iface, GUID *pVal) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + FIXME("(%p)->(%p): not implemented!\n", This, debugstr_guid(pVal)); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaDet_get_StreamTypeB(IMediaDet* iface, BSTR *pVal) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + FIXME("(%p)->(%p): not implemented!\n", This, pVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaDet_get_StreamLength(IMediaDet* iface, double *pVal) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + FIXME("(%p): stub!\n", This); + return VFW_E_INVALIDMEDIATYPE; +} + +static HRESULT WINAPI MediaDet_get_Filename(IMediaDet* iface, BSTR *pVal) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + IFileSourceFilter *file; + LPOLESTR name; + HRESULT hr; + + TRACE("(%p)\n", This); + + if (!pVal) + return E_POINTER; + + *pVal = NULL; + /* MSDN says it should return E_FAIL if no file is open, but tests + show otherwise. */ + if (!This->source) + return S_OK; + + hr = IBaseFilter_QueryInterface(This->source, &IID_IFileSourceFilter, + (void **) &file); + if (FAILED(hr)) + return hr; + + hr = IFileSourceFilter_GetCurFile(file, &name, NULL); + IFileSourceFilter_Release(file); + if (FAILED(hr)) + return hr; + + *pVal = SysAllocString(name); + CoTaskMemFree(name); + if (!*pVal) + return E_OUTOFMEMORY; + + return S_OK; +} + +/* From quartz, 2008/04/07 */ +static HRESULT GetFilterInfo(IMoniker *pMoniker, GUID *pclsid, VARIANT *pvar) +{ + static const WCHAR wszClsidName[] = {'C','L','S','I','D',0}; + static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; + IPropertyBag *pPropBagCat = NULL; + HRESULT hr; + + VariantInit(pvar); + V_VT(pvar) = VT_BSTR; + + hr = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, + (LPVOID *) &pPropBagCat); + + if (SUCCEEDED(hr)) + hr = IPropertyBag_Read(pPropBagCat, wszClsidName, pvar, NULL); + + if (SUCCEEDED(hr)) + hr = CLSIDFromString(V_UNION(pvar, bstrVal), pclsid); + + if (SUCCEEDED(hr)) + hr = IPropertyBag_Read(pPropBagCat, wszFriendlyName, pvar, NULL); + + if (SUCCEEDED(hr)) + TRACE("Moniker = %s - %s\n", debugstr_guid(pclsid), + debugstr_w(V_UNION(pvar, bstrVal))); + + if (pPropBagCat) + IPropertyBag_Release(pPropBagCat); + + return hr; +} + +static HRESULT GetSplitter(MediaDetImpl *This) +{ + IFileSourceFilter *file; + LPOLESTR name; + AM_MEDIA_TYPE mt; + GUID type[2]; + IFilterMapper2 *map; + IEnumMoniker *filters; + IMoniker *mon; + VARIANT var; + GUID clsid; + IBaseFilter *splitter; + IEnumPins *pins; + IPin *source_pin, *splitter_pin; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterMapper2, (void **) &map); + if (FAILED(hr)) + return hr; + + hr = IBaseFilter_QueryInterface(This->source, &IID_IFileSourceFilter, + (void **) &file); + if (FAILED(hr)) + { + IFilterMapper2_Release(map); + return hr; + } + + hr = IFileSourceFilter_GetCurFile(file, &name, &mt); + IFileSourceFilter_Release(file); + CoTaskMemFree(name); + if (FAILED(hr)) + { + IFilterMapper2_Release(map); + return hr; + } + type[0] = mt.majortype; + type[1] = mt.subtype; + CoTaskMemFree(mt.pbFormat); + + hr = IFilterMapper2_EnumMatchingFilters(map, &filters, 0, TRUE, + MERIT_UNLIKELY, FALSE, 1, type, + NULL, NULL, FALSE, TRUE, + 0, NULL, NULL, NULL); + IFilterMapper2_Release(map); + if (FAILED(hr)) + return hr; + + hr = IEnumMoniker_Next(filters, 1, &mon, NULL); + IEnumMoniker_Release(filters); + if (hr != S_OK) /* No matches, what do we do? */ + return E_NOINTERFACE; + + hr = GetFilterInfo(mon, &clsid, &var); + IMoniker_Release(mon); + if (FAILED(hr)) + return hr; + + hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **) &splitter); + if (FAILED(hr)) + return hr; + + hr = IGraphBuilder_AddFilter(This->graph, splitter, + V_UNION(&var, bstrVal)); + if (FAILED(hr)) + { + IBaseFilter_Release(splitter); + return hr; + } + This->splitter = splitter; + + hr = IBaseFilter_EnumPins(This->source, &pins); + if (FAILED(hr)) + return hr; + IEnumPins_Next(pins, 1, &source_pin, NULL); + IEnumPins_Release(pins); + + hr = IBaseFilter_EnumPins(splitter, &pins); + if (FAILED(hr)) + { + IPin_Release(source_pin); + return hr; + } + IEnumPins_Next(pins, 1, &splitter_pin, NULL); + IEnumPins_Release(pins); + + hr = IPin_Connect(source_pin, splitter_pin, NULL); + IPin_Release(source_pin); + IPin_Release(splitter_pin); + if (FAILED(hr)) + return hr; + + return S_OK; +} + +static HRESULT WINAPI MediaDet_put_Filename(IMediaDet* iface, BSTR newVal) +{ + static const WCHAR reader[] = {'R','e','a','d','e','r',0}; + MediaDetImpl *This = (MediaDetImpl *)iface; + IGraphBuilder *gb; + IBaseFilter *bf; + HRESULT hr; + + TRACE("(%p)->(%s)\n", This, debugstr_w(newVal)); + + if (This->graph) + { + WARN("MSDN says not to call this method twice\n"); + MD_cleanup(This); + } + + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IGraphBuilder, (void **) &gb); + if (FAILED(hr)) + return hr; + + hr = IGraphBuilder_AddSourceFilter(gb, newVal, reader, &bf); + if (FAILED(hr)) + { + IGraphBuilder_Release(gb); + return hr; + } + + This->graph = gb; + This->source = bf; + hr = GetSplitter(This); + if (FAILED(hr)) + return hr; + + return MediaDet_put_CurrentStream(iface, 0); +} + +static HRESULT WINAPI MediaDet_GetBitmapBits(IMediaDet* iface, + double StreamTime, + long *pBufferSize, char *pBuffer, + long Width, long Height) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + FIXME("(%p)->(%f %p %p %ld %ld): not implemented!\n", This, StreamTime, pBufferSize, pBuffer, + Width, Height); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaDet_WriteBitmapBits(IMediaDet* iface, + double StreamTime, long Width, + long Height, BSTR Filename) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + FIXME("(%p)->(%f %ld %ld %p): not implemented!\n", This, StreamTime, Width, Height, Filename); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaDet_get_StreamMediaType(IMediaDet* iface, + AM_MEDIA_TYPE *pVal) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + IEnumMediaTypes *types; + AM_MEDIA_TYPE *pmt; + HRESULT hr; + + TRACE("(%p)\n", This); + + if (!pVal) + return E_POINTER; + + if (!This->cur_pin) + return E_INVALIDARG; + + hr = IPin_EnumMediaTypes(This->cur_pin, &types); + if (SUCCEEDED(hr)) + { + hr = (IEnumMediaTypes_Next(types, 1, &pmt, NULL) == S_OK + ? S_OK + : E_NOINTERFACE); + IEnumMediaTypes_Release(types); + } + + if (SUCCEEDED(hr)) + { + *pVal = *pmt; + CoTaskMemFree(pmt); + } + + return hr; +} + +static HRESULT WINAPI MediaDet_GetSampleGrabber(IMediaDet* iface, + ISampleGrabber **ppVal) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + FIXME("(%p)->(%p): not implemented!\n", This, ppVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaDet_get_FrameRate(IMediaDet* iface, double *pVal) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + AM_MEDIA_TYPE mt; + VIDEOINFOHEADER *vh; + HRESULT hr; + + TRACE("(%p)\n", This); + + if (!pVal) + return E_POINTER; + + hr = MediaDet_get_StreamMediaType(iface, &mt); + if (FAILED(hr)) + return hr; + + if (!IsEqualGUID(&mt.majortype, &MEDIATYPE_Video)) + { + CoTaskMemFree(mt.pbFormat); + return VFW_E_INVALIDMEDIATYPE; + } + + vh = (VIDEOINFOHEADER *) mt.pbFormat; + *pVal = 1.0e7 / (double) vh->AvgTimePerFrame; + + CoTaskMemFree(mt.pbFormat); + return S_OK; +} + +static HRESULT WINAPI MediaDet_EnterBitmapGrabMode(IMediaDet* iface, + double SeekTime) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + FIXME("(%p)->(%f): not implemented!\n", This, SeekTime); + return E_NOTIMPL; +} + +static const IMediaDetVtbl IMediaDet_VTable = +{ + MediaDet_QueryInterface, + MediaDet_AddRef, + MediaDet_Release, + MediaDet_get_Filter, + MediaDet_put_Filter, + MediaDet_get_OutputStreams, + MediaDet_get_CurrentStream, + MediaDet_put_CurrentStream, + MediaDet_get_StreamType, + MediaDet_get_StreamTypeB, + MediaDet_get_StreamLength, + MediaDet_get_Filename, + MediaDet_put_Filename, + MediaDet_GetBitmapBits, + MediaDet_WriteBitmapBits, + MediaDet_get_StreamMediaType, + MediaDet_GetSampleGrabber, + MediaDet_get_FrameRate, + MediaDet_EnterBitmapGrabMode, +}; + +HRESULT MediaDet_create(IUnknown * pUnkOuter, LPVOID * ppv) { + MediaDetImpl* obj = NULL; + + TRACE("(%p,%p)\n", ppv, pUnkOuter); + + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + obj = CoTaskMemAlloc(sizeof(MediaDetImpl)); + if (NULL == obj) { + *ppv = NULL; + return E_OUTOFMEMORY; + } + ZeroMemory(obj, sizeof(MediaDetImpl)); + + obj->refCount = 1; + obj->MediaDet_Vtbl = &IMediaDet_VTable; + obj->graph = NULL; + obj->source = NULL; + obj->splitter = NULL; + obj->cur_pin = NULL; + obj->num_streams = -1; + obj->cur_stream = 0; + *ppv = obj; + + return S_OK; +} Propchange: trunk/reactos/dll/directx/qedit/mediadet.c ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/dll/directx/qedit/qedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/qedit.c?… ============================================================================== --- trunk/reactos/dll/directx/qedit/qedit.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/qedit/qedit.c (removed) @@ -1,51 +1,0 @@ -/* - * QEDIT.DLL - ReactOS DirectShow Editing - * - * Copyright 2008 Dmitry Chapyshev - * - * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <windows.h> -#include <stdio.h> -#include <wchar.h> -#include <tchar.h> - -HRESULT WINAPI -DllCanUnloadNow(void) -{ - return S_OK; -} - -HRESULT WINAPI -DllGetClassObject( - REFCLSID rclsid, - REFIID riid, - LPVOID *ppv) -{ - return S_OK; -} - -HRESULT WINAPI -DllRegisterServer(void) -{ - return S_OK; -} - -HRESULT WINAPI -DllUnregisterServer(void) -{ - return S_OK; -} Modified: trunk/reactos/dll/directx/qedit/qedit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/qedit.rb… ============================================================================== --- trunk/reactos/dll/directx/qedit/qedit.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/qedit/qedit.rbuild [iso-8859-1] Tue Mar 24 14:17:08 2009 @@ -1,13 +1,19 @@ -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<group> -<module name="qedit" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_QEDIT}" installbase="system32" installname="qedit.dll"> +<module name="qedit" type="win32dll" baseaddress="${BASEADDRESS_QEDIT}" installbase="system32" installname="qedit.dll" allowwarnings="true"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="qedit.spec" /> <include base="qedit">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="_WIN32_WINNT">0x600</define> + <define name="__WINESRC__" /> + <file>main.c</file> + <file>mediadet.c</file> + <file>regsvr.c</file> + <library>wine</library> + <library>strmiids</library> + <library>uuid</library> + <library>oleaut32</library> + <library>ole32</library> <library>advapi32</library> <library>kernel32</library> <library>ntdll</library> - <file>qedit.c</file> - <file>qedit.rc</file> </module> -</group> Removed: trunk/reactos/dll/directx/qedit/qedit.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/qedit.rc… ============================================================================== --- trunk/reactos/dll/directx/qedit/qedit.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/qedit/qedit.rc (removed) @@ -1,9 +1,0 @@ - -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS DirectShow Editing\0" -#define REACTOS_STR_INTERNAL_NAME "qedit\0" -#define REACTOS_STR_ORIGINAL_FILENAME "qedit.dll\0" - -#include <reactos/reactx.h> - -#include <reactos/version.rc> Added: trunk/reactos/dll/directx/qedit/qedit_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/qedit_pr… ============================================================================== --- trunk/reactos/dll/directx/qedit/qedit_private.h (added) +++ trunk/reactos/dll/directx/qedit/qedit_private.h [iso-8859-1] Tue Mar 24 14:17:08 2009 @@ -1,0 +1,41 @@ +/* DirectShow Editing Services (qedit.dll) + * + * Copyright 2008 Google (Lei Zhang) + * + * This file contains the (internal) driver registration functions, + * driver enumeration APIs and DirectDraw creation functions. + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __QEDIT_PRIVATE_INCLUDED__ +#define __QEDIT_PRIVATE_INCLUDED__ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "wtypes.h" +#include "wingdi.h" +#include "winuser.h" +#include "dshow.h" +#define __WINE_DDRAW_H /* ROS HACK */ +#include "qedit.h" + +HRESULT MediaDet_create(IUnknown *pUnkOuter, LPVOID *ppObj); + +#endif /* __QEDIT_PRIVATE_INCLUDED__ */ Propchange: trunk/reactos/dll/directx/qedit/qedit_private.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/qedit/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/regsvr.c… ============================================================================== --- trunk/reactos/dll/directx/qedit/regsvr.c (added) +++ trunk/reactos/dll/directx/qedit/regsvr.c [iso-8859-1] Tue Mar 24 14:17:08 2009 @@ -1,0 +1,324 @@ +/* + * self-registerable dll functions for qedit.dll + * + * Copyright (C) 2008 Google (Lei Zhang) + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "qedit_private.h" +#include "winreg.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qedit); + +struct regsvr_coclass +{ + CLSID const *clsid; /* NULL for end of list */ + LPCSTR name; /* can be NULL to omit */ + LPCSTR ips; /* can be NULL to omit */ + LPCSTR ips32; /* can be NULL to omit */ + LPCSTR ips32_tmodel; /* can be NULL to omit */ + LPCSTR progid; /* can be NULL to omit */ + LPCSTR viprogid; /* can be NULL to omit */ + LPCSTR progid_extra; /* can be NULL to omit */ +}; + +static HRESULT register_coclasses(struct regsvr_coclass const *list); +static HRESULT unregister_coclasses(struct regsvr_coclass const *list); + +/*********************************************************************** + * static string constants + */ +static WCHAR const clsid_keyname[6] = { + 'C', 'L', 'S', 'I', 'D', 0 }; +static WCHAR const curver_keyname[7] = { + 'C', 'u', 'r', 'V', 'e', 'r', 0 }; +static WCHAR const ips_keyname[13] = { + 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', 0 }; +static WCHAR const ips32_keyname[15] = { + 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', '3', '2', 0 }; +static WCHAR const progid_keyname[7] = { + 'P', 'r', 'o', 'g', 'I', 'D', 0 }; +static WCHAR const viprogid_keyname[25] = { + 'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'd', 'e', 'p', + 'e', 'n', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'I', 'D', + 0 }; +static char const tmodel_valuename[] = "ThreadingModel"; + +/*********************************************************************** + * static helper functions + */ +static LONG register_key_defvalueW(HKEY base, WCHAR const *name, + WCHAR const *value); +static LONG register_key_defvalueA(HKEY base, WCHAR const *name, + char const *value); +static LONG register_progid(WCHAR const *clsid, + char const *progid, char const *curver_progid, + char const *name, char const *extra); + + + +/*********************************************************************** + * register_coclasses + */ +static HRESULT register_coclasses(struct regsvr_coclass const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY coclass_key; + + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL); + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->clsid; ++list) { + WCHAR buf[39]; + HKEY clsid_key; + + StringFromGUID2(list->clsid, buf, 39); + res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + + if (list->name) { + res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ, + (CONST BYTE*)(list->name), + strlen(list->name) + 1); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->ips) { + res = register_key_defvalueA(clsid_key, ips_keyname, list->ips); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->ips32) { + HKEY ips32_key; + + res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &ips32_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ, + (CONST BYTE*)list->ips32, + lstrlenA(list->ips32) + 1); + if (res == ERROR_SUCCESS && list->ips32_tmodel) + res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ, + (CONST BYTE*)list->ips32_tmodel, + strlen(list->ips32_tmodel) + 1); + RegCloseKey(ips32_key); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->progid) { + res = register_key_defvalueA(clsid_key, progid_keyname, + list->progid); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = register_progid(buf, list->progid, NULL, + list->name, list->progid_extra); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->viprogid) { + res = register_key_defvalueA(clsid_key, viprogid_keyname, + list->viprogid); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = register_progid(buf, list->viprogid, list->progid, + list->name, list->progid_extra); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + +error_close_clsid_key: + RegCloseKey(clsid_key); + } + +error_close_coclass_key: + RegCloseKey(coclass_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * unregister_coclasses + */ +static HRESULT unregister_coclasses(struct regsvr_coclass const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY coclass_key; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, + KEY_READ | KEY_WRITE, &coclass_key); + if (res == ERROR_FILE_NOT_FOUND) return S_OK; + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->clsid; ++list) { + WCHAR buf[39]; + + StringFromGUID2(list->clsid, buf, 39); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + + if (list->progid) { + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + } + + if (list->viprogid) { + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + } + } + +error_close_coclass_key: + RegCloseKey(coclass_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * regsvr_key_defvalueW + */ +static LONG register_key_defvalueW( + HKEY base, + WCHAR const *name, + WCHAR const *value) +{ + LONG res; + HKEY key; + + res = RegCreateKeyExW(base, name, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) return res; + res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)value, + (lstrlenW(value) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + return res; +} + +/*********************************************************************** + * regsvr_key_defvalueA + */ +static LONG register_key_defvalueA( + HKEY base, + WCHAR const *name, + char const *value) +{ + LONG res; + HKEY key; + + res = RegCreateKeyExW(base, name, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) return res; + res = RegSetValueExA(key, NULL, 0, REG_SZ, (CONST BYTE*)value, + lstrlenA(value) + 1); + RegCloseKey(key); + return res; +} + +/*********************************************************************** + * regsvr_progid + */ +static LONG register_progid( + WCHAR const *clsid, + char const *progid, + char const *curver_progid, + char const *name, + char const *extra) +{ + LONG res; + HKEY progid_key; + + res = RegCreateKeyExA(HKEY_CLASSES_ROOT, progid, 0, + NULL, 0, KEY_READ | KEY_WRITE, NULL, + &progid_key, NULL); + if (res != ERROR_SUCCESS) return res; + + if (name) { + res = RegSetValueExA(progid_key, NULL, 0, REG_SZ, + (CONST BYTE*)name, strlen(name) + 1); + if (res != ERROR_SUCCESS) goto error_close_progid_key; + } + + if (clsid) { + res = register_key_defvalueW(progid_key, clsid_keyname, clsid); + if (res != ERROR_SUCCESS) goto error_close_progid_key; + } + + if (curver_progid) { + res = register_key_defvalueA(progid_key, curver_keyname, + curver_progid); + if (res != ERROR_SUCCESS) goto error_close_progid_key; + } + + if (extra) { + HKEY extra_key; + + res = RegCreateKeyExA(progid_key, extra, 0, + NULL, 0, KEY_READ | KEY_WRITE, NULL, + &extra_key, NULL); + if (res == ERROR_SUCCESS) + RegCloseKey(extra_key); + } + +error_close_progid_key: + RegCloseKey(progid_key); + return res; +} + +/*********************************************************************** + * coclass list + */ +static struct regsvr_coclass const coclass_list[] = { + { &CLSID_MediaDet, + "MediaDet", + NULL, + "qedit.dll", + "Both" + }, + { NULL } /* list terminator */ +}; + +/*********************************************************************** + * DllRegisterServer (QEDIT.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + HRESULT hr; + + TRACE("\n"); + + hr = register_coclasses(coclass_list); + return hr; +} + +/*********************************************************************** + * DllUnregisterServer (QEDIT.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + HRESULT hr; + + TRACE("\n"); + + hr = unregister_coclasses(coclass_list); + return S_OK; +} Propchange: trunk/reactos/dll/directx/qedit/regsvr.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs