Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[hpoussin] 30149: Better error reporting in case of define override Support empty defines
by hpoussin＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: hpoussin Date: Mon Nov 5 11:57:04 2007 New Revision: 30149 URL: http://svn.reactos.org/svn/reactos?rev=30149&view=rev Log: Better error reporting in case of define override Support empty defines Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Nov 5 11:57:04 2007 @@ -644,11 +644,8 @@ parameters += "$(QT)"; parameters += "-D"; parameters += define.name; - if (define.value.length () > 0) - { - parameters += "="; - parameters += define.value; - } + parameters += "="; + parameters += define.value; if (define.name.find('(') != string::npos) parameters += "$(QT)"; used_defs.insert(used_defs.begin(),define.name); @@ -766,7 +763,7 @@ const char* assignmentOperation, const string& macro, const IfableData& data, - set<string> *used_defs, + set<const Define *> *used_defs, bool generatingCompilerMacro ) { size_t i; @@ -814,32 +811,42 @@ for ( i = 0; i < data.defines.size(); i++ ) { const Define& define = *data.defines[i]; - if ( used_defs && used_defs->find ( define.name ) != used_defs->end () ) + if ( used_defs ) { - if ( !define.overridable ) + set<const Define *>::const_iterator last_define; + for (last_define = used_defs->begin (); + last_define != used_defs->end (); + last_define++) { - throw InvalidOperationException ( __FILE__, - __LINE__, - "Invalid override of define '%s' in module '%s'", - define.name.c_str (), - module.name.c_str () ); + if ( (*last_define)->name != define.name ) + continue; + if ( !define.overridable ) + { + throw InvalidOperationException ( define.node->location.c_str (), + 0, + "Invalid override of define '%s', already defined at %s", + define.name.c_str (), + (*last_define)->node->location.c_str () ); + } + if ( backend->configuration.Verbose ) + printf("%s: Overriding '%s' already defined at %s\n", + (*last_define)->node->location.c_str (), define.name.c_str (), + define.node->location.c_str () ); + break; } - if ( backend->configuration.Verbose ) - printf("Define '%s' overridden in module '%s'\n", - define.name.c_str (), module.name.c_str () ); - continue; + if ( last_define != used_defs->end () ) + continue; } fprintf ( fMakefile, " -D%s", define.name.c_str() ); - if ( define.value.size() ) - fprintf ( - fMakefile, - "=%s", - define.value.c_str() ); + fprintf ( + fMakefile, + "=%s", + define.value.c_str() ); if ( used_defs ) - used_defs->insert(used_defs->begin(), define.name); + used_defs->insert( used_defs->begin (), &define ); } if ( generateAssignment ) { @@ -852,7 +859,7 @@ const char* assignmentOperation, const IfableData& data, const vector<LinkerFlag*>* linkerFlags, - set<string>& used_defs ) + set<const Define *>& used_defs ) { size_t i; @@ -2050,7 +2057,7 @@ void MingwModuleHandler::GenerateOtherMacros () { - set<string> used_defs; + set<const Define *> used_defs; cflagsMacro = ssprintf ("%s_CFLAGS", module.name.c_str ()); nasmflagsMacro = ssprintf ("%s_NASMFLAGS", module.name.c_str ()); Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Mon Nov 5 11:57:04 2007 @@ -137,12 +137,12 @@ void GenerateMacro ( const char* assignmentOperation, const std::string& macro, const IfableData& data, - std::set<std::string>* used_defs, + std::set<const Define *>* used_defs, bool generatingCompilerMacro ); void GenerateMacros ( const char* op, const IfableData& data, const std::vector<LinkerFlag*>* linkerFlags, - std::set<std::string>& used_defs ); + std::set<const Define *>& used_defs ); void GenerateSourceMacros ( const char* assignmentOperation, const IfableData& data ); void GenerateObjectMacros ( const char* assignmentOperation,

1 0

[greatlrd] 30148: add 6 more guids for ksguid.a
by greatlrd＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: greatlrd Date: Mon Nov 5 09:58:52 2007 New Revision: 30148 URL: http://svn.reactos.org/svn/reactos?rev=30148&view=rev Log: add 6 more guids for ksguid.a Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/lib/sdk/ksguid/k… ============================================================================== --- branches/reactx/reactos/lib/sdk/ksguid/ksguid.c (original) +++ branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Mon Nov 5 09:58:52 2007 @@ -14,6 +14,12 @@ #include <basetyps.h> #include <guiddef.h> +DEFINE_GUID(KSDEGRADESETID_Standard, 0x9F564180, 0x704C, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSEVENTSETID_Connection, 0x7F4BCBE0, 0x9EA5, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSEVENTSETID_Clock, 0x364D8E20, 0x62C7, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_Clock, 0xDF12A4C0, 0xAC17, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_Stream, 0x65AABA60, 0x98AE, 0x11CF, 0xA1, 0x0D, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSPROPSETID_StreamInterface, 0x1FDD8EE1, 0x9CD3, 0x11D0, 0x82, 0xAA, 0x00, 0x00, 0xF8, 0x22, 0xFE, 0x8A); DEFINE_GUID(KSPROPSETID_StreamAllocator, 0xCF6E4342, 0xEC87, 0x11CF, 0xA1, 0x30, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); DEFINE_GUID(KSMETHODSETID_StreamAllocator, 0xCF6E4341, 0xEC87, 0x11CF, 0xA1, 0x30, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); DEFINE_GUID(KSEVENTSETID_StreamAllocator, 0x75D95571, 0x073C, 0x11D0, 0xA1, 0x61, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4);

1 0

[greatlrd] 30147: add 20 more guids for ksguid.a
by greatlrd＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: greatlrd Date: Mon Nov 5 09:49:27 2007 New Revision: 30147 URL: http://svn.reactos.org/svn/reactos?rev=30147&view=rev Log: add 20 more guids for ksguid.a Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/lib/sdk/ksguid/k… ============================================================================== --- branches/reactx/reactos/lib/sdk/ksguid/ksguid.c (original) +++ branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Mon Nov 5 09:49:27 2007 @@ -14,6 +14,26 @@ #include <basetyps.h> #include <guiddef.h> +DEFINE_GUID(KSPROPSETID_StreamAllocator, 0xCF6E4342, 0xEC87, 0x11CF, 0xA1, 0x30, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSMETHODSETID_StreamAllocator, 0xCF6E4341, 0xEC87, 0x11CF, 0xA1, 0x30, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSEVENTSETID_StreamAllocator, 0x75D95571, 0x073C, 0x11D0, 0xA1, 0x61, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSMEMORY_TYPE_DEVICE_UNKNOWN, 0x091BB639, 0x603F, 0x11D1, 0xB0, 0x67, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); +DEFINE_GUID(KSMEMORY_TYPE_KERNEL_NONPAGED, 0x4A6D5FC4, 0x7895, 0x11D1, 0xB0, 0x69, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); +DEFINE_GUID(KSMEMORY_TYPE_KERNEL_PAGED, 0xD833F8F8, 0x7894, 0x11D1, 0xB0, 0x69, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); +DEFINE_GUID(KSMEMORY_TYPE_USER, 0x8CB0FC28, 0x7893, 0x11D1, 0xB0, 0x69, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); +DEFINE_GUID(KSMEMORY_TYPE_SYSTEM, 0x091BB638, 0x603F, 0x11D1, 0xB0, 0x67, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); +DEFINE_GUID(KSPROPSETID_Connection, 0x1D58C920, 0xAC9B, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_Quality, 0xD16AD380, 0xAC1A, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_NONE, 0x0F6417D6, 0xC318, 0x11D0, 0xA4, 0x3F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_FILEHANDLE, 0x65E8773C, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_FILENAME, 0xAA797B40, 0xE974, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_NONE, 0xE436EB8E, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); +DEFINE_GUID(KSDATAFORMAT_TYPE_STREAM, 0xE436EB83, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); +DEFINE_GUID(KSNAME_TopologyNode, 0x0621061A, 0xEE75, 0x11D0, 0xB9, 0x15, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNAME_Allocator, 0x642F5D00, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSNAME_Clock, 0x53172480, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSNAME_Pin, 0x146F1A80, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSNAME_Filter, 0x9B365890, 0x165F, 0x11D0, 0xA1, 0x95, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); DEFINE_GUID(KSPROPSETID_Pin, 0x8C134960, 0x51AD, 0x11CF, 0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00); DEFINE_GUID(KSMEDIUMSETID_Standard, 0x4747B320, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); DEFINE_GUID(KSINTERFACESETID_FileIo, 0x8C6F932C, 0xE771, 0x11D0, 0xB8, 0xFF, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96);

1 0

[jimtabor] 30146: Fix typos,, now it runs.
by jimtabor＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: jimtabor Date: Mon Nov 5 06:09:52 2007 New Revision: 30146 URL: http://svn.reactos.org/svn/reactos?rev=30146&view=rev Log: Fix typos,, now it runs. Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/dll/win32/gdi32/objects/region.c Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c Mon Nov 5 06:09:52 2007 @@ -346,7 +346,7 @@ pgO->gbHdr.Size = sizeof(GDIBSOBJECT); pgO->hgdiobj = hObject; - pTeb->GdiTebBatch.Offset += sizeof(GDIBSSETBRHORG); + pTeb->GdiTebBatch.Offset += sizeof(GDIBSOBJECT); pTeb->GdiBatchCount++; if (pTeb->GdiBatchCount >= GDI_BatchLimit) NtGdiFlush(); return TRUE; Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c Mon Nov 5 06:09:52 2007 @@ -99,10 +99,9 @@ pTeb->GdiTebBatch.Offset); pgO->gbHdr.Cmd = GdiBCDelRgn; pgO->gbHdr.Size = sizeof(GDIBSOBJECT); - pgO->hgdiobj = (HGDIOBJ)hRgn; - pTeb->GdiTebBatch.Offset += sizeof(GDIBSSETBRHORG); + pTeb->GdiTebBatch.Offset += sizeof(GDIBSOBJECT); pTeb->GdiBatchCount++; if (pTeb->GdiBatchCount >= GDI_BatchLimit) NtGdiFlush(); return TRUE;

1 0

[jimtabor] 30145: Allow batch flush to handle null DCs.
by jimtabor＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: jimtabor Date: Mon Nov 5 05:25:43 2007 New Revision: 30145 URL: http://svn.reactos.org/svn/reactos?rev=30145&view=rev Log: Allow batch flush to handle null DCs. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Mon Nov 5 05:25:43 2007 @@ -18,9 +18,9 @@ FASTCALL GdiFlushUserBatch(HDC hDC, PGDIBATCHHDR pHdr) { - PDC dc = DC_LockDc(hDC); - if (!dc) return 0; - // The thread is on the end of sunset. + PDC dc = NULL; + if (hDC) dc = DC_LockDc(hDC); + // The thread is approaching the end of sunset. switch(pHdr->Cmd) { case GdiBCPatBlt: // Highest pri first! @@ -33,6 +33,7 @@ break; case GdiBCSetBrushOrg: { + if (!dc) break; PGDIBSSETBRHORG pgSBO = (PGDIBSSETBRHORG) pHdr; dc->Dc_Attr.ptlBrushOrigin = pgSBO->ptlBrushOrigin; break; @@ -49,10 +50,9 @@ break; } default: - DC_UnlockDc(dc); - return 0; + break; } - DC_UnlockDc(dc); + if (dc) DC_UnlockDc(dc); return pHdr->Size; // Return the full size of the structure. }

1 0

[jimtabor] 30144: - Implement batching for DeleteObject. - Implemented DeleteRegion, a support function with batching. - Add delete objects and a hack to fake the running of the batch to gdibatch.c. - These batching functions will not run until proper structure attributes are implemented.
by jimtabor＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: jimtabor Date: Mon Nov 5 04:50:59 2007 New Revision: 30144 URL: http://svn.reactos.org/svn/reactos?rev=30144&view=rev Log: - Implement batching for DeleteObject. - Implemented DeleteRegion, a support function with batching. - Add delete objects and a hack to fake the running of the batch to gdibatch.c. - These batching functions will not run until proper structure attributes are implemented. Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/dll/win32/gdi32/objects/region.c trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h Mon Nov 5 04:50:59 2007 @@ -113,6 +113,10 @@ ); BOOL +FASTCALL +DeleteRegion( HRGN ); + +BOOL GdiIsHandleValid(HGDIOBJ hGdiObj); BOOL Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c Mon Nov 5 04:50:59 2007 @@ -284,7 +284,7 @@ DeleteObject(HGDIOBJ hObject) { UINT Type = 0; - + /* From Wine: DeleteObject does not SetLastError() on a null object */ if(!hObject) return FALSE; @@ -308,6 +308,8 @@ return DeleteDC((HDC) hObject); case GDI_OBJECT_TYPE_COLORSPACE: return NtGdiDeleteColorSpace((HCOLORSPACE) hObject); + case GDI_OBJECT_TYPE_REGION: + return DeleteRegion((HRGN) hObject); #if 0 case GDI_OBJECT_TYPE_METADC: return MFDRV_DeleteObject( hObject ); @@ -318,12 +320,42 @@ return EMFDRV_DeleteObject( hObject ); } #endif - case GDI_OBJECT_TYPE_REGION: + case GDI_OBJECT_TYPE_FONT: + break; + case GDI_OBJECT_TYPE_BRUSH: case GDI_OBJECT_TYPE_EXTPEN: case GDI_OBJECT_TYPE_PEN: - case GDI_OBJECT_TYPE_FONT: + { +#if 0 + PBRUSH_ATTR Brh_Attr; + PTEB pTeb; + + if ((!GdiGetHandleUserData(hObject, (PVOID) &Brh_Attr)) || + (Brh_Attr == NULL) ) break; + + pTeb = NtCurrentTeb(); + + if (pTeb->Win32ThreadInfo == NULL) break; + + if ((pTeb->GdiTebBatch.Offset + sizeof(GDIBSOBJECT)) <= GDIBATCHBUFSIZE) + { + PGDIBSOBJECT pgO = (PGDIBSOBJECT)(&pTeb->GdiTebBatch.Buffer[0] + + pTeb->GdiTebBatch.Offset); + pgO->gbHdr.Cmd = GdiBCDelObj; + pgO->gbHdr.Size = sizeof(GDIBSOBJECT); + pgO->hgdiobj = hObject; + + pTeb->GdiTebBatch.Offset += sizeof(GDIBSSETBRHORG); + pTeb->GdiBatchCount++; + if (pTeb->GdiBatchCount >= GDI_BatchLimit) NtGdiFlush(); + return TRUE; + } +#endif + break; + } case GDI_OBJECT_TYPE_BITMAP: + default: break; } return NtGdiDeleteObjectApp(hObject); Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c Mon Nov 5 04:50:59 2007 @@ -76,3 +76,40 @@ return CreateRectRgn(prc->left, prc->top, prc->right, prc->bottom); } + +/* + * I thought it was okay to have this in DeleteObject but~ Speed. (jt) + */ +BOOL +FASTCALL +DeleteRegion( HRGN hRgn ) +{ +#if 0 + PREGION_ATTR Rgn_Attr; + + if ((GdiGetHandleUserData((HGDIOBJ) hRgn, (PVOID) &Rgn_Attr)) && + ( Rgn_Attr != NULL )) + { + PTEB pTeb = NtCurrentTeb(); + if (pTeb->Win32ThreadInfo != NULL) + { + if ((pTeb->GdiTebBatch.Offset + sizeof(GDIBSOBJECT)) <= GDIBATCHBUFSIZE) + { + PGDIBSOBJECT pgO = (PGDIBSOBJECT)(&pTeb->GdiTebBatch.Buffer[0] + + pTeb->GdiTebBatch.Offset); + pgO->gbHdr.Cmd = GdiBCDelRgn; + pgO->gbHdr.Size = sizeof(GDIBSOBJECT); + + pgO->hgdiobj = (HGDIOBJ)hRgn; + + pTeb->GdiTebBatch.Offset += sizeof(GDIBSSETBRHORG); + pTeb->GdiBatchCount++; + if (pTeb->GdiBatchCount >= GDI_BatchLimit) NtGdiFlush(); + return TRUE; + } + } + } +#endif + return NtGdiDeleteObjectApp((HGDIOBJ) hRgn); +} + Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Mon Nov 5 04:50:59 2007 @@ -42,9 +42,12 @@ case GdiBCSelObj: break; case GdiBCDelObj: + case GdiBCDelRgn: + { + PGDIBSOBJECT pgO = (PGDIBSOBJECT) pHdr; + NtGdiDeleteObject( pgO->hgdiobj ); break; - case GdiBCDelRgn: - break; + } default: DC_UnlockDc(dc); return 0; @@ -62,6 +65,8 @@ APIENTRY NtGdiFlush(VOID) { + // Hack! FIXME! + NtYieldExecution(); // Force thread to sunset and run the flush. UNIMPLEMENTED; } @@ -82,7 +87,11 @@ if( (GdiBatchCount > 0) && (GdiBatchCount <= GDIBATCHBUFSIZE)) { HDC hDC = (HDC) pTeb->GdiTebBatch.HDC; - if (hDC) +// +// If hDC is zero and the buffer fills up with delete objects we need to run +// anyway. So, hard code to the system batch limit. +// + if ((hDC) || (GdiBatchCount >= GDI_BATCH_LIMIT)) { PULONG pHdr = &pTeb->GdiTebBatch.Buffer[0]; // No need to init anything, just go!

1 0

[greatlrd] 30143: 21 more guid to ksguid.a
by greatlrd＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: greatlrd Date: Mon Nov 5 03:55:46 2007 New Revision: 30143 URL: http://svn.reactos.org/svn/reactos?rev=30143&view=rev Log: 21 more guid to ksguid.a Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/lib/sdk/ksguid/k… ============================================================================== --- branches/reactx/reactos/lib/sdk/ksguid/ksguid.c (original) +++ branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Mon Nov 5 03:55:46 2007 @@ -14,6 +14,27 @@ #include <basetyps.h> #include <guiddef.h> +DEFINE_GUID(KSPROPSETID_Pin, 0x8C134960, 0x51AD, 0x11CF, 0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSMEDIUMSETID_Standard, 0x4747B320, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSINTERFACESETID_FileIo, 0x8C6F932C, 0xE771, 0x11D0, 0xB8, 0xFF, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSINTERFACESETID_Standard, 0x1A8766A0, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSTIME_FORMAT_MEDIA_TIME, 0x7B785574, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); +DEFINE_GUID(KSTIME_FORMAT_FIELD, 0x7B785573, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); +DEFINE_GUID(KSTIME_FORMAT_SAMPLE, 0x7B785572, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); +DEFINE_GUID(KSTIME_FORMAT_BYTE, 0x7B785571, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); +DEFINE_GUID(KSTIME_FORMAT_FRAME, 0x7B785570, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); +DEFINE_GUID(KSCATEGORY_QUALITY, 0x97EBAACB, 0x95BD, 0x11D0, 0xA3, 0xEA, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_PROXY, 0x97EBAACA, 0x95BD, 0x11D0, 0xA3, 0xEA, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_CLOCK, 0x53172480, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_FILESYSTEM, 0x760FED5E, 0x9357, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_MEDIUMTRANSFORM, 0xCF1DDA2E, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_INTERFACETRANSFORM, 0xCF1DDA2D, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_COMMUNICATIONSTRANSFORM, 0xCF1DDA2C, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_DATATRANSFORM, 0x2EB07EA0, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_DATADECOMPRESSOR, 0x2721AE20, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_DATACOMPRESSOR, 0x1E84C900, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_SPLITTER, 0x0A4252A0, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_MIXER, 0xAD809C00, 0x7B88, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); DEFINE_GUID(KSCATEGORY_RENDER, 0x65E8773E, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSCATEGORY_CAPTURE, 0x65E8773D, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSCATEGORY_BRIDGE, 0x085AFF00, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00);

1 0

[jimtabor] 30142: Fix typo in header.
by jimtabor＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: jimtabor Date: Mon Nov 5 03:07:09 2007 New Revision: 30142 URL: http://svn.reactos.org/svn/reactos?rev=30142&view=rev Log: Fix typo in header. Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Mon Nov 5 03:07:09 2007 @@ -283,6 +283,6 @@ { GDIBATCHHDR gbHdr; HGDIOBJ hgdiobj; -} GDIBSOBJJECT, *PGDIBSOBJECT; +} GDIBSOBJECT, *PGDIBSOBJECT; #endif

1 0

[greatlrd] 30141: Add follow guids to ksguid.a/ksguid.lib KSCATEGORY_RENDER, KSCATEGORY_CAPTURE, KSCATEGORY_BRIDGE
by greatlrd＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: greatlrd Date: Mon Nov 5 03:03:15 2007 New Revision: 30141 URL: http://svn.reactos.org/svn/reactos?rev=30141&view=rev Log: Add follow guids to ksguid.a/ksguid.lib KSCATEGORY_RENDER, KSCATEGORY_CAPTURE, KSCATEGORY_BRIDGE Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/lib/sdk/ksguid/k… ============================================================================== --- branches/reactx/reactos/lib/sdk/ksguid/ksguid.c (original) +++ branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Mon Nov 5 03:03:15 2007 @@ -14,7 +14,9 @@ #include <basetyps.h> #include <guiddef.h> - +DEFINE_GUID(KSCATEGORY_RENDER, 0x65E8773E, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_CAPTURE, 0x65E8773D, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_BRIDGE, 0x085AFF00, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); DEFINE_GUID(KSPROPSETID_GM, 0xAF627536, 0xE719, 0x11D2, 0x8A, 0x1D, 0x00, 0x60, 0x97, 0xD2, 0xDF, 0x5D); DEFINE_GUID(KSPROPSETID_Topology, 0x720D4AC0, 0x7533, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); DEFINE_GUID(KSPROPSETID_MediaSeeking, 0xEE904F0C, 0xD09B, 0x11D0, 0xAB, 0xE9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96);

1 0

[greatlrd] 30140: Fix varus issue. make audiosrv using the new ks.h and link with ksguid Fix dxapi build Fix ddkmapi.h so it works like windkk version 3790.1830 offline #define DEFINE_KSPROPERTY_TOPOLOGYSET in ks.h it seam some type problem there
by greatlrd＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: greatlrd Date: Mon Nov 5 02:54:40 2007 New Revision: 30140 URL: http://svn.reactos.org/svn/reactos?rev=30140&view=rev Log: Fix varus issue. make audiosrv using the new ks.h and link with ksguid Fix dxapi build Fix ddkmapi.h so it works like windkk version 3790.1830 offline #define DEFINE_KSPROPERTY_TOPOLOGYSET in ks.h it seam some type problem there Modified: branches/reactx/reactos/base/services/audiosrv/audiosrv.rbuild branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild branches/reactx/reactos/drivers/directx/dxapi/dxapi.rbuild branches/reactx/reactos/include/ddk/ddkmapi.h branches/reactx/reactos/include/dxsdk/ks.h branches/reactx/reactos/lib/sdk/sdk.rbuild Modified: branches/reactx/reactos/base/services/audiosrv/audiosrv.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/base/services/au… ============================================================================== --- branches/reactx/reactos/base/services/audiosrv/audiosrv.rbuild (original) +++ branches/reactx/reactos/base/services/audiosrv/audiosrv.rbuild Mon Nov 5 02:54:40 2007 @@ -9,6 +9,7 @@ <library>advapi32</library> <library>user32</library> <library>setupapi</library> + <library>ksguid</library> <file>main.c</file> <file>pnp_list_manager.c</file> <file>pnp_list_lock.c</file> Modified: branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild (original) +++ branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild Mon Nov 5 02:54:40 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="ddraw" type="win32dll" entrypoint="0" installbase="system32" installname="ddraw.dll" allowwarnings ="true"> +<module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" allowwarnings ="true"> <importlibrary definition="ddraw.def" /> <include base="ddraw">.</include> <define name="UNICODE" /> Modified: branches/reactx/reactos/drivers/directx/dxapi/dxapi.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxapi/dxapi.rbuild (original) +++ branches/reactx/reactos/drivers/directx/dxapi/dxapi.rbuild Mon Nov 5 02:54:40 2007 @@ -8,7 +8,7 @@ <define name="_DXAPI_" /> <library>ntoskrnl</library> <library>hal</library> - <library>videoport</library> + <library>videoprt</library> <file>main.c</file> <file>dxapi.rc</file> </module> Modified: branches/reactx/reactos/include/ddk/ddkmapi.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/ddk/ddkm… ============================================================================== --- branches/reactx/reactos/include/ddk/ddkmapi.h (original) +++ branches/reactx/reactos/include/ddk/ddkmapi.h Mon Nov 5 02:54:40 2007 @@ -20,16 +20,9 @@ * */ -#ifndef __DDKMAPI_H -#define __DDKMAPI_H - -#if __GNUC__ >=3 -#pragma GCC system_header -#endif - -#ifdef __cplusplus -extern "C" { -#endif +#ifndef __DDKMAPI_INCLUDED__ +#define __DDKMAPI_INCLUDED__ + #if defined(_DXAPI_) #define DXAPI DECLSPEC_EXPORT @@ -37,29 +30,12 @@ #define DXAPI DECLSPEC_IMPORT #endif -DXAPI -DWORD -FAR PASCAL -DxApi( - IN DWORD dwFunctionNum, - IN LPVOID lpvInBuffer, - IN DWORD cbInBuffer, - OUT LPVOID lpvOutBuffer, - OUT DWORD cbOutBuffer); - -typedef DWORD (FAR PASCAL *LPDXAPI)( - DWORD dwFunctionNum, - LPVOID lpvInBuffer, - DWORD cbInBuffer, - LPVOID lpvOutBuffer, - DWORD cbOutBuffer); #define DXAPI_MAJORVERSION 1 #define DXAPI_MINORVERSION 0 -#define DD_FIRST_DXAPI 0x500 - +#define DD_FIRST_DXAPI 0x500 #define DD_DXAPI_GETVERSIONNUMBER (DD_FIRST_DXAPI) #define DD_DXAPI_CLOSEHANDLE (DD_FIRST_DXAPI+1) #define DD_DXAPI_OPENDIRECTDRAW (DD_FIRST_DXAPI+2) @@ -83,114 +59,159 @@ #define DD_DXAPI_ADDVPCAPTUREBUFFER (DD_FIRST_DXAPI+20) #define DD_DXAPI_FLUSHVPCAPTUREBUFFERS (DD_FIRST_DXAPI+21) - -typedef struct _DDCAPBUFFINFO { - DWORD dwFieldNumber; - DWORD bPolarity; - LARGE_INTEGER liTimeStamp; - DWORD ddRVal; -} DDCAPBUFFINFO, FAR * LPDDCAPBUFFINFO; +/* DDOPENVPCAPTUREDEVICEIN.dwFlags constants */ +#define DDOPENCAPTURE_VIDEO 0x0001 +#define DDOPENCAPTURE_VBI 0x0002 /* DDADDVPCAPTUREBUFF.dwFlags constants */ -#define DDADDBUFF_SYSTEMMEMORY 0x0001 -#define DDADDBUFF_NONLOCALVIDMEM 0x0002 -#define DDADDBUFF_INVERT 0x0004 - -typedef struct _DDADDVPCAPTUREBUFF { - HANDLE hCapture; - DWORD dwFlags; - PMDL pMDL; - PKEVENT pKEvent; - LPDDCAPBUFFINFO lpBuffInfo; -} DDADDVPCAPTUREBUFF, FAR * LPDDADDVPCAPTUREBUFF; - -typedef struct _DDCLOSEHANDLE { - HANDLE hHandle; -} DDCLOSEHANDLE, FAR *LPDDCLOSEHANDLE; - -typedef struct _DDFLIPOVERLAY { - HANDLE hDirectDraw; +#define DDADDBUFF_SYSTEMMEMORY 0x0001 +#define DDADDBUFF_NONLOCALVIDMEM 0x0002 +#define DDADDBUFF_INVERT 0x0004 + +/* DDGETSURFACESTATEOUT.dwStateCaps/dwStateStatus constants */ +#define DDSTATE_BOB 0x0001 +#define DDSTATE_WEAVE 0x0002 +#define DDSTATE_EXPLICITLY_SET 0x0004 +#define DDSTATE_SOFTWARE_AUTOFLIP 0x0008 +#define DDSTATE_SKIPEVENFIELDS 0x0010 + +/* DDREGISTERCALLBACK.dwEvents constants */ +#define DDEVENT_DISPLAY_VSYNC 0x0001 +#define DDEVENT_VP_VSYNC 0x0002 +#define DDEVENT_VP_LINE 0x0004 +#define DDEVENT_PRERESCHANGE 0x0008 +#define DDEVENT_POSTRESCHANGE 0x0010 +#define DDEVENT_PREDOSBOX 0x0020 +#define DDEVENT_POSTDOSBOX 0x0040 + +/* LPDD_NOTIFYCALLBACK.dwFlags constants */ +#define DDNOTIFY_DISPLAY_VSYNC 0x0001 +#define DDNOTIFY_VP_VSYNC 0x0002 +#define DDNOTIFY_VP_LINE 0x0004 +#define DDNOTIFY_PRERESCHANGE 0x0008 +#define DDNOTIFY_POSTRESCHANGE 0x0010 +#define DDNOTIFY_PREDOSBOX 0x0020 +#define DDNOTIFY_POSTDOSBOX 0x0040 +#define DDNOTIFY_CLOSEDIRECTDRAW 0x0080 +#define DDNOTIFY_CLOSESURFACE 0x0100 +#define DDNOTIFY_CLOSEVIDEOPORT 0x0200 +#define DDNOTIFY_CLOSECAPTURE 0x0400 + +typedef DWORD (*LPDXAPI)(DWORD dwFunctionNum, LPVOID lpvInBuffer, DWORD cbInBuffer, LPVOID lpvOutBuffer, DWORD cbOutBuffer); +typedef ULONG (*LPDD_NOTIFYCALLBACK) (DWORD dwFlags, PVOID pContext, DWORD dwParam1, DWORD dwParam2); + +typedef struct _DDCAPBUFFINFO +{ + DWORD dwFieldNumber; + DWORD bPolarity; + LARGE_INTEGER liTimeStamp; + DWORD ddRVal; +} DDCAPBUFFINFO, * LPDDCAPBUFFINFO; + +typedef struct _DDADDVPCAPTUREBUFF +{ + HANDLE hCapture; + DWORD dwFlags; + PMDL pMDL; + PKEVENT pKEvent; + LPDDCAPBUFFINFO lpBuffInfo; +} DDADDVPCAPTUREBUFF, * LPDDADDVPCAPTUREBUFF; + +typedef struct _DDCLOSEHANDLE +{ + HANDLE hHandle; +} DDCLOSEHANDLE, *LPDDCLOSEHANDLE; + +typedef struct _DDFLIPOVERLAY +{ + HANDLE hDirectDraw; + HANDLE hCurrentSurface; + HANDLE hTargetSurface; + DWORD dwFlags; +} DDFLIPOVERLAY, *LPDDFLIPOVERLAY; + +typedef struct _DDFLIPVIDEOPORT +{ + HANDLE hDirectDraw; + HANDLE hVideoPort; HANDLE hCurrentSurface; HANDLE hTargetSurface; DWORD dwFlags; -} DDFLIPOVERLAY, FAR *LPDDFLIPOVERLAY; - -typedef struct _DDFLIPVIDEOPORT { - HANDLE hDirectDraw; - HANDLE hVideoPort; - HANDLE hCurrentSurface; - HANDLE hTargetSurface; - DWORD dwFlags; -} DDFLIPVIDEOPORT, FAR *LPDDFLIPVIDEOPORT; - -typedef struct _DDGETAUTOFLIPIN { - HANDLE hDirectDraw; - HANDLE hVideoPort; -} DDGETAUTOFLIPIN, FAR *LPDDGETAUTOFLIPIN; - -typedef struct _DDGETAUTOFLIPOUT { +} DDFLIPVIDEOPORT, *LPDDFLIPVIDEOPORT; + +typedef struct _DDGETAUTOFLIPIN +{ + HANDLE hDirectDraw; + HANDLE hVideoPort; +} DDGETAUTOFLIPIN, *LPDDGETAUTOFLIPIN; + +typedef struct _DDGETAUTOFLIPOUT +{ DWORD ddRVal; HANDLE hVideoSurface; HANDLE hVBISurface; BOOL bPolarity; -} DDGETAUTOFLIPOUT, FAR *LPDDGETAUTOFLIPOUT; - -typedef struct _DDGETPOLARITYIN { - HANDLE hDirectDraw; - HANDLE hVideoPort; -} DDGETPOLARITYIN, FAR *LPDDGETPOLARITYIN; - -typedef struct _DDGETPOLARITYOUT { +} DDGETAUTOFLIPOUT, *LPDDGETAUTOFLIPOUT; + +typedef struct _DDGETPOLARITYIN +{ + HANDLE hDirectDraw; + HANDLE hVideoPort; +} DDGETPOLARITYIN, *LPDDGETPOLARITYIN; + +typedef struct _DDGETPOLARITYOUT +{ DWORD ddRVal; BOOL bPolarity; -} DDGETPOLARITYOUT, FAR *LPDDGETPOLARITYOUT; - -typedef struct _DDGETSURFACESTATEIN { +} DDGETPOLARITYOUT, *LPDDGETPOLARITYOUT; + +typedef struct _DDGETSURFACESTATEIN +{ HANDLE hDirectDraw; HANDLE hSurface; -} DDGETSURFACESTATEIN, FAR *LPDDGETSURFACESTATEIN; - -/* DDGETSURFACESTATEOUT.dwStateCaps/dwStateStatus constants */ -#define DDSTATE_BOB 0x0001 -#define DDSTATE_WEAVE 0x0002 -#define DDSTATE_EXPLICITLY_SET 0x0004 -#define DDSTATE_SOFTWARE_AUTOFLIP 0x0008 -#define DDSTATE_SKIPEVENFIELDS 0x0010 - -typedef struct _DDGETSURFACESTATEOUT { +} DDGETSURFACESTATEIN, *LPDDGETSURFACESTATEIN; + +typedef struct _DDGETSURFACESTATEOUT +{ DWORD ddRVal; DWORD dwStateCaps; DWORD dwStateStatus; -} DDGETSURFACESTATEOUT, FAR *LPDDGETSURFACESTATEOUT; - -typedef struct _DDGETFIELDNUMIN { - HANDLE hDirectDraw; - HANDLE hVideoPort; -} DDGETFIELDNUMIN, FAR *LPDDGETFIELDNUMIN; - -typedef struct _DDGETFIELDNUMOUT { +} DDGETSURFACESTATEOUT, *LPDDGETSURFACESTATEOUT; + +typedef struct _DDGETFIELDNUMIN +{ + HANDLE hDirectDraw; + HANDLE hVideoPort; +} DDGETFIELDNUMIN, *LPDDGETFIELDNUMIN; + +typedef struct _DDGETFIELDNUMOUT +{ DWORD ddRVal; DWORD dwFieldNum; -} DDGETFIELDNUMOUT, FAR *LPDDGETFIELDNUMOUT; - -typedef struct _DDGETKERNELCAPSOUT { +} DDGETFIELDNUMOUT, *LPDDGETFIELDNUMOUT; + +typedef struct _DDGETKERNELCAPSOUT +{ DWORD ddRVal; DWORD dwCaps; DWORD dwIRQCaps; -} DDGETKERNELCAPSOUT, FAR *LPDDGETKERNELCAPSOUT; - -typedef struct _DDGETVERSIONNUMBER { +} DDGETKERNELCAPSOUT, *LPDDGETKERNELCAPSOUT; + +typedef struct _DDGETVERSIONNUMBER +{ DWORD ddRVal; DWORD dwMajorVersion; DWORD dwMinorVersion; -} DDGETVERSIONNUMBER, FAR *LPDDGETVERSIONNUMBER; - -typedef struct _DDLOCKIN { +} DDGETVERSIONNUMBER, *LPDDGETVERSIONNUMBER; + +typedef struct _DDLOCKIN +{ HANDLE hDirectDraw; HANDLE hSurface; -} DDLOCKIN, FAR *LPDDLOCKIN; - -typedef struct _DDLOCKOUT { +} DDLOCKIN, *LPDDLOCKIN; + +typedef struct _DDLOCKOUT +{ DWORD ddRVal; DWORD dwSurfHeight; DWORD dwSurfWidth; @@ -200,79 +221,67 @@ DWORD dwFormatFlags; DWORD dwFormatFourCC; DWORD dwFormatBitCount; - _ANONYMOUS_UNION union { + union + { DWORD dwRBitMask; DWORD dwYBitMask; - } DUMMYUNIONNAME; - _ANONYMOUS_UNION union { + }; + union + { DWORD dwGBitMask; DWORD dwUBitMask; - } DUMMYUNIONNAME2; - _ANONYMOUS_UNION union { + }; + union + { DWORD dwBBitMask; DWORD dwVBitMask; - } DUMMYUNIONNAME3; -} DDLOCKOUT, FAR *LPDDLOCKOUT; - -/* LPDD_NOTIFYCALLBACK.dwFlags constants */ -#define DDNOTIFY_DISPLAY_VSYNC 0x0001 -#define DDNOTIFY_VP_VSYNC 0x0002 -#define DDNOTIFY_VP_LINE 0x0004 -#define DDNOTIFY_PRERESCHANGE 0x0008 -#define DDNOTIFY_POSTRESCHANGE 0x0010 -#define DDNOTIFY_PREDOSBOX 0x0020 -#define DDNOTIFY_POSTDOSBOX 0x0040 -#define DDNOTIFY_CLOSEDIRECTDRAW 0x0080 -#define DDNOTIFY_CLOSESURFACE 0x0100 -#define DDNOTIFY_CLOSEVIDEOPORT 0x0200 -#define DDNOTIFY_CLOSECAPTURE 0x0400 - -typedef ULONG (FAR PASCAL *LPDD_NOTIFYCALLBACK)( - DWORD dwFlags, - PVOID pContext, - DWORD dwParam1, - DWORD dwParam2); - -typedef struct _DDOPENDIRECTDRAWIN { - ULONG_PTR dwDirectDrawHandle; + }; +} DDLOCKOUT, *LPDDLOCKOUT; + + +typedef struct _DDOPENDIRECTDRAWIN +{ + ULONG_PTR dwDirectDrawHandle; LPDD_NOTIFYCALLBACK pfnDirectDrawClose; PVOID pContext; -} DDOPENDIRECTDRAWIN, FAR *LPDDOPENDIRECTDRAWIN; - -typedef struct _DDOPENDIRECTDRAWOUT { - DWORD ddRVal; - HANDLE hDirectDraw; -} DDOPENDIRECTDRAWOUT, FAR *LPDDOPENDIRECTDRAWOUT; - -typedef struct _DDOPENSURFACEIN { +} DDOPENDIRECTDRAWIN, *LPDDOPENDIRECTDRAWIN; + +typedef struct _DDOPENDIRECTDRAWOUT +{ + DWORD ddRVal; + HANDLE hDirectDraw; +} DDOPENDIRECTDRAWOUT, *LPDDOPENDIRECTDRAWOUT; + +typedef struct _DDOPENSURFACEIN +{ HANDLE hDirectDraw; ULONG_PTR dwSurfaceHandle; LPDD_NOTIFYCALLBACK pfnSurfaceClose; PVOID pContext; -} DDOPENSURFACEIN, FAR *LPDDOPENSURFACEIN; - -typedef struct _DDOPENSURFACEOUT { +} DDOPENSURFACEIN, *LPDDOPENSURFACEIN; + +typedef struct _DDOPENSURFACEOUT +{ DWORD ddRVal; HANDLE hSurface; -} DDOPENSURFACEOUT, FAR *LPDDOPENSURFACEOUT; - -typedef struct _DDOPENVIDEOPORTIN { +} DDOPENSURFACEOUT, *LPDDOPENSURFACEOUT; + +typedef struct _DDOPENVIDEOPORTIN +{ HANDLE hDirectDraw; ULONG dwVideoPortHandle; LPDD_NOTIFYCALLBACK pfnVideoPortClose; PVOID pContext; -} DDOPENVIDEOPORTIN, FAR *LPDDOPENVIDEOPORTIN; - -typedef struct _DDOPENVIDEOPORTOUT { - DWORD ddRVal; - HANDLE hVideoPort; -} DDOPENVIDEOPORTOUT, FAR *LPDDOPENVIDEOPORTOUT; - -/* DDOPENVPCAPTUREDEVICEIN.dwFlags constants */ -#define DDOPENCAPTURE_VIDEO 0x0001 -#define DDOPENCAPTURE_VBI 0x0002 - -typedef struct _DDOPENVPCAPTUREDEVICEIN { +} DDOPENVIDEOPORTIN, *LPDDOPENVIDEOPORTIN; + +typedef struct _DDOPENVIDEOPORTOUT +{ + DWORD ddRVal; + HANDLE hVideoPort; +} DDOPENVIDEOPORTOUT, *LPDDOPENVIDEOPORTOUT; + +typedef struct _DDOPENVPCAPTUREDEVICEIN +{ HANDLE hDirectDraw; HANDLE hVideoPort; DWORD dwStartLine; @@ -281,52 +290,55 @@ LPDD_NOTIFYCALLBACK pfnCaptureClose; PVOID pContext; DWORD dwFlags; -} DDOPENVPCAPTUREDEVICEIN, FAR * LPDDOPENVPCAPTUREDEVICEIN; - -typedef struct _DDOPENVPCAPTUREDEVICEOUT { +} DDOPENVPCAPTUREDEVICEIN, * LPDDOPENVPCAPTUREDEVICEIN; + +typedef struct _DDOPENVPCAPTUREDEVICEOUT +{ DWORD ddRVal; HANDLE hCapture; -} DDOPENVPCAPTUREDEVICEOUT, FAR * LPDDOPENVPCAPTUREDEVICEOUT; - -/* DDREGISTERCALLBACK.dwEvents constants */ -#define DDEVENT_DISPLAY_VSYNC 0x0001 -#define DDEVENT_VP_VSYNC 0x0002 -#define DDEVENT_VP_LINE 0x0004 -#define DDEVENT_PRERESCHANGE 0x0008 -#define DDEVENT_POSTRESCHANGE 0x0010 -#define DDEVENT_PREDOSBOX 0x0020 -#define DDEVENT_POSTDOSBOX 0x0040 - -typedef struct _DDREGISTERCALLBACK { +} DDOPENVPCAPTUREDEVICEOUT, * LPDDOPENVPCAPTUREDEVICEOUT; + +typedef struct _DDREGISTERCALLBACK +{ HANDLE hDirectDraw; ULONG dwEvents; LPDD_NOTIFYCALLBACK pfnCallback; ULONG_PTR dwParam1; ULONG_PTR dwParam2; PVOID pContext; -} DDREGISTERCALLBACK, FAR *LPDDREGISTERCALLBACK; - -typedef struct _DDSETSURFACETATE { +} DDREGISTERCALLBACK, *LPDDREGISTERCALLBACK; + +typedef struct _DDSETSURFACETATE +{ HANDLE hDirectDraw; HANDLE hSurface; DWORD dwState; DWORD dwStartField; -} DDSETSURFACESTATE, FAR *LPDDSETSURFACESTATE; - -typedef struct _DDSETFIELDNUM { +} DDSETSURFACESTATE, *LPDDSETSURFACESTATE; + +typedef struct _DDSETFIELDNUM +{ HANDLE hDirectDraw; HANDLE hVideoPort; DWORD dwFieldNum; -} DDSETFIELDNUM, FAR *LPDDSETFIELDNUM; - -typedef struct _DDSETSKIPFIELD { +} DDSETFIELDNUM, *LPDDSETFIELDNUM; + +typedef struct _DDSETSKIPFIELD +{ HANDLE hDirectDraw; HANDLE hVideoPort; DWORD dwStartField; -} DDSETSKIPFIELD, FAR *LPDDSETSKIPFIELD; - -#ifdef __cplusplus -} -#endif - -#endif /* __DDKMAPI_H */ +} DDSETSKIPFIELD, *LPDDSETSKIPFIELD; + + +DXAPI +DWORD +DxApi(IN DWORD dwFunctionNum, + IN LPVOID lpvInBuffer, + IN DWORD cbInBuffer, + OUT LPVOID lpvOutBuffer, + OUT DWORD cbOutBuffer); + + + +#endif /* __DDKMAPI_INCLUDED__ */ Modified: branches/reactx/reactos/include/dxsdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/dxsdk/ks… ============================================================================== --- branches/reactx/reactos/include/dxsdk/ks.h (original) +++ branches/reactx/reactos/include/dxsdk/ks.h Mon Nov 5 02:54:40 2007 @@ -1,3 +1,7 @@ + + + + #if !defined(_KS_) #define _KS_ @@ -20,11 +24,11 @@ #endif #if defined(__cplusplus) && _MSC_VER >= 1100 - #define DEFINE_GUIDSTRUCT(g, n) struct __declspec(uuid(g)) n - #define DEFINE_GUIDNAMED(n) __uuidof(struct n) + #define DEFINE_GUIDSTRUCT(guid, name) struct __declspec(uuid(guid)) name + #define DEFINE_GUIDNAMED(name) __uidof(struct name) #else - #define DEFINE_GUIDSTRUCT(g, n) DEFINE_GUIDEX(n) - #define DEFINE_GUIDNAMED(n) n + #define DEFINE_GUIDSTRUCT(guid, name) DEFINE_GUIDEX(name) + #define DEFINE_GUIDNAMED(name) name #endif @@ -32,10 +36,12 @@ DEFINE_GUIDSTRUCT("00000000-0000-0000-0000-000000000000", GUID_NULL); #define GUID_NULL DEFINE_GUIDNAMED(GUID_NULL) + #define STATIC_KSPROPTYPESETID_General 0x97E99BA0, 0xBDEA, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 DEFINE_GUIDSTRUCT("97E99BA0-BDEA-11CF-A5D6-28DB04C10000", KSPROPTYPESETID_General); #define KSPROPTYPESETID_General DEFINE_GUIDNAMED(KSPROPTYPESETID_General) + #define STATIC_KSPROPSETID_General 0x1464EDA5, 0x6A8F, 0x11D1, 0x9A, 0xA7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 DEFINE_GUIDSTRUCT("1464EDA5-6A8F-11D1-9AA7-00A0C9223196", KSPROPSETID_General); #define KSPROPSETID_General DEFINE_GUIDNAMED(KSPROPSETID_General) @@ -140,16 +146,6 @@ DEFINE_GUIDSTRUCT("8C6F932C-E771-11D0-B8FF-00A0C9223196", KSINTERFACESETID_FileIo); #define KSINTERFACESETID_FileIo DEFINE_GUIDNAMED(KSINTERFACESETID_FileIo) - - - - - - - - - - #define STATIC_KSMEDIUMSETID_Standard 0x4747B320, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 DEFINE_GUIDSTRUCT("4747B320-62CE-11CF-A5D6-28DB04C10000", KSMEDIUMSETID_Standard); #define KSMEDIUMSETID_Standard DEFINE_GUIDNAMED(KSMEDIUMSETID_Standard) @@ -206,8 +202,6 @@ DEFINE_GUIDSTRUCT("1D58C920-AC9B-11CF-A5D6-28DB04C10000", KSPROPSETID_Connection); #define KSPROPSETID_Connection DEFINE_GUIDNAMED(KSPROPSETID_Connection) - - #define STATIC_KSMEMORY_TYPE_SYSTEM 0x091BB638, 0x603F, 0x11D1, 0xB0, 0x67, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02 DEFINE_GUIDSTRUCT("091bb638-603f-11d1-b067-00a0c9062802", KSMEMORY_TYPE_SYSTEM); #define KSMEMORY_TYPE_SYSTEM DEFINE_GUIDNAMED(KSMEMORY_TYPE_SYSTEM) @@ -263,6 +257,7 @@ #define STATIC_KSDEGRADESETID_Standard 0x9F564180, 0x704C, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 DEFINE_GUIDSTRUCT("9F564180-704C-11D0-A5D6-28DB04C10000", KSDEGRADESETID_Standard); #define KSDEGRADESETID_Standard DEFINE_GUIDNAMED(KSDEGRADESETID_Standard) + #define KSSTRING_Filter L"{9B365890-165F-11D0-A195-0020AFD156E4}" #define KSSTRING_Pin L"{146F1A80-4791-11D0-A5D6-28DB04C10000}" @@ -489,6 +484,12 @@ KSPROPERTY_GM_RATEMATCH, KSPROPERTY_GM_RENDER_CLOCK, } KSPROPERTY_GM; + + typedef enum + { + KSPROPERTY_STREAMALLOCATOR_FUNCTIONTABLE, + KSPROPERTY_STREAMALLOCATOR_STATUS + } KSPROPERTY_STREAMALLOCATOR; #if !defined(__wtypes_h__) enum VARENUM @@ -594,6 +595,38 @@ KSDEGRADE_STANDARD_SKIP } KSDEGRADE_STANDARD; +typedef enum +{ + KSPROPERTY_CLOCK_TIME, + KSPROPERTY_CLOCK_PHYSICALTIME, + KSPROPERTY_CLOCK_CORRELATEDTIME, + KSPROPERTY_CLOCK_CORRELATEDPHYSICALTIME, + KSPROPERTY_CLOCK_RESOLUTION, + KSPROPERTY_CLOCK_STATE, +#if defined(_NTDDK_) + KSPROPERTY_CLOCK_FUNCTIONTABLE +#endif // defined(_NTDDK_) +} KSPROPERTY_CLOCK; + +typedef enum +{ + KSPROPERTY_STREAMINTERFACE_HEADERSIZE +} KSPROPERTY_STREAMINTERFACE; + +typedef enum +{ + KSPROPERTY_STREAM_ALLOCATOR, + KSPROPERTY_STREAM_QUALITY, + KSPROPERTY_STREAM_DEGRADATION, + KSPROPERTY_STREAM_MASTERCLOCK, + KSPROPERTY_STREAM_TIMEFORMAT, + KSPROPERTY_STREAM_PRESENTATIONTIME, + KSPROPERTY_STREAM_PRESENTATIONEXTENT, + KSPROPERTY_STREAM_FRAMETIME, + KSPROPERTY_STREAM_RATECAPABILITY, + KSPROPERTY_STREAM_RATE, + KSPROPERTY_STREAM_PIPE_ID +} KSPROPERTY_STREAM; typedef struct { @@ -601,13 +634,11 @@ ULONG PrioritySubClass; } KSPRIORITY, *PKSPRIORITY; - typedef enum { KSEVENT_CLOCK_INTERVAL_MARK, KSEVENT_CLOCK_POSITION_MARK } KSEVENT_CLOCK_POSITION; - typedef enum { @@ -668,15 +699,12 @@ KSPROPERTY_TOPOLOGY_NAME } KSPROPERTY_TOPOLOGY; - typedef enum { KSINTERFACE_STANDARD_STREAMING, KSINTERFACE_STANDARD_LOOPED_STREAMING, KSINTERFACE_STANDARD_CONTROL } KSINTERFACE_STANDARD; - - typedef enum { @@ -742,13 +770,19 @@ KSEVENT_STREAMALLOCATOR_FREEFRAME } KSEVENT_STREAMALLOCATOR; - typedef enum { KSMETHOD_STREAMALLOCATOR_ALLOC, KSMETHOD_STREAMALLOCATOR_FREE } KSMETHOD_STREAMALLOCATOR; +typedef enum +{ + KsObjectTypeDevice, + KsObjectTypeFilterFactory, + KsObjectTypeFilter, + KsObjectTypePin +} KSOBJECTTYPE; typedef struct @@ -768,7 +802,7 @@ }; LONGLONG Alignment; }; -} KSIDENTIFIER, *PKSIDENTIFIER, KSPROPERTY, *PKSPROPERTY, KSPIN_INTERFACE, *PKSPIN_INTERFACE +} KSIDENTIFIER, *PKSIDENTIFIER, KSPROPERTY, *PKSPROPERTY, KSPIN_INTERFACE, *PKSPIN_INTERFACE, KSMETHOD, *PKSMETHOD, KSEVENT, *PKSEVENT, KSDEGRADE, *PKSDEGRADE, KSPIN_MEDIUM, *PKSPIN_MEDIUM; @@ -1185,6 +1219,7 @@ #define DEFINE_KSPROPERTY_ITEM_TOPOLOGY_NAME(Handler)\ DEFINE_KSPROPERTY_ITEM(KSPROPERTY_TOPOLOGY_NAME, (Handler), sizeof(KSP_NODE), 0, NULL, NULL, 0, NULL, NULL, 0) +#if 0 #define DEFINE_KSPROPERTY_TOPOLOGYSET(TopologySet, Handler)\ DEFINE_KSPROPERTY_TABLE(TopologySet) {\ DEFINE_KSPROPERTY_ITEM_TOPOLOGY_CATEGORIES(Handler),\ @@ -1192,6 +1227,7 @@ DEFINE_KSPROPERTY_ITEM_TOPOLOGY_CONNECTIONS(Handler),\ DEFINE_KSPROPERTY_ITEM_TOPOLOGY_NAME(Handler) } +#endif #define DEFINE_KSPIN_INTERFACE_ITEM(guid, interface) { STATICGUIDOF(guid), (interface), 0 } Modified: branches/reactx/reactos/lib/sdk/sdk.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/lib/sdk/sdk.rbui… ============================================================================== --- branches/reactx/reactos/lib/sdk/sdk.rbuild (original) +++ branches/reactx/reactos/lib/sdk/sdk.rbuild Mon Nov 5 02:54:40 2007 @@ -6,6 +6,9 @@ </directory> <directory name="dxguid"> <xi:include href="dxguid/dxguid.rbuild" /> + </directory> + <directory name="ksguid"> + <xi:include href="ksguid/ksguid.rbuild" /> </directory> <directory name="libcntpr"> <xi:include href="libcntpr/libcntpr.rbuild" />

1 0

← Newer
1
...
75
76
77
78
79
80
81
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2007