Ros-diffs May 2011

ros-diffs@reactos.org

26 participants
511 discussions

[tkreuzer] 52012: [WIN32K] - Implement GreAddFontResourceInternal - Refactor EngLoadFontFileFD once again - Load Tahoma font after initializing the font driver (hack)
by tkreuzer＠svn.reactos.org 30 May '11

30 May '11

Author: tkreuzer Date: Mon May 30 17:19:46 2011 New Revision: 52012 URL: http://svn.reactos.org/svn/reactos?rev=52012&view=rev Log: [WIN32K] - Implement GreAddFontResourceInternal - Refactor EngLoadFontFileFD once again - Load Tahoma font after initializing the font driver (hack) Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c [iso-8859-1] Mon May 30 17:19:46 2011 @@ -30,9 +30,7 @@ HSEMAPHORE ghsemFontDriver; LIST_ENTRY gleFontDriverList = {&gleFontDriverList, &gleFontDriverList}; -HSEMAPHORE ghsemPFFList; -LIST_ENTRY glePFFList = {&glePFFList, &glePFFList}; - +extern HSEMAPHORE ghsemPFFList; BOOL FASTCALL InitFontSupport(VOID) @@ -60,141 +58,6 @@ ASSERT(gbAttachedCSRSS); KeUnstackDetachProcess(pApcState); gbAttachedCSRSS = FALSE; -} - -static -HFF -FONTDEV_hffLoadFontFile( - PFONTDEV pfntdev, - ULONG cFiles, - ULONG_PTR *piFile, - PVOID *ppvView, - ULONG *pcjView, - DESIGNVECTOR *pdv, - ULONG ulLangID, - ULONG ulFastCheckSum) -{ - HFF hff; - ASSERT(gbAttachedCSRSS); - - /* Call the drivers DrvLoadFontFile function */ - hff = pfntdev->pldev->pfn.LoadFontFile(cFiles, - piFile, - ppvView, - pcjView, - pdv, - ulLangID, - ulFastCheckSum); - - if (hff == 0) return 0; - - return hff; -} - -static -HFF -EngLoadFontFileFD( - ULONG cFiles, - PFONTFILEVIEW *ppffv, - DESIGNVECTOR *pdv, - ULONG ulCheckSum, - PFONTDEV *ppfntdev) -{ - PULONG_PTR piFiles = (PULONG_PTR)ppffv; - PVOID apvView[FD_MAX_FILES]; - ULONG acjView[FD_MAX_FILES]; - ULONG i, ulLangID = 0; - PFONTDEV pfntdev; - PLIST_ENTRY ple; - HFF hff = 0; - - /* Loop all files */ - for (i = 0; i < cFiles; i++) - { - /* Map the font file */ - if (!EngMapFontFileFD(piFiles[i], (PULONG*)&apvView[i], &acjView[i])) - { - ASSERT(FALSE); - } - } - - /* Acquire font driver list lock */ - EngAcquireSemaphore(ghsemFontDriver); - - /* Loop all installed font drivers */ - for (ple = gleFontDriverList.Flink; - ple != &gleFontDriverList; - ple = ple->Flink) - { - pfntdev = CONTAINING_RECORD(ple, FONTDEV, leLink); - - /* Try to load the font file */ - hff = FONTDEV_hffLoadFontFile(pfntdev, - cFiles, - piFiles, - apvView, - acjView, - pdv, - ulLangID, - ulCheckSum); - if (hff) - { - *ppfntdev = pfntdev; - break; - } - } - - /* Release font friver list lock */ - EngReleaseSemaphore(ghsemFontDriver); - - return hff; -} - -static -BOOL -PFF_bCompareFiles( - PPFF ppff, - ULONG cFiles, - PFONTFILEVIEW pffv[]) -{ - ULONG i; - - /* Check if number of files matches */ - if (ppff->cFiles != cFiles) return FALSE; - - /* Loop all files */ - for (i = 0; i < cFiles; i++) - { - /* Check if the files match */ - if (pffv[i] != ppff->apffv[i]) return FALSE; - } - - return TRUE; -} - -static PPFF -EngFindPFF(ULONG cFiles, PFONTFILEVIEW *ppffv) -{ - PLIST_ENTRY ple; - PPFF ppff; - ASSERT(cFiles >= 1 && cFiles <= FD_MAX_FILES); - - /* Acquire PFF list lock */ - EngAcquireSemaphore(ghsemPFFList); - - /* Loop all physical font files (PFF) */ - for (ple = glePFFList.Flink; ple != &glePFFList; ple = ple->Flink) - { - ppff = CONTAINING_RECORD(ple, PFF, leLink); - - /* Check if the files are already loaded */ - if (PFF_bCompareFiles(ppff, cFiles, ppffv)) break; - } - - /* Release PFF list lock */ - EngReleaseSemaphore(ghsemPFFList); - - return ple != &glePFFList ? ppff : NULL; } static void @@ -245,45 +108,59 @@ PPFF NTAPI -EngLoadFontFile( - IN ULONG cFiles, - IN PWCHAR apwszFiles[], - IN DESIGNVECTOR *pdv) -{ - PFONTFILEVIEW apffv[FD_MAX_FILES]; +EngLoadFontFileFD( + ULONG cFiles, + PFONTFILEVIEW *ppffv, + DESIGNVECTOR *pdv, + ULONG ulCheckSum) +{ + PULONG_PTR piFiles = (PULONG_PTR)ppffv; + PVOID apvView[FD_MAX_FILES]; + ULONG acjView[FD_MAX_FILES]; KAPC_STATE ApcState; + PLIST_ENTRY ple; + PFONTDEV pfntdev = NULL; + HFF hff = 0; + ULONG cFaces, cjSize, i, ulLangID = 0; PPFF ppff = NULL; - ULONG i, cjSize, cFaces, ulChecksum = 0; - PFONTDEV pfntdev = NULL; - HFF hff; - - /* Loop the files */ - for (i = 0; i < cFiles; i++) - { - /* Try to load the file */ - apffv[i] = (PVOID)EngLoadModuleEx(apwszFiles[i], 0, FVF_FONTFILE); - if (!apffv[i]) - { - /* Cleanup and return */ - while (i--) EngFreeModule(apffv[i]); - return NULL; - } - } - - /* Try to find an existing PFF */ - ppff = EngFindPFF(cFiles, apffv); - if (ppff) - { - /* Cleanup loaded files, we don't need them anymore */ - for (i = 0; i < cFiles; i++) EngFreeModule(apffv[i]); - return ppff; - } /* Attach to CSRSS */ AttachCSRSS(&ApcState); - /* Try to load the font with any of the font drivers */ - hff = EngLoadFontFileFD(cFiles, apffv, pdv, ulChecksum, &pfntdev); + /* Loop all files */ + for (i = 0; i < cFiles; i++) + { + /* Map the font file */ + if (!EngMapFontFileFD(piFiles[i], (PULONG*)&apvView[i], &acjView[i])) + { + ASSERT(FALSE); + } + } + + /* Acquire font driver list lock */ + EngAcquireSemaphore(ghsemFontDriver); + + /* Loop all installed font drivers */ + for (ple = gleFontDriverList.Flink; + ple != &gleFontDriverList; + ple = ple->Flink) + { + pfntdev = CONTAINING_RECORD(ple, FONTDEV, leLink); + + /* Call the drivers DrvLoadFontFile function */ + hff = pfntdev->pldev->pfn.LoadFontFile(cFiles, + piFiles, + apvView, + acjView, + pdv, + ulLangID, + ulCheckSum); + if (hff) break; + } + + /* Release font driver list lock */ + EngReleaseSemaphore(ghsemFontDriver); + if (!hff) { DPRINT1("File format is not supported by any font driver\n"); @@ -310,7 +187,7 @@ ppff->hff = hff; /* Copy the FONTFILEVIEW pointers */ - for (i = 0; i < cFiles; i++) ppff->apffv[i] = apffv[i]; + for (i = 0; i < cFiles; i++) ppff->apffv[i] = ppffv[i]; /* Loop all faces in the font file */ for (i = 0; i < cFaces; i++) @@ -319,16 +196,7 @@ PFE_vInitialize(&ppff->apfe[i], ppff, i + 1); } - /* Insert the PFF into the list */ - EngAcquireSemaphore(ghsemPFFList); - InsertTailList(&glePFFList, &ppff->leLink); - EngReleaseSemaphore(ghsemPFFList); - leave: - if (!ppff) - { - for (i = 0; i < cFiles; i++) EngFreeModule(apffv[i]); - } /* Detach from CSRSS */ DetachCSRSS(&ApcState); @@ -393,6 +261,9 @@ NTAPI GreStartupFontDrivers(VOID) { + ULONG cFonts; + static PWSTR pwszFile = L"\\??\\c:\\ReactOS\\Fonts\\tahoma.ttf"; + /* Load freetype font driver */ if (!EngLoadFontDriver(L"ftfd.dll")) { @@ -403,5 +274,10 @@ /* TODO: Enumerate installed font drivers */ DPRINT1("############ Started font drivers\n"); -} - + + // lets load some fonts + cFonts = GreAddFontResourceInternal(&pwszFile, 1, 0, 0, NULL); + ASSERT(cFonts > 0); + +} + Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c [iso-8859-1] Mon May 30 17:19:46 2011 @@ -11,19 +11,98 @@ #define NDEBUG #include <debug.h> +HSEMAPHORE ghsemPFFList; +static LIST_ENTRY glePrivatePFFList = {&glePrivatePFFList, &glePrivatePFFList}; +static LIST_ENTRY glePublicPFFList = {&glePublicPFFList, &glePublicPFFList}; + +static +BOOL +PFF_bCompareFiles( + PPFF ppff, + ULONG cFiles, + PFONTFILEVIEW pffv[]) +{ + ULONG i; + + /* Check if number of files matches */ + if (ppff->cFiles != cFiles) return FALSE; + + /* Loop all files */ + for (i = 0; i < cFiles; i++) + { + /* Check if the files match */ + if (pffv[i] != ppff->apffv[i]) return FALSE; + } + + return TRUE; +} + INT NTAPI GreAddFontResourceInternal( IN PWCHAR apwszFiles[], IN ULONG cFiles, - IN FLONG f, + IN FLONG fl, IN DWORD dwPidTid, IN OPTIONAL DESIGNVECTOR *pdv) { - - - ASSERT(FALSE); - return 0; + PFONTFILEVIEW apffv[FD_MAX_FILES]; + PPFF ppff = NULL; + PLIST_ENTRY ple, pleListHead; + ULONG i, ulCheckSum = 0; + + /* Loop the files */ + for (i = 0; i < cFiles; i++) + { + /* Try to load the file */ + apffv[i] = (PVOID)EngLoadModuleEx(apwszFiles[i], 0, FVF_FONTFILE); + if (!apffv[i]) + { + DPRINT1("Failed to load file: '%ls'\n", apwszFiles[i]); + /* Cleanup and return */ + while (i--) EngFreeModule(apffv[i]); + return 0; + } + } + + pleListHead = fl & FR_PRIVATE ? &glePrivatePFFList : &glePublicPFFList; + + /* Acquire PFF list lock */ + EngAcquireSemaphore(ghsemPFFList); + + /* Loop all physical font files (PFF) */ + for (ple = pleListHead->Flink; ple != pleListHead; ple = ple->Flink) + { + ppff = CONTAINING_RECORD(ple, PFF, leLink); + + /* Check if the files are already loaded */ + if (PFF_bCompareFiles(ppff, cFiles, apffv)) break; + } + + /* Release PFF list lock */ + EngReleaseSemaphore(ghsemPFFList); + + if (ple == pleListHead) + { + /* Cleanup loaded files, we don't need them anymore */ + for (i = 0; i < cFiles; i++) EngFreeModule(apffv[i]); + return ppff->cFonts; + } + + /* Load the font file with a font driver */ + ppff = EngLoadFontFileFD(cFiles, apffv, pdv, ulCheckSum); + if (!ppff) + { + DPRINT1("Failed to load font with font driver\n"); + return 0; + } + + /* Insert the PFF into the list */ + EngAcquireSemaphore(ghsemPFFList); + InsertTailList(pleListHead, &ppff->leLink); + EngReleaseSemaphore(ghsemPFFList); + + return ppff->cFonts; } static Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h [iso-8859-1] Mon May 30 17:19:46 2011 @@ -220,4 +220,20 @@ NTAPI DC_prfnt(PDC pdc); - +PPFF +NTAPI +EngLoadFontFileFD( + ULONG cFiles, + PFONTFILEVIEW *ppffv, + DESIGNVECTOR *pdv, + ULONG ulCheckSum); + +INT +NTAPI +GreAddFontResourceInternal( + IN PWCHAR apwszFiles[], + IN ULONG cFiles, + IN FLONG fl, + IN DWORD dwPidTid, + IN OPTIONAL DESIGNVECTOR *pdv); +

1 0

[tkreuzer] 52011: [WIN32K] - Implement InitMappingImpl that initializes ghsemModuleList - Use ZwCreateSection in EngLoadModuleEx. This is overhead in terms of code and runtime, but is neccessary, s...
by tkreuzer＠svn.reactos.org 30 May '11

30 May '11

Author: tkreuzer Date: Mon May 30 17:16:08 2011 New Revision: 52011 URL: http://svn.reactos.org/svn/reactos?rev=52011&view=rev Log: [WIN32K] - Implement InitMappingImpl that initializes ghsemModuleList - Use ZwCreateSection in EngLoadModuleEx. This is overhead in terms of code and runtime, but is neccessary, since we cannot pass a kernel file handle to MmCreateSection and passing a file object pointer is not supported on reactos yet. - Set proper access mask and page protection in EngLoadModuleEx Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/mapping.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/mapping.h branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/main/dllmain.c Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/mapping.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/mapping.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/mapping.c [iso-8859-1] Mon May 30 17:16:08 2011 @@ -14,6 +14,16 @@ HANDLE ghSystem32Directory; HSEMAPHORE ghsemModuleList; LIST_ENTRY gleModulelist = {&gleModulelist, &gleModulelist}; + +INIT_FUNCTION +NTSTATUS +NTAPI +InitMappingImpl(VOID) +{ + ghsemModuleList = EngCreateSemaphore(); + if (!ghsemModuleList) return STATUS_NO_MEMORY; + return STATUS_SUCCESS; +} PVOID NTAPI @@ -222,11 +232,12 @@ UNICODE_STRING ustrFileName; IO_STATUS_BLOCK IoStatusBlock; FILE_BASIC_INFORMATION FileInformation; - HANDLE hFile = NULL; + HANDLE hFile = NULL, hSection; NTSTATUS Status; LARGE_INTEGER liSize; PLIST_ENTRY ple; - ULONG cjSize; + ULONG cjSize, flPageProtect; + ACCESS_MASK amAccess; /* Acquire module list lock */ EngAcquireSemaphore(ghsemModuleList); @@ -245,6 +256,18 @@ /* Use system32 root dir or absolute path */ hRootDir = fl & FVF_SYSTEMROOT ? ghSystem32Directory : NULL; + + /* Set access mask and page protection */ + if (fl & FVF_WRITE) + { + amAccess = FILE_READ_DATA|FILE_WRITE_DATA; + flPageProtect = PAGE_EXECUTE_READWRITE; + } + else + { + amAccess = FILE_READ_DATA; + flPageProtect = PAGE_EXECUTE_READ; + } /* Initialize unicode string and object attributes */ RtlInitUnicodeString(&ustrFileName, pwsz); @@ -256,7 +279,7 @@ /* Now open the file */ Status = ZwCreateFile(&hFile, - FILE_READ_DATA, + amAccess, &ObjectAttributes, &IoStatusBlock, NULL, @@ -328,14 +351,24 @@ /* Create a section from the file */ liSize.QuadPart = cjSizeOfModule; - Status = MmCreateSection(&pFileView->pSection, + Status = ZwCreateSection(&hSection, SECTION_ALL_ACCESS, NULL, cjSizeOfModule ? &liSize : NULL, - fl & FVF_READONLY ? PAGE_EXECUTE_READ : PAGE_EXECUTE_READWRITE, + flPageProtect, SEC_COMMIT, - hFile, - NULL); + hFile); + + if (NT_SUCCESS(Status)) + { + Status = ObReferenceObjectByHandle(hSection, + SECTION_ALL_ACCESS, + MmSectionObjectType, + KernelMode, + &pFileView->pSection, + NULL); + ZwClose(hSection); + } if (!NT_SUCCESS(Status)) { @@ -362,7 +395,7 @@ EngLoadModule(LPWSTR pwsz) { /* Forward to EngLoadModuleEx */ - return (HANDLE)EngLoadModuleEx(pwsz, 0, FVF_READONLY | FVF_SYSTEMROOT); + return EngLoadModuleEx(pwsz, 0, FVF_SYSTEMROOT); } HANDLE @@ -372,7 +405,7 @@ IN ULONG cjSizeOfModule) { /* Forward to EngLoadModuleEx */ - return (HANDLE)EngLoadModuleEx(pwsz, cjSizeOfModule, FVF_SYSTEMROOT); + return EngLoadModuleEx(pwsz, cjSizeOfModule, FVF_WRITE|FVF_SYSTEMROOT); } PVOID Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/mapping.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/mapping.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/mapping.h [iso-8859-1] Mon May 30 17:16:08 2011 @@ -38,9 +38,14 @@ enum { FVF_SYSTEMROOT = 1, - FVF_READONLY = 2, + FVF_WRITE = 2, FVF_FONTFILE = 4, }; + +INIT_FUNCTION +NTSTATUS +NTAPI +InitMappingImpl(VOID); PVOID NTAPI Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Mon May 30 17:16:08 2011 @@ -138,9 +138,9 @@ DPRINT1("Shell process is exiting (%d)\n", ExitCode); - UserPostMessage(hwndSAS, - WM_LOGONNOTIFY, - LN_SHELL_EXITED, + UserPostMessage(hwndSAS, + WM_LOGONNOTIFY, + LN_SHELL_EXITED, ExitCode); } } @@ -534,6 +534,7 @@ CreateStockObjects(); CreateSysColorObjects(); + NT_ROF(InitMappingImpl()); NT_ROF(InitXlateImpl()); NT_ROF(InitPDEVImpl()); NT_ROF(InitLDEVImpl());

1 0

[tkreuzer] 52010: [NDK] Add NTKERNELAPI to MmSectionObjectType to be able to import it
by tkreuzer＠svn.reactos.org 30 May '11

30 May '11

Author: tkreuzer Date: Mon May 30 16:51:17 2011 New Revision: 52010 URL: http://svn.reactos.org/svn/reactos?rev=52010&view=rev Log: [NDK] Add NTKERNELAPI to MmSectionObjectType to be able to import it Modified: branches/GSoC_2011/GdiFontDriver/include/ndk/mmtypes.h Modified: branches/GSoC_2011/GdiFontDriver/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/include… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/include/ndk/mmtypes.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/include/ndk/mmtypes.h [iso-8859-1] Mon May 30 16:51:17 2011 @@ -704,7 +704,7 @@ // // Long VAD used in section and private allocations // -typedef struct _MMVAD_LONG +typedef struct _MMVAD_LONG { union { @@ -969,7 +969,7 @@ // // Section Object Type // -extern POBJECT_TYPE MmSectionObjectType; +extern NTKERNELAPI POBJECT_TYPE MmSectionObjectType; #endif // !NTOS_MODE_USER

1 0

[khornicek] 52009: [WINED3D|DDRAW|D3D8|D3D9] Sync to Wine 1.3.21
by khornicek＠svn.reactos.org 30 May '11

30 May '11

Author: khornicek Date: Mon May 30 15:27:19 2011 New Revision: 52009 URL: http://svn.reactos.org/svn/reactos?rev=52009&view=rev Log: [WINED3D|DDRAW|D3D8|D3D9] Sync to Wine 1.3.21 Added: trunk/reactos/include/reactos/wine/wined3d.h (with props) Removed: trunk/reactos/dll/directx/wine/wined3d/basetexture.c trunk/reactos/dll/directx/wine/wined3d/cubetexture.c trunk/reactos/dll/directx/wine/wined3d/surface_base.c trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c trunk/reactos/dll/directx/wine/wined3d/swapchain_base.c trunk/reactos/dll/directx/wine/wined3d/swapchain_gdi.c trunk/reactos/dll/directx/wine/wined3d/volumetexture.c trunk/reactos/include/reactos/wine/wined3d.idl Modified: trunk/reactos/dll/directx/wine/d3d8/buffer.c trunk/reactos/dll/directx/wine/d3d8/cubetexture.c trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/directx.c trunk/reactos/dll/directx/wine/d3d8/shader.c trunk/reactos/dll/directx/wine/d3d8/surface.c trunk/reactos/dll/directx/wine/d3d8/swapchain.c trunk/reactos/dll/directx/wine/d3d8/texture.c trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d8/volume.c trunk/reactos/dll/directx/wine/d3d8/volumetexture.c trunk/reactos/dll/directx/wine/d3d9/buffer.c trunk/reactos/dll/directx/wine/d3d9/cubetexture.c trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/directx.c trunk/reactos/dll/directx/wine/d3d9/query.c trunk/reactos/dll/directx/wine/d3d9/shader.c trunk/reactos/dll/directx/wine/d3d9/stateblock.c trunk/reactos/dll/directx/wine/d3d9/surface.c trunk/reactos/dll/directx/wine/d3d9/swapchain.c trunk/reactos/dll/directx/wine/d3d9/texture.c trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d9/volume.c trunk/reactos/dll/directx/wine/d3d9/volumetexture.c trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt trunk/reactos/dll/directx/wine/ddraw/clipper.c trunk/reactos/dll/directx/wine/ddraw/ddraw.c trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h trunk/reactos/dll/directx/wine/ddraw/device.c trunk/reactos/dll/directx/wine/ddraw/executebuffer.c trunk/reactos/dll/directx/wine/ddraw/main.c trunk/reactos/dll/directx/wine/ddraw/material.c trunk/reactos/dll/directx/wine/ddraw/palette.c trunk/reactos/dll/directx/wine/ddraw/surface.c trunk/reactos/dll/directx/wine/ddraw/utils.c trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c trunk/reactos/dll/directx/wine/ddraw/viewport.c trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c trunk/reactos/dll/directx/wine/wined3d/buffer.c trunk/reactos/dll/directx/wine/wined3d/clipper.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/gl_compat.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c trunk/reactos/dll/directx/wine/wined3d/palette.c trunk/reactos/dll/directx/wine/wined3d/query.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/shader.c trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c trunk/reactos/dll/directx/wine/wined3d/view.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild trunk/reactos/dll/directx/wine/wined3d/wined3d.spec trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h trunk/reactos/include/reactos/wine/CMakeLists.txt trunk/reactos/include/reactos/wine/wineheaders.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/d3d8/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/buff… Modified: trunk/reactos/dll/directx/wine/d3d8/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/cube… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/dire… Modified: trunk/reactos/dll/directx/wine/d3d8/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/shad… Modified: trunk/reactos/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/surf… Modified: trunk/reactos/dll/directx/wine/d3d8/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/swap… Modified: trunk/reactos/dll/directx/wine/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/text… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d8/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/buff… Modified: trunk/reactos/dll/directx/wine/d3d9/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/cube… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/dire… Modified: trunk/reactos/dll/directx/wine/d3d9/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/quer… Modified: trunk/reactos/dll/directx/wine/d3d9/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/shad… Modified: trunk/reactos/dll/directx/wine/d3d9/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/stat… Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf… Modified: trunk/reactos/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/swap… Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/CMa… Modified: trunk/reactos/dll/directx/wine/ddraw/clipper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/cli… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dev… Modified: trunk/reactos/dll/directx/wine/ddraw/executebuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/exe… Modified: trunk/reactos/dll/directx/wine/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mai… Modified: trunk/reactos/dll/directx/wine/ddraw/material.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mat… Modified: trunk/reactos/dll/directx/wine/ddraw/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/pal… Modified: trunk/reactos/dll/directx/wine/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/sur… Modified: trunk/reactos/dll/directx/wine/ddraw/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/uti… Modified: trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ver… Modified: trunk/reactos/dll/directx/wine/ddraw/viewport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/vie… Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/C… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Removed: trunk/reactos/dll/directx/wine/wined3d/basetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/clipper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Removed: trunk/reactos/dll/directx/wine/wined3d/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/gl_compat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/n… Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q… Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Modified: trunk/reactos/dll/directx/wine/wined3d/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Removed: trunk/reactos/dll/directx/wine/wined3d/surface_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Removed: trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Removed: trunk/reactos/dll/directx/wine/wined3d/swapchain_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Removed: trunk/reactos/dll/directx/wine/wined3d/swapchain_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Removed: trunk/reactos/dll/directx/wine/wined3d/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/include/reactos/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/CMake… Added: trunk/reactos/include/reactos/wine/wined3d.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… Removed: trunk/reactos/include/reactos/wine/wined3d.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… Modified: trunk/reactos/include/reactos/wine/wineheaders.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wineh…

1 0

[nyadav] 52008: [AUDSRV] Fix RPC Connection and Remove Test Apps
by nyadav＠svn.reactos.org 30 May '11

30 May '11

Author: nyadav Date: Mon May 30 13:20:20 2011 New Revision: 52008 URL: http://svn.reactos.org/svn/reactos?rev=52008&view=rev Log: [AUDSRV] Fix RPC Connection and Remove Test Apps Removed: branches/nyadav-audio-branch/base/services/testc/ branches/nyadav-audio-branch/base/services/tests/ Modified: branches/nyadav-audio-branch/base/services/CMakeLists.txt branches/nyadav-audio-branch/dll/win32/audsrvapi/CMakeLists.txt branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c Modified: branches/nyadav-audio-branch/base/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/CMakeLists.txt [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/CMakeLists.txt [iso-8859-1] Mon May 30 13:20:20 2011 @@ -7,8 +7,6 @@ add_subdirectory(svchost) add_subdirectory(tcpsvcs) add_subdirectory(telnetd) -add_subdirectory(tests) -add_subdirectory(testc) #add_subdirectory(tftpd) add_subdirectory(umpnpmgr) add_subdirectory(wlansvc) Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/CMakeLists.txt [iso-8859-1] Mon May 30 13:20:20 2011 @@ -1,3 +1,4 @@ +set_unicode() include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs) Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] Mon May 30 13:20:20 2011 @@ -8,7 +8,7 @@ WINAPI int initstream (ClientStream * clientstream,LONG frequency,int channels,int bitspersample, ULONG channelmask,int volume,int mute,float balance) { RPC_STATUS status; - unsigned char * pszStringBinding = NULL; + unsigned short * pszStringBinding = NULL; if(clientstream == NULL ) return -1; @@ -29,7 +29,7 @@ RpcTryExcept { - AUDInitStream (&audsrv_v0_0_c_ifspec); + AUDInitStream (audsrv_v0_0_c_ifspec); } RpcExcept(1) {

1 0

[nyadav] 52007: [AUDSRV] Use Unicode versions of RPC functions
by nyadav＠svn.reactos.org 30 May '11

30 May '11

Author: nyadav Date: Mon May 30 12:37:20 2011 New Revision: 52007 URL: http://svn.reactos.org/svn/reactos?rev=52007&view=rev Log: [AUDSRV] Use Unicode versions of RPC functions Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] Mon May 30 12:37:20 2011 @@ -16,9 +16,9 @@ /*Validity of all other data will be checked at server*/ /*Check Connection Status If not connected call Connect()*/ /*If connected Properly call the remote audsrv_initstream() function*/ - status = RpcStringBindingCompose(NULL,L"ncacn_np",NULL,L"\\pipe\\audsrv", NULL,&pszStringBinding); + status = RpcStringBindingComposeW(NULL,L"ncacn_np",NULL,L"\\pipe\\audsrv", NULL,&pszStringBinding); - status = RpcBindingFromStringBinding(pszStringBinding, &audsrv_v0_0_c_ifspec); + status = RpcBindingFromStringBindingW(pszStringBinding, &audsrv_v0_0_c_ifspec); if (status) printf("Connection Problem p %d \n",status);

1 0

[rharabien] 52006: [ROSTESTS] - Declare functions with 0 arguments using VOID keyword. In C it matters - Add imagehlp winetest to CMake build
by rharabien＠svn.reactos.org 30 May '11

30 May '11

Author: rharabien Date: Mon May 30 11:40:58 2011 New Revision: 52006 URL: http://svn.reactos.org/svn/reactos?rev=52006&view=rev Log: [ROSTESTS] - Declare functions with 0 arguments using VOID keyword. In C it matters - Add imagehlp winetest to CMake build Added: trunk/rostests/winetests/imagehlp/CMakeLists.txt (with props) Modified: trunk/rostests/apitests/w32knapi/w32knapi.h trunk/rostests/drivers/kmtest/kmtest.h trunk/rostests/dxtest/win32kdxtest/test.h trunk/rostests/tests/DxHalTest/main.h trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/apitests/w32knapi/w32knapi.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.h [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.h [iso-8859-1] Mon May 30 11:40:58 2011 @@ -40,7 +40,7 @@ BOOL IsHandleValid(HGDIOBJ hobj); PVOID GetHandleUserData(HGDIOBJ hobj); DWORD Syscall(LPWSTR lpszFunction, int cParams, void* pParams); -BOOL InitOsVersion(); +BOOL InitOsVersion(VOID); extern UINT g_OsIdx; typedef UINT ASPI[5]; Modified: trunk/rostests/drivers/kmtest/kmtest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/kmtest.h?r… ============================================================================== --- trunk/rostests/drivers/kmtest/kmtest.h [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/kmtest.h [iso-8859-1] Mon May 30 11:40:58 2011 @@ -29,7 +29,7 @@ extern tls_data glob_data; -VOID StartTest(); +VOID StartTest(VOID); VOID FinishTest(HANDLE KeyHandle, LPWSTR TestName); void kmtest_set_location(const char* file, int line); Modified: trunk/rostests/dxtest/win32kdxtest/test.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/test.… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/test.h [iso-8859-1] (original) +++ trunk/rostests/dxtest/win32kdxtest/test.h [iso-8859-1] Mon May 30 11:40:58 2011 @@ -1,8 +1,8 @@ -HANDLE test_NtGdiDdCreateDirectDrawObject(); +HANDLE test_NtGdiDdCreateDirectDrawObject(void); void test_NtGdiDdDeleteDirectDrawObject(HANDLE hDirectDrawLocal); -void test_NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal); +void test_NtGdiDdQueryDirectDrawObject(HANDLE hDirectDrawLocal); void test_NtGdiDdGetScanLine(HANDLE hDirectDrawLocal); void test_NtGdiDdWaitForVerticalBlank(HANDLE hDirectDrawLocal); void test_NtGdiDdCanCreateSurface(HANDLE hDirectDrawLocal); Modified: trunk/rostests/tests/DxHalTest/main.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/DxHalTest/main.h?re… ============================================================================== --- trunk/rostests/tests/DxHalTest/main.h [iso-8859-1] (original) +++ trunk/rostests/tests/DxHalTest/main.h [iso-8859-1] Mon May 30 11:40:58 2011 @@ -3,7 +3,7 @@ #include <d3dhal.h> -int StartupHAL (); +int StartupHAL (VOID); extern HDC hdc; extern DDRAWI_DIRECTDRAW_GBL mDDrawGlobal; extern DDRAWI_DIRECTDRAW_LCL mDDrawLocal; Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Mon May 30 11:40:58 2011 @@ -22,6 +22,7 @@ add_subdirectory(gdiplus) add_subdirectory(hlink) add_subdirectory(icmp) +add_subdirectory(imagehlp) add_subdirectory(imm32) add_subdirectory(inetcomm) add_subdirectory(inetmib1) Added: trunk/rostests/winetests/imagehlp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imagehlp/CMakeL… ============================================================================== --- trunk/rostests/winetests/imagehlp/CMakeLists.txt (added) +++ trunk/rostests/winetests/imagehlp/CMakeLists.txt [iso-8859-1] Mon May 30 11:40:58 2011 @@ -1,0 +1,15 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + image.c + integrity.c + testlist.c) + +add_executable(imagehlp_winetest ${SOURCE}) +target_link_libraries(imagehlp_winetest wine uuid) +set_module_type(imagehlp_winetest win32cui) +add_importlibs(imagehlp_winetest advapi32 msvcrt kernel32 ntdll) +add_cd_file(TARGET imagehlp_winetest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/winetests/imagehlp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[nyadav] 52005: [AUDSRV] connect audio server and client
by nyadav＠svn.reactos.org 30 May '11

30 May '11

Author: nyadav Date: Mon May 30 11:32:19 2011 New Revision: 52005 URL: http://svn.reactos.org/svn/reactos?rev=52005&view=rev Log: [AUDSRV] connect audio server and client Added: branches/nyadav-audio-branch/base/services/testc/ (with props) branches/nyadav-audio-branch/base/services/testc/CMakeLists.txt (with props) branches/nyadav-audio-branch/base/services/testc/Hello.h (with props) branches/nyadav-audio-branch/base/services/testc/Hello_c.c (with props) branches/nyadav-audio-branch/base/services/testc/Helloc.c (with props) branches/nyadav-audio-branch/base/services/tests/ (with props) branches/nyadav-audio-branch/base/services/tests/CMakeLists.txt (with props) branches/nyadav-audio-branch/base/services/tests/Hello.h (with props) branches/nyadav-audio-branch/base/services/tests/Hello_s.c (with props) branches/nyadav-audio-branch/base/services/tests/Hellop.c (with props) branches/nyadav-audio-branch/base/services/tests/Hellos.c (with props) Modified: branches/nyadav-audio-branch/base/services/CMakeLists.txt branches/nyadav-audio-branch/base/services/audsrv/audsrv.c branches/nyadav-audio-branch/base/services/audsrv/rpc.c branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/CMakeLists.txt branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl Modified: branches/nyadav-audio-branch/base/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/CMakeLists.txt [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/CMakeLists.txt [iso-8859-1] Mon May 30 11:32:19 2011 @@ -7,6 +7,8 @@ add_subdirectory(svchost) add_subdirectory(tcpsvcs) add_subdirectory(telnetd) +add_subdirectory(tests) +add_subdirectory(testc) #add_subdirectory(tftpd) add_subdirectory(umpnpmgr) add_subdirectory(wlansvc) Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/audsrv.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/audsrv.c [iso-8859-1] Mon May 30 11:32:19 2011 @@ -460,7 +460,7 @@ /*For Temporary Debug purpose, If there is any argument it acts as simple command line app,otherwise it is a NTSERVICE*/ if(argc==1) { -printf("Under Construction.Please User audsrv.exe -n to start as normal command line application.\n"); +printf("Under Construction.Please Use audsrv.exe -n to start as normal command line application.\n"); MyHeap = HeapCreate(0, 1024 * 256, 0); if (!MyHeap) Modified: branches/nyadav-audio-branch/base/services/audsrv/rpc.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/rpc.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/rpc.c [iso-8859-1] Mon May 30 11:32:19 2011 @@ -19,25 +19,24 @@ RPC_STATUS Status; InitializeListHead(&LogHandleListHead); -printf("reached\n"); - Status = RpcServerUseProtseqEpW(L"ncacn_np", 20, L"\\pipe\\EventLog", NULL); + Status = RpcServerUseProtseqEp(L"ncacn_np", 20, L"\\pipe\\audsrv", NULL); if (Status != RPC_S_OK) { - DPRINT("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); + printf("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); return 0; } - Status = RpcServerRegisterIf(audsrv_v0_0_s_ifspec, NULL, NULL); + Status = RpcServerRegisterIfEx(audsrv_v0_0_s_ifspec, NULL, NULL, 0, RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL ); if (Status != RPC_S_OK) { - DPRINT("RpcServerRegisterIf() failed (Status %lx)\n", Status); + printf("RpcServerRegisterIf() failed (Status %lx)\n", Status); return 0; } - Status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, FALSE); + Status = RpcServerListen(1, 20, FALSE); if (Status != RPC_S_OK) { - DPRINT("RpcServerListen() failed (Status %lx)\n", Status); + printf("RpcServerListen() failed (Status %lx)\n", Status); } return 0; @@ -46,9 +45,10 @@ /*************************RPC Functions**********************************/ -NTSTATUS AUDInitStream( AUDSRV_HANDLE *streamthread) +NTSTATUS AUDInitStream( IN RPC_BINDING_HANDLE hBinding) { UNIMPLEMENTED;/*Coolest Macro I have ever seen*/ + printf("Client Connected and called server's procedure\n"); return STATUS_NOT_IMPLEMENTED; } /*************************************************************************/ Propchange: branches/nyadav-audio-branch/base/services/testc/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon May 30 11:32:19 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/nyadav-audio-branch/base/services/testc/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/nyadav-audio-branch/base/services/testc/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/nyadav-audio-branch/base/services/testc/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/nyadav-audio-branch/base/services/testc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/testc/CMakeLists.txt (added) +++ branches/nyadav-audio-branch/base/services/testc/CMakeLists.txt [iso-8859-1] Mon May 30 11:32:19 2011 @@ -1,0 +1,13 @@ + +set_unicode() + +list(APPEND SOURCE + Helloc.c + hello_c.c) + +add_executable(testc ${SOURCE}) +add_definitions(-D__USE_CRTIMP) +target_link_libraries(testc ${PSEH_LIB}) +set_module_type(testc win32cui) +add_importlibs(testc advapi32 rpcrt4 msvcrt kernel32 ntdll user32 ksuser setupapi) +add_cab_target(testc 1) Propchange: branches/nyadav-audio-branch/base/services/testc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/testc/CMakeLists.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/base/services/testc/Hello.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/testc/Hello.h (added) +++ branches/nyadav-audio-branch/base/services/testc/Hello.h [iso-8859-1] Mon May 30 11:32:19 2011 @@ -1,0 +1,45 @@ +/*** Autogenerated by WIDL 0.4-SVN from Hello.idl - Do not edit ***/ + +#include <rpc.h> +#include <rpcndr.h> + +#ifndef __WIDL_HELLO_H +#define __WIDL_HELLO_H + +/* Forward declarations */ + +/* Headers for imported files */ + + +#ifdef __cplusplus +extern "C" { +#endif + +/***************************************************************************** + * hello interface (v1.0) + */ +#ifndef __hello_INTERFACE_DEFINED__ +#define __hello_INTERFACE_DEFINED__ + +extern RPC_IF_HANDLE hello_v1_0_c_ifspec; +extern RPC_IF_HANDLE hello_v1_0_s_ifspec; +void HelloProc( + handle_t h1, + unsigned char *pszString); + +void Shutdown( + handle_t h1); + + +#endif /* __hello_INTERFACE_DEFINED__ */ + +/* Begin additional prototypes for all interfaces */ + + +/* End additional prototypes */ + +#ifdef __cplusplus +} +#endif + +#endif /* __WIDL_HELLO_H */ Propchange: branches/nyadav-audio-branch/base/services/testc/Hello.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/testc/Hello.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/base/services/testc/Hello_c.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/testc/Hello_c.c (added) +++ branches/nyadav-audio-branch/base/services/testc/Hello_c.c [iso-8859-1] Mon May 30 11:32:19 2011 @@ -1,0 +1,679 @@ +/*** Autogenerated by WIDL 0.4-SVN from Hello.idl - Do not edit ***/ +#include <string.h> +#ifdef _ALPHA_ +#include <stdarg.h> +#endif + +#include "Hello.h" + +#ifndef DECLSPEC_HIDDEN +#define DECLSPEC_HIDDEN +#endif + +#ifndef _WIN64 + +#ifndef USE_COMPILER_EXCEPTIONS + +#include "wine/exception.h" +#undef RpcTryExcept +#undef RpcExcept +#undef RpcEndExcept +#undef RpcTryFinally +#undef RpcFinally +#undef RpcEndFinally +#undef RpcExceptionCode +#undef RpcAbnormalTermination + +struct __exception_frame; +typedef int (*__filter_func)(struct __exception_frame *); +typedef void (*__finally_func)(struct __exception_frame *); + +#define __DECL_EXCEPTION_FRAME \ + EXCEPTION_REGISTRATION_RECORD frame; \ + __filter_func filter; \ + __finally_func finally; \ + sigjmp_buf jmp; \ + DWORD code; \ + unsigned char abnormal_termination; \ + unsigned char filter_level; \ + unsigned char finally_level; + +struct __exception_frame +{ + __DECL_EXCEPTION_FRAME +}; + +static inline void __widl_unwind_target(void) +{ + struct __exception_frame *exc_frame = (struct __exception_frame *)__wine_get_frame(); + if (exc_frame->finally_level > exc_frame->filter_level) + { + exc_frame->abnormal_termination = 1; + exc_frame->finally( exc_frame ); + __wine_pop_frame( &exc_frame->frame ); + } + exc_frame->filter_level = 0; + siglongjmp( exc_frame->jmp, 1 ); +} + +static DWORD __widl_exception_handler( EXCEPTION_RECORD *record, + EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, + EXCEPTION_REGISTRATION_RECORD **pdispatcher ) +{ + struct __exception_frame *exc_frame = (struct __exception_frame *)frame; + + if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) + { + if (exc_frame->finally_level && (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))) + { + exc_frame->abnormal_termination = 1; + exc_frame->finally( exc_frame ); + } + return ExceptionContinueSearch; + } + exc_frame->code = record->ExceptionCode; + if (exc_frame->filter_level && exc_frame->filter( exc_frame ) == EXCEPTION_EXECUTE_HANDLER) + __wine_rtl_unwind( frame, record, __widl_unwind_target ); + return ExceptionContinueSearch; +} + +#define RpcTryExcept \ + if (!sigsetjmp( __frame->jmp, 0 )) \ + { \ + if (!__frame->finally_level) \ + __wine_push_frame( &__frame->frame ); \ + __frame->filter_level = __frame->finally_level + 1; + +#define RpcExcept(expr) \ + if (!__frame->finally_level) \ + __wine_pop_frame( &__frame->frame ); \ + __frame->filter_level = 0; \ + } \ + else \ + +#define RpcEndExcept + +#define RpcExceptionCode() (__frame->code) + +#define RpcTryFinally \ + if (!__frame->filter_level) \ + __wine_push_frame( &__frame->frame ); \ + __frame->finally_level = __frame->filter_level + 1; + +#define RpcFinally \ + if (!__frame->filter_level) \ + __wine_pop_frame( &__frame->frame ); \ + __frame->finally_level = 0; + +#define RpcEndFinally + +#define RpcAbnormalTermination() (__frame->abnormal_termination) + +#define RpcExceptionInit(filter_func,finally_func) \ + do { \ + __frame->frame.Handler = __widl_exception_handler; \ + __frame->filter = (__filter_func)(filter_func); \ + __frame->finally = (__finally_func)(finally_func); \ + __frame->abnormal_termination = 0; \ + __frame->filter_level = 0; \ + __frame->finally_level = 0; \ + } while (0) + +#else /* USE_COMPILER_EXCEPTIONS */ + +#define RpcExceptionInit(filter_func,finally_func) \ + do { (void)(filter_func); } while(0) + +#define __DECL_EXCEPTION_FRAME \ + DWORD code; + +#endif /* USE_COMPILER_EXCEPTIONS */ + +#define TYPE_FORMAT_STRING_SIZE 7 +#define PROC_FORMAT_STRING_SIZE 13 + +typedef struct _MIDL_TYPE_FORMAT_STRING +{ + short Pad; + unsigned char Format[TYPE_FORMAT_STRING_SIZE]; +} MIDL_TYPE_FORMAT_STRING; + +typedef struct _MIDL_PROC_FORMAT_STRING +{ + short Pad; + unsigned char Format[PROC_FORMAT_STRING_SIZE]; +} MIDL_PROC_FORMAT_STRING; + + +static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString; +static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString; + +/***************************************************************************** + * hello interface + */ + +static const RPC_CLIENT_INTERFACE hello___RpcClientInterface = +{ + sizeof(RPC_CLIENT_INTERFACE), + {{0x906b0ce0,0xc70b,0x1067,{0xb3,0x17,0x00,0xdd,0x01,0x06,0x62,0xda}},{1,0}}, + {{0x8a885d04,0x1ceb,0x11c9,{0x9f,0xe8,0x08,0x00,0x2b,0x10,0x48,0x60}},{2,0}}, + 0, + 0, + 0, + 0, + 0, + 0, +}; +RPC_IF_HANDLE hello_v1_0_c_ifspec DECLSPEC_HIDDEN = (RPC_IF_HANDLE)& hello___RpcClientInterface; + +static const MIDL_STUB_DESC hello_StubDesc; + +static RPC_BINDING_HANDLE hello__MIDL_AutoBindHandle; + +struct __frame_HelloProc +{ + __DECL_EXCEPTION_FRAME + MIDL_STUB_MESSAGE _StubMsg; + RPC_BINDING_HANDLE _Handle; +}; + +static void __finally_HelloProc( struct __frame_HelloProc *__frame ) +{ + NdrFreeBuffer(&__frame->_StubMsg); +} + +void HelloProc( + handle_t h1, + unsigned char *pszString) +{ + struct __frame_HelloProc __f, * const __frame = &__f; + RPC_MESSAGE _RpcMessage; + __frame->_Handle = 0; + + RpcExceptionInit( 0, __finally_HelloProc ); + if (!pszString) + { + RpcRaiseException(RPC_X_NULL_REF_POINTER); + } + + RpcTryFinally + { + NdrClientInitializeNew(&_RpcMessage, &__frame->_StubMsg, &hello_StubDesc, 0); + __frame->_Handle = h1; + + __frame->_StubMsg.BufferLength = 0; + + NdrConformantStringBufferSize( + &__frame->_StubMsg, + (unsigned char *)pszString, + (PFORMAT_STRING)&__MIDL_TypeFormatString.Format[4]); + + NdrGetBuffer(&__frame->_StubMsg, __frame->_StubMsg.BufferLength, __frame->_Handle); + + + NdrConformantStringMarshall( + &__frame->_StubMsg, + (unsigned char *)pszString, + (PFORMAT_STRING)&__MIDL_TypeFormatString.Format[4]); + + NdrSendReceive(&__frame->_StubMsg, __frame->_StubMsg.Buffer); + + __frame->_StubMsg.BufferStart = _RpcMessage.Buffer; + __frame->_StubMsg.BufferEnd = __frame->_StubMsg.BufferStart + _RpcMessage.BufferLength; + + } + RpcFinally + { + __finally_HelloProc( __frame ); + } + RpcEndFinally +} + +struct __frame_Shutdown +{ + __DECL_EXCEPTION_FRAME + MIDL_STUB_MESSAGE _StubMsg; + RPC_BINDING_HANDLE _Handle; +}; + +static void __finally_Shutdown( struct __frame_Shutdown *__frame ) +{ + NdrFreeBuffer(&__frame->_StubMsg); +} + +void Shutdown( + handle_t h1) +{ + struct __frame_Shutdown __f, * const __frame = &__f; + RPC_MESSAGE _RpcMessage; + __frame->_Handle = 0; + + RpcExceptionInit( 0, __finally_Shutdown ); + RpcTryFinally + { + NdrClientInitializeNew(&_RpcMessage, &__frame->_StubMsg, &hello_StubDesc, 1); + __frame->_Handle = h1; + + __frame->_StubMsg.BufferLength = 0; + + NdrGetBuffer(&__frame->_StubMsg, __frame->_StubMsg.BufferLength, __frame->_Handle); + + + NdrSendReceive(&__frame->_StubMsg, __frame->_StubMsg.Buffer); + + __frame->_StubMsg.BufferStart = _RpcMessage.Buffer; + __frame->_StubMsg.BufferEnd = __frame->_StubMsg.BufferStart + _RpcMessage.BufferLength; + + } + RpcFinally + { + __finally_Shutdown( __frame ); + } + RpcEndFinally +} + +#if !defined(__RPC_WIN32__) +#error Invalid build platform for this stub. +#endif + +static const MIDL_STUB_DESC hello_StubDesc = +{ + (void *)& hello___RpcClientInterface, + MIDL_user_allocate, + MIDL_user_free, + { + &hello__MIDL_AutoBindHandle, + }, + 0, + 0, + 0, + 0, + __MIDL_TypeFormatString.Format, + 1, /* -error bounds_check flag */ + 0x10001, /* Ndr library version */ + 0, + 0x50100a4, /* MIDL Version 5.1.164 */ + 0, + 0, + 0, /* notify & notify_flag routine table */ + 1, /* Flags */ + 0, /* Reserved3 */ + 0, /* Reserved4 */ + 0 /* Reserved5 */ +}; + + +static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString = +{ + 0, + { +/* 0 (parameter h1) */ + 0x4e, /* FC_IN_PARAM_BASETYPE */ + 0x0f, /* FC_IGNORE */ +/* 2 (parameter pszString) */ + 0x4d, /* FC_IN_PARAM */ + 0x01, + NdrFcShort(0x2), /* type offset = 2 */ +/* 6 (void) */ + 0x5b, /* FC_END */ + 0x5c, /* FC_PAD */ +/* 8 (parameter h1) */ + 0x4e, /* FC_IN_PARAM_BASETYPE */ + 0x0f, /* FC_IGNORE */ +/* 10 (void) */ + 0x5b, /* FC_END */ + 0x5c, /* FC_PAD */ + 0x0 + } +}; + +static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString = +{ + 0, + { + NdrFcShort(0x0), +/* 2 (unsigned char *) */ + 0x11, 0x8, /* FC_RP [simple_pointer] */ +/* 4 */ + 0x22, /* FC_C_CSTRING */ + 0x5c, /* FC_PAD */ + 0x0 + } +}; + + +#else /* _WIN64 */ + +#ifndef USE_COMPILER_EXCEPTIONS + +#include "wine/exception.h" +#undef RpcTryExcept +#undef RpcExcept +#undef RpcEndExcept +#undef RpcTryFinally +#undef RpcFinally +#undef RpcEndFinally +#undef RpcExceptionCode +#undef RpcAbnormalTermination + +struct __exception_frame; +typedef int (*__filter_func)(struct __exception_frame *); +typedef void (*__finally_func)(struct __exception_frame *); + +#define __DECL_EXCEPTION_FRAME \ + EXCEPTION_REGISTRATION_RECORD frame; \ + __filter_func filter; \ + __finally_func finally; \ + sigjmp_buf jmp; \ + DWORD code; \ + unsigned char abnormal_termination; \ + unsigned char filter_level; \ + unsigned char finally_level; + +struct __exception_frame +{ + __DECL_EXCEPTION_FRAME +}; + +static inline void __widl_unwind_target(void) +{ + struct __exception_frame *exc_frame = (struct __exception_frame *)__wine_get_frame(); + if (exc_frame->finally_level > exc_frame->filter_level) + { + exc_frame->abnormal_termination = 1; + exc_frame->finally( exc_frame ); + __wine_pop_frame( &exc_frame->frame ); + } + exc_frame->filter_level = 0; + siglongjmp( exc_frame->jmp, 1 ); +} + +static DWORD __widl_exception_handler( EXCEPTION_RECORD *record, + EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, + EXCEPTION_REGISTRATION_RECORD **pdispatcher ) +{ + struct __exception_frame *exc_frame = (struct __exception_frame *)frame; + + if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) + { + if (exc_frame->finally_level && (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))) + { + exc_frame->abnormal_termination = 1; + exc_frame->finally( exc_frame ); + } + return ExceptionContinueSearch; + } + exc_frame->code = record->ExceptionCode; + if (exc_frame->filter_level && exc_frame->filter( exc_frame ) == EXCEPTION_EXECUTE_HANDLER) + __wine_rtl_unwind( frame, record, __widl_unwind_target ); + return ExceptionContinueSearch; +} + +#define RpcTryExcept \ + if (!sigsetjmp( __frame->jmp, 0 )) \ + { \ + if (!__frame->finally_level) \ + __wine_push_frame( &__frame->frame ); \ + __frame->filter_level = __frame->finally_level + 1; + +#define RpcExcept(expr) \ + if (!__frame->finally_level) \ + __wine_pop_frame( &__frame->frame ); \ + __frame->filter_level = 0; \ + } \ + else \ + +#define RpcEndExcept + +#define RpcExceptionCode() (__frame->code) + +#define RpcTryFinally \ + if (!__frame->filter_level) \ + __wine_push_frame( &__frame->frame ); \ + __frame->finally_level = __frame->filter_level + 1; + +#define RpcFinally \ + if (!__frame->filter_level) \ + __wine_pop_frame( &__frame->frame ); \ + __frame->finally_level = 0; + +#define RpcEndFinally + +#define RpcAbnormalTermination() (__frame->abnormal_termination) + +#define RpcExceptionInit(filter_func,finally_func) \ + do { \ + __frame->frame.Handler = __widl_exception_handler; \ + __frame->filter = (__filter_func)(filter_func); \ + __frame->finally = (__finally_func)(finally_func); \ + __frame->abnormal_termination = 0; \ + __frame->filter_level = 0; \ + __frame->finally_level = 0; \ + } while (0) + +#else /* USE_COMPILER_EXCEPTIONS */ + +#define RpcExceptionInit(filter_func,finally_func) \ + do { (void)(filter_func); } while(0) + +#define __DECL_EXCEPTION_FRAME \ + DWORD code; + +#endif /* USE_COMPILER_EXCEPTIONS */ + +#define TYPE_FORMAT_STRING_SIZE 7 +#define PROC_FORMAT_STRING_SIZE 13 + +typedef struct _MIDL_TYPE_FORMAT_STRING +{ + short Pad; + unsigned char Format[TYPE_FORMAT_STRING_SIZE]; +} MIDL_TYPE_FORMAT_STRING; + +typedef struct _MIDL_PROC_FORMAT_STRING +{ + short Pad; + unsigned char Format[PROC_FORMAT_STRING_SIZE]; +} MIDL_PROC_FORMAT_STRING; + + +static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString; +static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString; + +/***************************************************************************** + * hello interface + */ + +static const RPC_CLIENT_INTERFACE hello___RpcClientInterface = +{ + sizeof(RPC_CLIENT_INTERFACE), + {{0x906b0ce0,0xc70b,0x1067,{0xb3,0x17,0x00,0xdd,0x01,0x06,0x62,0xda}},{1,0}}, + {{0x8a885d04,0x1ceb,0x11c9,{0x9f,0xe8,0x08,0x00,0x2b,0x10,0x48,0x60}},{2,0}}, + 0, + 0, + 0, + 0, + 0, + 0, +}; +RPC_IF_HANDLE hello_v1_0_c_ifspec DECLSPEC_HIDDEN = (RPC_IF_HANDLE)& hello___RpcClientInterface; + +static const MIDL_STUB_DESC hello_StubDesc; + +static RPC_BINDING_HANDLE hello__MIDL_AutoBindHandle; + +struct __frame_HelloProc +{ + __DECL_EXCEPTION_FRAME + MIDL_STUB_MESSAGE _StubMsg; + RPC_BINDING_HANDLE _Handle; +}; + +static void __finally_HelloProc( struct __frame_HelloProc *__frame ) +{ + NdrFreeBuffer(&__frame->_StubMsg); +} + +void HelloProc( + handle_t h1, + unsigned char *pszString) +{ + struct __frame_HelloProc __f, * const __frame = &__f; + RPC_MESSAGE _RpcMessage; + __frame->_Handle = 0; + + RpcExceptionInit( 0, __finally_HelloProc ); + if (!pszString) + { + RpcRaiseException(RPC_X_NULL_REF_POINTER); + } + + RpcTryFinally + { + NdrClientInitializeNew(&_RpcMessage, &__frame->_StubMsg, &hello_StubDesc, 0); + __frame->_Handle = h1; + + __frame->_StubMsg.BufferLength = 0; + + NdrConformantStringBufferSize( + &__frame->_StubMsg, + (unsigned char *)pszString, + (PFORMAT_STRING)&__MIDL_TypeFormatString.Format[4]); + + NdrGetBuffer(&__frame->_StubMsg, __frame->_StubMsg.BufferLength, __frame->_Handle); + + + NdrConformantStringMarshall( + &__frame->_StubMsg, + (unsigned char *)pszString, + (PFORMAT_STRING)&__MIDL_TypeFormatString.Format[4]); + + NdrSendReceive(&__frame->_StubMsg, __frame->_StubMsg.Buffer); + + __frame->_StubMsg.BufferStart = _RpcMessage.Buffer; + __frame->_StubMsg.BufferEnd = __frame->_StubMsg.BufferStart + _RpcMessage.BufferLength; + + } + RpcFinally + { + __finally_HelloProc( __frame ); + } + RpcEndFinally +} + +struct __frame_Shutdown +{ + __DECL_EXCEPTION_FRAME + MIDL_STUB_MESSAGE _StubMsg; + RPC_BINDING_HANDLE _Handle; +}; + +static void __finally_Shutdown( struct __frame_Shutdown *__frame ) +{ + NdrFreeBuffer(&__frame->_StubMsg); +} + +void Shutdown( + handle_t h1) +{ + struct __frame_Shutdown __f, * const __frame = &__f; + RPC_MESSAGE _RpcMessage; + __frame->_Handle = 0; + + RpcExceptionInit( 0, __finally_Shutdown ); + RpcTryFinally + { + NdrClientInitializeNew(&_RpcMessage, &__frame->_StubMsg, &hello_StubDesc, 1); + __frame->_Handle = h1; + + __frame->_StubMsg.BufferLength = 0; + + NdrGetBuffer(&__frame->_StubMsg, __frame->_StubMsg.BufferLength, __frame->_Handle); + + + NdrSendReceive(&__frame->_StubMsg, __frame->_StubMsg.Buffer); + + __frame->_StubMsg.BufferStart = _RpcMessage.Buffer; + __frame->_StubMsg.BufferEnd = __frame->_StubMsg.BufferStart + _RpcMessage.BufferLength; + + } + RpcFinally + { + __finally_Shutdown( __frame ); + } + RpcEndFinally +} + +#if !defined(__RPC_WIN64__) +#error Invalid build platform for this stub. +#endif + +static const MIDL_STUB_DESC hello_StubDesc = +{ + (void *)& hello___RpcClientInterface, + MIDL_user_allocate, + MIDL_user_free, + { + &hello__MIDL_AutoBindHandle, + }, + 0, + 0, + 0, + 0, + __MIDL_TypeFormatString.Format, + 1, /* -error bounds_check flag */ + 0x10001, /* Ndr library version */ + 0, + 0x50100a4, /* MIDL Version 5.1.164 */ + 0, + 0, + 0, /* notify & notify_flag routine table */ + 1, /* Flags */ + 0, /* Reserved3 */ + 0, /* Reserved4 */ + 0 /* Reserved5 */ +}; + + +static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString = +{ + 0, + { +/* 0 (parameter h1) */ + 0x4e, /* FC_IN_PARAM_BASETYPE */ + 0x0f, /* FC_IGNORE */ +/* 2 (parameter pszString) */ + 0x4d, /* FC_IN_PARAM */ + 0x01, + NdrFcShort(0x2), /* type offset = 2 */ +/* 6 (void) */ + 0x5b, /* FC_END */ + 0x5c, /* FC_PAD */ +/* 8 (parameter h1) */ + 0x4e, /* FC_IN_PARAM_BASETYPE */ + 0x0f, /* FC_IGNORE */ +/* 10 (void) */ + 0x5b, /* FC_END */ + 0x5c, /* FC_PAD */ + 0x0 + } +}; + +static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString = +{ + 0, + { + NdrFcShort(0x0), +/* 2 (unsigned char *) */ + 0x11, 0x8, /* FC_RP [simple_pointer] */ +/* 4 */ + 0x22, /* FC_C_CSTRING */ + 0x5c, /* FC_PAD */ + 0x0 + } +}; + + +#endif /* _WIN64 */ Propchange: branches/nyadav-audio-branch/base/services/testc/Hello_c.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/testc/Hello_c.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/base/services/testc/Helloc.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/testc/Helloc.c (added) +++ branches/nyadav-audio-branch/base/services/testc/Helloc.c [iso-8859-1] Mon May 30 11:32:19 2011 @@ -1,0 +1,63 @@ +#include <stdlib.h> +#include <stdio.h> +#include <ctype.h> +#include "hello.h" // header file generated by MIDL compiler + +void __cdecl wmain(int argc, char **argv) +{ + RPC_STATUS status; + + unsigned char * pszStringBinding = NULL; + unsigned char * pszString = "hello, world"; + + // Use a convenience function to concatenate the elements of + // the string binding into the proper sequence. + status = RpcStringBindingCompose(NULL,L"ncacn_np",NULL,L"\\pipe\\audsrv",NULL,&pszStringBinding); + printf("RpcStringBindingCompose returned 0x%x\n", status); +printf("**%s**\n",pszStringBinding); + // Set the binding handle that will be used to bind to the server. + status = RpcBindingFromStringBinding(pszStringBinding, + &hello_v1_0_c_ifspec); + printf("RpcBindingFromStringBinding returned 0x%x\n", status); + + + printf("Calling the remote procedure 'HelloProc'\n"); + printf("Print the string '%s' on the server\n", pszString); + + RpcTryExcept { + HelloProc(hello_v1_0_c_ifspec,pszString); // make call with user message + printf("Calling the remote procedure 'Shutdown'\n"); + Shutdown(hello_v1_0_c_ifspec); // shut down the server side + } + RpcExcept(1) { + status = RpcExceptionCode(); + printf("Runtime reported exception 0x%lx = %ld\n", status, status); + + + } + RpcEndExcept + + // The calls to the remote procedures are complete. + // Free the string and the binding handle + status = RpcStringFree(&pszStringBinding); // remote calls done; unbind + printf("RpcStringFree returned 0x%x\n", status); + + status = RpcBindingFree(&hello_v1_0_c_ifspec); // remote calls done; unbind + printf("RpcBindingFree returned 0x%x\n", status); + if (status) { + printf("4Error %d",status); + } + + exit(0); + +} // end main() + +void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) +{ + return(malloc(len)); +} + +void __RPC_USER midl_user_free(void __RPC_FAR * ptr) +{ + free(ptr); +} Propchange: branches/nyadav-audio-branch/base/services/testc/Helloc.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/testc/Helloc.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: branches/nyadav-audio-branch/base/services/tests/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon May 30 11:32:19 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/nyadav-audio-branch/base/services/tests/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/nyadav-audio-branch/base/services/tests/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/nyadav-audio-branch/base/services/tests/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/nyadav-audio-branch/base/services/tests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/tests/CMakeLists.txt (added) +++ branches/nyadav-audio-branch/base/services/tests/CMakeLists.txt [iso-8859-1] Mon May 30 11:32:19 2011 @@ -1,0 +1,15 @@ + +set_unicode() + +list(APPEND SOURCE + Hellos.c + Hellop.c + hello_s.c) + +add_executable(tests ${SOURCE}) +add_definitions(-D__USE_CRTIMP) +target_link_libraries(tests ${PSEH_LIB}) + +set_module_type(tests win32cui) +add_importlibs(tests advapi32 rpcrt4 msvcrt kernel32 ntdll user32 ksuser setupapi) +add_cab_target(tests 1) Propchange: branches/nyadav-audio-branch/base/services/tests/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/tests/CMakeLists.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/base/services/tests/Hello.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/tests/Hello.h (added) +++ branches/nyadav-audio-branch/base/services/tests/Hello.h [iso-8859-1] Mon May 30 11:32:19 2011 @@ -1,0 +1,45 @@ +/*** Autogenerated by WIDL 0.4-SVN from Hello.idl - Do not edit ***/ + +#include <rpc.h> +#include <rpcndr.h> + +#ifndef __WIDL_HELLO_H +#define __WIDL_HELLO_H + +/* Forward declarations */ + +/* Headers for imported files */ + + +#ifdef __cplusplus +extern "C" { +#endif + +/***************************************************************************** + * hello interface (v1.0) + */ +#ifndef __hello_INTERFACE_DEFINED__ +#define __hello_INTERFACE_DEFINED__ + +extern RPC_IF_HANDLE hello_v1_0_c_ifspec; +extern RPC_IF_HANDLE hello_v1_0_s_ifspec; +void HelloProc( + handle_t h1, + unsigned char *pszString); + +void Shutdown( + handle_t h1); + + +#endif /* __hello_INTERFACE_DEFINED__ */ + +/* Begin additional prototypes for all interfaces */ + + +/* End additional prototypes */ + +#ifdef __cplusplus +} +#endif + +#endif /* __WIDL_HELLO_H */ Propchange: branches/nyadav-audio-branch/base/services/tests/Hello.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/tests/Hello.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/base/services/tests/Hello_s.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/tests/Hello_s.c (added) +++ branches/nyadav-audio-branch/base/services/tests/Hello_s.c [iso-8859-1] Mon May 30 11:32:19 2011 @@ -1,0 +1,824 @@ +/*** Autogenerated by WIDL 0.4-SVN from Hello.idl - Do not edit ***/ +#include <string.h> + +#include "Hello.h" + +#ifndef DECLSPEC_HIDDEN +#define DECLSPEC_HIDDEN +#endif + +#ifndef _WIN64 + +#ifndef USE_COMPILER_EXCEPTIONS + +#include "wine/exception.h" +#undef RpcTryExcept +#undef RpcExcept +#undef RpcEndExcept +#undef RpcTryFinally +#undef RpcFinally +#undef RpcEndFinally +#undef RpcExceptionCode +#undef RpcAbnormalTermination + +struct __exception_frame; +typedef int (*__filter_func)(struct __exception_frame *); +typedef void (*__finally_func)(struct __exception_frame *); + +#define __DECL_EXCEPTION_FRAME \ + EXCEPTION_REGISTRATION_RECORD frame; \ + __filter_func filter; \ + __finally_func finally; \ + sigjmp_buf jmp; \ + DWORD code; \ + unsigned char abnormal_termination; \ + unsigned char filter_level; \ + unsigned char finally_level; + +struct __exception_frame +{ + __DECL_EXCEPTION_FRAME +}; + +static inline void __widl_unwind_target(void) +{ + struct __exception_frame *exc_frame = (struct __exception_frame *)__wine_get_frame(); + if (exc_frame->finally_level > exc_frame->filter_level) + { + exc_frame->abnormal_termination = 1; + exc_frame->finally( exc_frame ); + __wine_pop_frame( &exc_frame->frame ); + } + exc_frame->filter_level = 0; + siglongjmp( exc_frame->jmp, 1 ); +} + +static DWORD __widl_exception_handler( EXCEPTION_RECORD *record, + EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, + EXCEPTION_REGISTRATION_RECORD **pdispatcher ) +{ + struct __exception_frame *exc_frame = (struct __exception_frame *)frame; + + if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) + { + if (exc_frame->finally_level && (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))) + { + exc_frame->abnormal_termination = 1; + exc_frame->finally( exc_frame ); + } + return ExceptionContinueSearch; + } + exc_frame->code = record->ExceptionCode; + if (exc_frame->filter_level && exc_frame->filter( exc_frame ) == EXCEPTION_EXECUTE_HANDLER) + __wine_rtl_unwind( frame, record, __widl_unwind_target ); + return ExceptionContinueSearch; +} + +#define RpcTryExcept \ + if (!sigsetjmp( __frame->jmp, 0 )) \ + { \ + if (!__frame->finally_level) \ + __wine_push_frame( &__frame->frame ); \ + __frame->filter_level = __frame->finally_level + 1; + +#define RpcExcept(expr) \ + if (!__frame->finally_level) \ + __wine_pop_frame( &__frame->frame ); \ + __frame->filter_level = 0; \ + } \ + else \ + +#define RpcEndExcept + +#define RpcExceptionCode() (__frame->code) + +#define RpcTryFinally \ + if (!__frame->filter_level) \ + __wine_push_frame( &__frame->frame ); \ + __frame->finally_level = __frame->filter_level + 1; + +#define RpcFinally \ + if (!__frame->filter_level) \ + __wine_pop_frame( &__frame->frame ); \ + __frame->finally_level = 0; + +#define RpcEndFinally + +#define RpcAbnormalTermination() (__frame->abnormal_termination) + +#define RpcExceptionInit(filter_func,finally_func) \ + do { \ + __frame->frame.Handler = __widl_exception_handler; \ + __frame->filter = (__filter_func)(filter_func); \ + __frame->finally = (__finally_func)(finally_func); \ + __frame->abnormal_termination = 0; \ + __frame->filter_level = 0; \ + __frame->finally_level = 0; \ + } while (0) + +#else /* USE_COMPILER_EXCEPTIONS */ + +#define RpcExceptionInit(filter_func,finally_func) \ + do { (void)(filter_func); } while(0) + +#define __DECL_EXCEPTION_FRAME \ + DWORD code; + +#endif /* USE_COMPILER_EXCEPTIONS */ + +struct __server_frame +{ + __DECL_EXCEPTION_FRAME + MIDL_STUB_MESSAGE _StubMsg; +}; + +static int __server_filter( struct __server_frame *__frame ) +{ + return (__frame->code == STATUS_ACCESS_VIOLATION) || + (__frame->code == STATUS_DATATYPE_MISALIGNMENT) || + (__frame->code == RPC_X_BAD_STUB_DATA) || + (__frame->code == RPC_S_INVALID_BOUND); +} + +#define TYPE_FORMAT_STRING_SIZE 7 +#define PROC_FORMAT_STRING_SIZE 13 + +typedef struct _MIDL_TYPE_FORMAT_STRING +{ + short Pad; + unsigned char Format[TYPE_FORMAT_STRING_SIZE]; +} MIDL_TYPE_FORMAT_STRING; + +typedef struct _MIDL_PROC_FORMAT_STRING +{ + short Pad; + unsigned char Format[PROC_FORMAT_STRING_SIZE]; +} MIDL_PROC_FORMAT_STRING; + + +static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString; +static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString; + +/***************************************************************************** + * hello interface + */ + +static RPC_DISPATCH_TABLE hello_v1_0_DispatchTable; +static const MIDL_SERVER_INFO hello_ServerInfo; + +static const RPC_SERVER_INTERFACE hello___RpcServerInterface = +{ + sizeof(RPC_SERVER_INTERFACE), + {{0x906b0ce0,0xc70b,0x1067,{0xb3,0x17,0x00,0xdd,0x01,0x06,0x62,0xda}},{1,0}}, + {{0x8a885d04,0x1ceb,0x11c9,{0x9f,0xe8,0x08,0x00,0x2b,0x10,0x48,0x60}},{2,0}}, + &hello_v1_0_DispatchTable, + 0, + 0, + 0, + &hello_ServerInfo, + 0, +}; +RPC_IF_HANDLE hello_v1_0_s_ifspec DECLSPEC_HIDDEN = (RPC_IF_HANDLE)& hello___RpcServerInterface; + +static const MIDL_STUB_DESC hello_StubDesc; + +struct __frame_hello_HelloProc +{ + __DECL_EXCEPTION_FRAME + MIDL_STUB_MESSAGE _StubMsg; + handle_t h1; + unsigned char * pszString; +}; + +static void __finally_hello_HelloProc( struct __frame_hello_HelloProc *__frame ) +{ + + NdrPointerFree( + &__frame->_StubMsg, + (unsigned char *)__frame->pszString, + (PFORMAT_STRING)&__MIDL_TypeFormatString.Format[2]); + +} + +void __RPC_STUB hello_HelloProc( PRPC_MESSAGE _pRpcMessage ) +{ + struct __frame_hello_HelloProc __f, * const __frame = &__f; + + NdrServerInitializeNew( + _pRpcMessage, + &__frame->_StubMsg, + &hello_StubDesc); + + RpcExceptionInit( __server_filter, __finally_hello_HelloProc ); + __frame->pszString = 0; + + __frame->h1 = _pRpcMessage->Handle; + + RpcTryFinally + { + RpcTryExcept + { + if ((_pRpcMessage->DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) + NdrConvert(&__frame->_StubMsg, (PFORMAT_STRING)&__MIDL_ProcFormatString.Format[0]); + + + NdrConformantStringUnmarshall( + &__frame->_StubMsg, + (unsigned char **)&__frame->pszString, + (PFORMAT_STRING)&__MIDL_TypeFormatString.Format[4], + 0); + + if (__frame->_StubMsg.Buffer > __frame->_StubMsg.BufferEnd) + { + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + } + RpcExcept(RPC_BAD_STUB_DATA_EXCEPTION_FILTER) + { + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + RpcEndExcept + + HelloProc( + __frame->h1, + __frame->pszString); + } + RpcFinally + { + __finally_hello_HelloProc( __frame ); + } + RpcEndFinally + + _pRpcMessage->BufferLength = __frame->_StubMsg.Buffer - (unsigned char *)_pRpcMessage->Buffer; +} + +struct __frame_hello_Shutdown +{ + __DECL_EXCEPTION_FRAME + MIDL_STUB_MESSAGE _StubMsg; + handle_t h1; +}; + +static void __finally_hello_Shutdown( struct __frame_hello_Shutdown *__frame ) +{ + +} + +void __RPC_STUB hello_Shutdown( PRPC_MESSAGE _pRpcMessage ) +{ + struct __frame_hello_Shutdown __f, * const __frame = &__f; + + NdrServerInitializeNew( + _pRpcMessage, + &__frame->_StubMsg, + &hello_StubDesc); + + RpcExceptionInit( __server_filter, __finally_hello_Shutdown ); + + __frame->h1 = _pRpcMessage->Handle; + + RpcTryFinally + { + RpcTryExcept + { + if ((_pRpcMessage->DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) + NdrConvert(&__frame->_StubMsg, (PFORMAT_STRING)&__MIDL_ProcFormatString.Format[8]); + + + if (__frame->_StubMsg.Buffer > __frame->_StubMsg.BufferEnd) + { + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + } + RpcExcept(RPC_BAD_STUB_DATA_EXCEPTION_FILTER) + { + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + RpcEndExcept + + Shutdown( + __frame->h1); + } + RpcFinally + { + __finally_hello_Shutdown( __frame ); + } + RpcEndFinally + + _pRpcMessage->BufferLength = __frame->_StubMsg.Buffer - (unsigned char *)_pRpcMessage->Buffer; +} + +#if !defined(__RPC_WIN32__) +#error Invalid build platform for this stub. +#endif + +static const unsigned short hello_FormatStringOffsetTable[] = +{ + 0, /* HelloProc */ + 8, /* Shutdown */ +}; + +static const MIDL_STUB_DESC hello_StubDesc = +{ + (void *)& hello___RpcServerInterface, + MIDL_user_allocate, + MIDL_user_free, + { + 0, + }, + 0, + 0, + 0, + 0, + __MIDL_TypeFormatString.Format, + 1, /* -error bounds_check flag */ + 0x10001, /* Ndr library version */ + 0, + 0x50100a4, /* MIDL Version 5.1.164 */ + 0, + 0, + 0, /* notify & notify_flag routine table */ + 1, /* Flags */ + 0, /* Reserved3 */ + 0, /* Reserved4 */ + 0 /* Reserved5 */ +}; + +static RPC_DISPATCH_FUNCTION hello_table[] = +{ + hello_HelloProc, + hello_Shutdown, + 0 +}; +static RPC_DISPATCH_TABLE hello_v1_0_DispatchTable = +{ + 2, + hello_table +}; + +static const SERVER_ROUTINE hello_ServerRoutineTable[] = +{ + (SERVER_ROUTINE)HelloProc, + (SERVER_ROUTINE)Shutdown, +}; + +static const MIDL_SERVER_INFO hello_ServerInfo = +{ + &hello_StubDesc, + hello_ServerRoutineTable, + __MIDL_ProcFormatString.Format, + hello_FormatStringOffsetTable, + 0, + 0, + 0, + 0 +}; + +static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString = +{ + 0, + { +/* 0 (parameter h1) */ + 0x4e, /* FC_IN_PARAM_BASETYPE */ + 0x0f, /* FC_IGNORE */ +/* 2 (parameter pszString) */ + 0x4d, /* FC_IN_PARAM */ + 0x01, + NdrFcShort(0x2), /* type offset = 2 */ +/* 6 (void) */ + 0x5b, /* FC_END */ + 0x5c, /* FC_PAD */ +/* 8 (parameter h1) */ + 0x4e, /* FC_IN_PARAM_BASETYPE */ + 0x0f, /* FC_IGNORE */ +/* 10 (void) */ + 0x5b, /* FC_END */ + 0x5c, /* FC_PAD */ + 0x0 + } +}; + +static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString = +{ + 0, + { + NdrFcShort(0x0), +/* 2 (unsigned char *) */ + 0x11, 0x8, /* FC_RP [simple_pointer] */ +/* 4 */ + 0x22, /* FC_C_CSTRING */ + 0x5c, /* FC_PAD */ + 0x0 + } +}; + + +#else /* _WIN64 */ + +#ifndef USE_COMPILER_EXCEPTIONS + +#include "wine/exception.h" +#undef RpcTryExcept +#undef RpcExcept +#undef RpcEndExcept +#undef RpcTryFinally +#undef RpcFinally +#undef RpcEndFinally +#undef RpcExceptionCode +#undef RpcAbnormalTermination + +struct __exception_frame; +typedef int (*__filter_func)(struct __exception_frame *); +typedef void (*__finally_func)(struct __exception_frame *); + +#define __DECL_EXCEPTION_FRAME \ + EXCEPTION_REGISTRATION_RECORD frame; \ + __filter_func filter; \ + __finally_func finally; \ + sigjmp_buf jmp; \ + DWORD code; \ + unsigned char abnormal_termination; \ + unsigned char filter_level; \ + unsigned char finally_level; + +struct __exception_frame +{ + __DECL_EXCEPTION_FRAME +}; + +static inline void __widl_unwind_target(void) +{ + struct __exception_frame *exc_frame = (struct __exception_frame *)__wine_get_frame(); + if (exc_frame->finally_level > exc_frame->filter_level) + { + exc_frame->abnormal_termination = 1; + exc_frame->finally( exc_frame ); + __wine_pop_frame( &exc_frame->frame ); + } + exc_frame->filter_level = 0; + siglongjmp( exc_frame->jmp, 1 ); +} + +static DWORD __widl_exception_handler( EXCEPTION_RECORD *record, + EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, + EXCEPTION_REGISTRATION_RECORD **pdispatcher ) +{ + struct __exception_frame *exc_frame = (struct __exception_frame *)frame; + + if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) + { + if (exc_frame->finally_level && (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))) + { + exc_frame->abnormal_termination = 1; + exc_frame->finally( exc_frame ); + } + return ExceptionContinueSearch; + } + exc_frame->code = record->ExceptionCode; + if (exc_frame->filter_level && exc_frame->filter( exc_frame ) == EXCEPTION_EXECUTE_HANDLER) + __wine_rtl_unwind( frame, record, __widl_unwind_target ); + return ExceptionContinueSearch; +} + +#define RpcTryExcept \ + if (!sigsetjmp( __frame->jmp, 0 )) \ + { \ + if (!__frame->finally_level) \ + __wine_push_frame( &__frame->frame ); \ + __frame->filter_level = __frame->finally_level + 1; + +#define RpcExcept(expr) \ + if (!__frame->finally_level) \ + __wine_pop_frame( &__frame->frame ); \ + __frame->filter_level = 0; \ + } \ + else \ + +#define RpcEndExcept + +#define RpcExceptionCode() (__frame->code) + +#define RpcTryFinally \ + if (!__frame->filter_level) \ + __wine_push_frame( &__frame->frame ); \ + __frame->finally_level = __frame->filter_level + 1; + +#define RpcFinally \ + if (!__frame->filter_level) \ + __wine_pop_frame( &__frame->frame ); \ + __frame->finally_level = 0; + +#define RpcEndFinally + +#define RpcAbnormalTermination() (__frame->abnormal_termination) + +#define RpcExceptionInit(filter_func,finally_func) \ + do { \ + __frame->frame.Handler = __widl_exception_handler; \ + __frame->filter = (__filter_func)(filter_func); \ + __frame->finally = (__finally_func)(finally_func); \ + __frame->abnormal_termination = 0; \ + __frame->filter_level = 0; \ + __frame->finally_level = 0; \ + } while (0) + +#else /* USE_COMPILER_EXCEPTIONS */ + +#define RpcExceptionInit(filter_func,finally_func) \ + do { (void)(filter_func); } while(0) + +#define __DECL_EXCEPTION_FRAME \ + DWORD code; + +#endif /* USE_COMPILER_EXCEPTIONS */ + +struct __server_frame +{ + __DECL_EXCEPTION_FRAME + MIDL_STUB_MESSAGE _StubMsg; +}; + +static int __server_filter( struct __server_frame *__frame ) +{ + return (__frame->code == STATUS_ACCESS_VIOLATION) || + (__frame->code == STATUS_DATATYPE_MISALIGNMENT) || + (__frame->code == RPC_X_BAD_STUB_DATA) || + (__frame->code == RPC_S_INVALID_BOUND); +} + +#define TYPE_FORMAT_STRING_SIZE 7 +#define PROC_FORMAT_STRING_SIZE 13 + +typedef struct _MIDL_TYPE_FORMAT_STRING +{ + short Pad; + unsigned char Format[TYPE_FORMAT_STRING_SIZE]; +} MIDL_TYPE_FORMAT_STRING; + +typedef struct _MIDL_PROC_FORMAT_STRING +{ + short Pad; + unsigned char Format[PROC_FORMAT_STRING_SIZE]; +} MIDL_PROC_FORMAT_STRING; + + +static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString; +static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString; + +/***************************************************************************** + * hello interface + */ + +static RPC_DISPATCH_TABLE hello_v1_0_DispatchTable; +static const MIDL_SERVER_INFO hello_ServerInfo; + +static const RPC_SERVER_INTERFACE hello___RpcServerInterface = +{ + sizeof(RPC_SERVER_INTERFACE), + {{0x906b0ce0,0xc70b,0x1067,{0xb3,0x17,0x00,0xdd,0x01,0x06,0x62,0xda}},{1,0}}, + {{0x8a885d04,0x1ceb,0x11c9,{0x9f,0xe8,0x08,0x00,0x2b,0x10,0x48,0x60}},{2,0}}, + &hello_v1_0_DispatchTable, + 0, + 0, + 0, + &hello_ServerInfo, + 0, +}; +RPC_IF_HANDLE hello_v1_0_s_ifspec DECLSPEC_HIDDEN = (RPC_IF_HANDLE)& hello___RpcServerInterface; + +static const MIDL_STUB_DESC hello_StubDesc; + +struct __frame_hello_HelloProc +{ + __DECL_EXCEPTION_FRAME + MIDL_STUB_MESSAGE _StubMsg; + handle_t h1; + unsigned char * pszString; +}; + +static void __finally_hello_HelloProc( struct __frame_hello_HelloProc *__frame ) +{ + + NdrPointerFree( + &__frame->_StubMsg, + (unsigned char *)__frame->pszString, + (PFORMAT_STRING)&__MIDL_TypeFormatString.Format[2]); + +} + +void __RPC_STUB hello_HelloProc( PRPC_MESSAGE _pRpcMessage ) +{ + struct __frame_hello_HelloProc __f, * const __frame = &__f; + + NdrServerInitializeNew( + _pRpcMessage, + &__frame->_StubMsg, + &hello_StubDesc); + + RpcExceptionInit( __server_filter, __finally_hello_HelloProc ); + __frame->pszString = 0; + + __frame->h1 = _pRpcMessage->Handle; + + RpcTryFinally + { + RpcTryExcept + { + if ((_pRpcMessage->DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) + NdrConvert(&__frame->_StubMsg, (PFORMAT_STRING)&__MIDL_ProcFormatString.Format[0]); + + + NdrConformantStringUnmarshall( + &__frame->_StubMsg, + (unsigned char **)&__frame->pszString, + (PFORMAT_STRING)&__MIDL_TypeFormatString.Format[4], + 0); + + if (__frame->_StubMsg.Buffer > __frame->_StubMsg.BufferEnd) + { + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + } + RpcExcept(RPC_BAD_STUB_DATA_EXCEPTION_FILTER) + { + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + RpcEndExcept + + HelloProc( + __frame->h1, + __frame->pszString); + } + RpcFinally + { + __finally_hello_HelloProc( __frame ); + } + RpcEndFinally + + _pRpcMessage->BufferLength = __frame->_StubMsg.Buffer - (unsigned char *)_pRpcMessage->Buffer; +} + +struct __frame_hello_Shutdown +{ + __DECL_EXCEPTION_FRAME + MIDL_STUB_MESSAGE _StubMsg; + handle_t h1; +}; + +static void __finally_hello_Shutdown( struct __frame_hello_Shutdown *__frame ) +{ + +} + +void __RPC_STUB hello_Shutdown( PRPC_MESSAGE _pRpcMessage ) +{ + struct __frame_hello_Shutdown __f, * const __frame = &__f; + + NdrServerInitializeNew( + _pRpcMessage, + &__frame->_StubMsg, + &hello_StubDesc); + + RpcExceptionInit( __server_filter, __finally_hello_Shutdown ); + + __frame->h1 = _pRpcMessage->Handle; + + RpcTryFinally + { + RpcTryExcept + { + if ((_pRpcMessage->DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) + NdrConvert(&__frame->_StubMsg, (PFORMAT_STRING)&__MIDL_ProcFormatString.Format[8]); + + + if (__frame->_StubMsg.Buffer > __frame->_StubMsg.BufferEnd) + { + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + } + RpcExcept(RPC_BAD_STUB_DATA_EXCEPTION_FILTER) + { + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + RpcEndExcept + + Shutdown( + __frame->h1); + } + RpcFinally + { + __finally_hello_Shutdown( __frame ); + } + RpcEndFinally + + _pRpcMessage->BufferLength = __frame->_StubMsg.Buffer - (unsigned char *)_pRpcMessage->Buffer; +} + +#if !defined(__RPC_WIN64__) +#error Invalid build platform for this stub. +#endif + +static const unsigned short hello_FormatStringOffsetTable[] = +{ + 0, /* HelloProc */ + 8, /* Shutdown */ +}; + +static const MIDL_STUB_DESC hello_StubDesc = +{ + (void *)& hello___RpcServerInterface, + MIDL_user_allocate, + MIDL_user_free, + { + 0, + }, + 0, + 0, + 0, + 0, + __MIDL_TypeFormatString.Format, + 1, /* -error bounds_check flag */ + 0x10001, /* Ndr library version */ + 0, + 0x50100a4, /* MIDL Version 5.1.164 */ + 0, + 0, + 0, /* notify & notify_flag routine table */ + 1, /* Flags */ + 0, /* Reserved3 */ + 0, /* Reserved4 */ + 0 /* Reserved5 */ +}; + +static RPC_DISPATCH_FUNCTION hello_table[] = +{ + hello_HelloProc, + hello_Shutdown, + 0 +}; +static RPC_DISPATCH_TABLE hello_v1_0_DispatchTable = +{ + 2, + hello_table +}; + +static const SERVER_ROUTINE hello_ServerRoutineTable[] = +{ + (SERVER_ROUTINE)HelloProc, + (SERVER_ROUTINE)Shutdown, +}; + +static const MIDL_SERVER_INFO hello_ServerInfo = +{ + &hello_StubDesc, + hello_ServerRoutineTable, + __MIDL_ProcFormatString.Format, + hello_FormatStringOffsetTable, + 0, + 0, + 0, + 0 +}; + +static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString = +{ + 0, + { +/* 0 (parameter h1) */ + 0x4e, /* FC_IN_PARAM_BASETYPE */ + 0x0f, /* FC_IGNORE */ +/* 2 (parameter pszString) */ + 0x4d, /* FC_IN_PARAM */ + 0x01, + NdrFcShort(0x2), /* type offset = 2 */ +/* 6 (void) */ + 0x5b, /* FC_END */ + 0x5c, /* FC_PAD */ +/* 8 (parameter h1) */ + 0x4e, /* FC_IN_PARAM_BASETYPE */ + 0x0f, /* FC_IGNORE */ +/* 10 (void) */ + 0x5b, /* FC_END */ + 0x5c, /* FC_PAD */ + 0x0 + } +}; + +static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString = +{ + 0, + { + NdrFcShort(0x0), +/* 2 (unsigned char *) */ + 0x11, 0x8, /* FC_RP [simple_pointer] */ +/* 4 */ + 0x22, /* FC_C_CSTRING */ + 0x5c, /* FC_PAD */ + 0x0 + } +}; + + +#endif /* _WIN64 */ Propchange: branches/nyadav-audio-branch/base/services/tests/Hello_s.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/tests/Hello_s.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/base/services/tests/Hellop.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/tests/Hellop.c (added) +++ branches/nyadav-audio-branch/base/services/tests/Hellop.c [iso-8859-1] Mon May 30 11:32:19 2011 @@ -1,0 +1,58 @@ +// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF +// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO +// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A +// PARTICULAR PURPOSE. +// +// Copyright (c) Microsoft Corporation. All rights reserved. + + +/**************************************************************************** + Microsoft RPC + + Hello Example + + FILE: hellop.c + + PURPOSE: Remote procedures that are linked with the server + side of RPC distributed application + + FUNCTIONS: HelloProc() - prints "hello, world" or other string + sent by client to server + + COMMENTS: This version of the distributed application that prints + "hello, world" (or other string) on the server features + a client that manages its connection to the server. + It uses the binding handle hello_IfHandle, defined in + the file hello.h. + +****************************************************************************/ + +#include <stdlib.h> +#include <stdio.h> +#include "hello.h" // header file generated by MIDL compiler + +void HelloProc(IN RPC_BINDING_HANDLE hBinding,unsigned char * pszString) +{ + printf("%s\n", pszString); +} + +void Shutdown(IN RPC_BINDING_HANDLE hBinding) +{ + RPC_STATUS status; + + printf("Calling RpcMgmtStopServerListening\n"); + status = RpcMgmtStopServerListening(NULL); + printf("RpcMgmtStopServerListening returned: 0x%x\n", status); + if (status) { + exit(status); + } + + printf("Calling RpcServerUnregisterIf\n"); + status = RpcServerUnregisterIf(NULL, NULL, FALSE); + printf("RpcServerUnregisterIf returned 0x%x\n", status); + if (status) { + exit(status); + } +} + +/* end file hellop.c */ Propchange: branches/nyadav-audio-branch/base/services/tests/Hellop.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/tests/Hellop.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/base/services/tests/Hellos.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/tests/Hellos.c (added) +++ branches/nyadav-audio-branch/base/services/tests/Hellos.c [iso-8859-1] Mon May 30 11:32:19 2011 @@ -1,0 +1,33 @@ +#include <stdlib.h> +#include <stdio.h> +#include <ctype.h> +#include "hello.h" // header file generated by MIDL compiler +#include "string.h" + +void __cdecl wmain(int argc, char * argv[]) +{ + RPC_STATUS status; + + status = RpcServerUseProtseqEp(L"ncacn_np", 20, L"\\pipe\\audsrv", NULL); + printf("RpcServerUseProtseqEp returned 0x%x\n", status); + + status = RpcServerRegisterIfEx(hello_v1_0_s_ifspec, NULL, NULL, 0, RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL ); + printf("RpcServerRegisterIfEx returned 0x%x\n", status); + + printf("Calling RpcServerListen\n"); + + status = RpcServerListen(1,20,FALSE); + printf("RpcServerListen returned: 0x%x\n", status); + + +} + +void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) +{ + return(malloc(len)); +} + +void __RPC_USER midl_user_free(void __RPC_FAR * ptr) +{ + free(ptr); +} Propchange: branches/nyadav-audio-branch/base/services/tests/Hellos.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/tests/Hellos.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] Mon May 30 11:32:19 2011 @@ -1,19 +1,44 @@ #include "audsrvapi.h" /*All the wrappers for Remote Function should be here*/ -int status = 0; /*There can be any structure which can hold the connection status*/ -/*Every Function should ensure connection*/ - +int status = 0; /*Initialize an audio stream *Return -1 if callbacks are NULL pointers */ WINAPI int initstream (ClientStream * clientstream,LONG frequency,int channels,int bitspersample, ULONG channelmask,int volume,int mute,float balance) { + RPC_STATUS status; + unsigned char * pszStringBinding = NULL; + + if(clientstream == NULL ) return -1; if (clientstream->callbacks.OpenComplete == NULL || clientstream->callbacks.BufferCopied == NULL || clientstream->callbacks.PlayComplete == NULL) return -2; /*Validity of all other data will be checked at server*/ /*Check Connection Status If not connected call Connect()*/ /*If connected Properly call the remote audsrv_initstream() function*/ + status = RpcStringBindingCompose(NULL,L"ncacn_np",NULL,L"\\pipe\\audsrv", NULL,&pszStringBinding); + + status = RpcBindingFromStringBinding(pszStringBinding, &audsrv_v0_0_c_ifspec); + + if (status) printf("Connection Problem p %d \n",status); + + status = RpcStringFree(&pszStringBinding); + + if (status) printf("Problem Freeing String : %d \n",status); + + + RpcTryExcept + { + AUDInitStream (&audsrv_v0_0_c_ifspec); + } + RpcExcept(1) + { + status = RpcExceptionCode(); + printf("Runtime reported exception 0x%lx = %ld\n", status, status); + } + RpcEndExcept + status = RpcBindingFree(&audsrv_v0_0_c_ifspec); + if (status == RPC_S_INVALID_BINDING) printf("Error : %d Invalid RPC S HANDLE\n",status); /*Analyse the return by the function*/ /*Currently Suppose the return is 0 and a valid streamid is returned*/ clientstream->stream = &status; @@ -24,7 +49,7 @@ return 0; } -WINAPI int playaudio ( ClientStream * clientstream) +WINAPI int playaudio ( ClientStream * clientstream ) { /*This is an ActiveScheduler*/ clientstream->callbacks.OpenComplete(0); @@ -47,7 +72,6 @@ WINAPI int stopaudio (ClientStream * clientstream ) { /*Server Side termination is remaining*/ - /*Check Connection Status If not connected call Connect()*/ /*If connected Properly call the remote audsrv_stop() function*/ clientstream->dead = 1; /*Client Side termination*/ } @@ -67,4 +91,19 @@ } WINAPI int GetBalance(ClientStream * clientstream ,float * balance) { +} + + +/******************************************************/ +/* MIDL allocate and free */ +/******************************************************/ + +void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) +{ + return(malloc(len)); +} + +void __RPC_USER midl_user_free(void __RPC_FAR * ptr) +{ + free(ptr); } Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c [iso-8859-1] Mon May 30 11:32:19 2011 @@ -1,18 +1,20 @@ #include "audsrvapi.h" + BOOL APIENTRY DllMain( HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved ) -{ +{ + switch (ul_reason_for_call) { case DLL_PROCESS_ATTACH: case DLL_THREAD_ATTACH: case DLL_THREAD_DETACH: case DLL_PROCESS_DETACH: - break; + break; } return TRUE; } Modified: branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/drivers/wdm… ============================================================================== --- branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/CMakeLists.txt [iso-8859-1] (original) +++ branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/CMakeLists.txt [iso-8859-1] Mon May 30 11:32:19 2011 @@ -8,3 +8,4 @@ set_module_type(audclient win32cui) add_importlibs(audclient audsrvapi advapi32 user32 ksuser setupapi msvcrt kernel32) add_cab_target(audclient 1) +add_dependencies(audclient audsrvapi) Modified: branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/include/rea… ============================================================================== --- branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl [iso-8859-1] (original) +++ branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl [iso-8859-1] Mon May 30 11:32:19 2011 @@ -37,6 +37,6 @@ interface audsrv { - NTSTATUS AUDInitStream([in] AUDSRV_HANDLE *streamthread); + NTSTATUS AUDInitStream([in] handle_t h1); }

1 0

[janderwald] 52004: [USBOHCI] - More traces to fix isochronous problem - Fix broken assert found by mjmartin
by janderwald＠svn.reactos.org 30 May '11

30 May '11

Author: janderwald Date: Mon May 30 06:55:32 2011 New Revision: 52004 URL: http://svn.reactos.org/svn/reactos?rev=52004&view=rev Log: [USBOHCI] - More traces to fix isochronous problem - Fix broken assert found by mjmartin Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.cpp branches/usb-bringup/drivers/usb/usbohci/hardware.h branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Mon May 30 06:55:32 2011 @@ -545,12 +545,15 @@ // ASSERT((Control & OHCI_HC_FUNCTIONAL_STATE_MASK) == OHCI_HC_FUNCTIONAL_STATE_OPERATIONAL); ASSERT((Control & OHCI_ENABLE_LIST) == OHCI_ENABLE_LIST); + DPRINT1("Control %x\n", Control); // // get frame interval // - FrameInterval = (READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_OFFSET)) & OHCI_FRAME_INTERVAL_TOGGLE) ^ OHCI_FRAME_INTERVAL_TOGGLE; + FrameInterval = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_OFFSET)); + DPRINT1("FrameInterval %x IntervalValue %x\n", FrameInterval, m_IntervalValue); FrameInterval |= OHCI_FSMPS(m_IntervalValue) | m_IntervalValue; + DPRINT1("FrameInterval %x\n", FrameInterval); // // write frame interval @@ -562,7 +565,7 @@ // Periodic = OHCI_PERIODIC(m_IntervalValue); WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_PERIODIC_START_OFFSET), Periodic); - + DPRINT1("Periodic Start %x\n", Periodic); // // read descriptor @@ -918,6 +921,8 @@ // store interval value for later // m_IntervalValue = OHCI_GET_INTERVAL_VALUE(FrameInterval); + + DPRINT1("FrameInterval %x Interval %x\n", FrameInterval, m_IntervalValue); // // now reset controller @@ -1206,10 +1211,30 @@ CUSBHardwareDevice::GetCurrentFrameNumber( PULONG FrameNumber) { + ULONG Control; + ULONG Number; + + + Number = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_NUMBER_OFFSET)); + DPRINT1("FrameNumberInterval %x Frame %x\n", Number, m_HCCA->CurrentFrameNumber); + + // + // remove reserved bits + // + Number &= 0xFFFF; + // // store frame number // - *FrameNumber = m_HCCA->CurrentFrameNumber; + *FrameNumber = Number; + + // + // is the controller started + // + Control = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET)); + ASSERT((Control & OHCI_ENABLE_LIST) == OHCI_ENABLE_LIST); + + } VOID @@ -1339,7 +1364,7 @@ // // defer processing // - DPRINT("Status %x Acknowledge %x\n", Status, Acknowledge); + DPRINT1("Status %x Acknowledge %x FrameNumber %x\n", Status, Acknowledge, This->m_HCCA->CurrentFrameNumber); KeInsertQueueDpc(&This->m_IntDpcObject, (PVOID)Status, (PVOID)(DoneHead & ~1)); // Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/hardware.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/hardware.h [iso-8859-1] Mon May 30 06:55:32 2011 @@ -99,6 +99,11 @@ #define OHCI_FRAME_INTERVAL_TOGGLE 0x80000000 // +// frame interval +// +#define OHCI_FRAME_INTERVAL_NUMBER_OFFSET 0x3C + +// // periodic start register // #define OHCI_PERIODIC_START_OFFSET 0x40 Modified: branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] Mon May 30 06:55:32 2011 @@ -278,6 +278,16 @@ // CurrentDescriptor = CurrentDescriptor->NextLogicalDescriptor; } + + // + // get current frame number + // + m_Hardware->GetCurrentFrameNumber(&FrameNumber); + + DPRINT1("Hardware 1ms %p Iso %p\n",m_InterruptEndpoints[0], m_IsoHeadEndpointDescriptor); + ASSERT(m_InterruptEndpoints[0]->NextPhysicalEndpoint == m_IsoHeadEndpointDescriptor->PhysicalAddress.LowPart); + + PrintEndpointList(m_IsoHeadEndpointDescriptor); } // @@ -699,7 +709,7 @@ // // sanity check // - ASSERT(InterruptInterval < OHCI_BIGGEST_INTERVAL); + ASSERT(InterruptInterval <= OHCI_BIGGEST_INTERVAL); // // find interrupt index Modified: branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] Mon May 30 06:55:32 2011 @@ -628,7 +628,7 @@ // // initialize descriptor, hardware part // - Descriptor->Flags = OHCI_ITD_SET_FRAME_COUNT(FrameCount) | OHCI_ITD_SET_DELAY_INTERRUPT(OHCI_TD_INTERRUPT_NONE) | OHCI_TD_SET_CONDITION_CODE(OHCI_TD_CONDITION_NOT_ACCESSED); + Descriptor->Flags = OHCI_ITD_SET_FRAME_COUNT(FrameCount) | OHCI_ITD_SET_DELAY_INTERRUPT(OHCI_TD_INTERRUPT_NONE);// | OHCI_TD_SET_CONDITION_CODE(OHCI_TD_CONDITION_NOT_ACCESSED); Descriptor->BufferPhysical = 0; Descriptor->NextPhysicalDescriptor = 0; Descriptor->LastPhysicalByteAddress = 0; @@ -661,6 +661,7 @@ PVOID Buffer; PIO_STACK_LOCATION IoStack; PURB Urb; + PHYSICAL_ADDRESS Address; // // get current irp stack location @@ -704,6 +705,10 @@ // ASSERT(ADDRESS_AND_SIZE_TO_SPAN_PAGES(MmGetMdlVirtualAddress(m_TransferBufferMDL), MmGetMdlByteCount(m_TransferBufferMDL)) <= 2); + Status = m_DmaManager->Allocate(m_TransferBufferLength, &Buffer, &Address); + ASSERT(Status == STATUS_SUCCESS); + + while(Index < Urb->UrbIsochronousTransfer.NumberOfPackets) { // @@ -732,7 +737,7 @@ // // get page offset // - PageOffset = MmGetMdlByteOffset(m_TransferBufferMDL); + PageOffset = BYTE_OFFSET(Page); // // initialize descriptor @@ -935,6 +940,8 @@ Descriptor->Flags |= OHCI_ENDPOINT_SET_DEVICE_ADDRESS(GetDeviceAddress()); Descriptor->Flags |= OHCI_ENDPOINT_SET_ENDPOINT_NUMBER(GetEndpointAddress()); Descriptor->Flags |= OHCI_ENDPOINT_SET_MAX_PACKET_SIZE(GetMaxPacketSize()); + + DPRINT1("Flags %x DeviceAddress %x EndpointAddress %x PacketSize %x\n", Descriptor->Flags, GetDeviceAddress(), GetEndpointAddress(), GetMaxPacketSize()); // // is there an endpoint descriptor

1 0

[cgutman] 52003: [NTOSKRNL] - Implement sending GUID_TARGET_DEVICE_QUERY_REMOVE and GUID_TARGET_DEVICE_REMOVE_COMPLETE notifications - Fix sending EventCategoryTargetDeviceChange notifications - Re...
by cgutman＠svn.reactos.org 30 May '11

30 May '11

Author: cgutman Date: Mon May 30 04:15:27 2011 New Revision: 52003 URL: http://svn.reactos.org/svn/reactos?rev=52003&view=rev Log: [NTOSKRNL] - Implement sending GUID_TARGET_DEVICE_QUERY_REMOVE and GUID_TARGET_DEVICE_REMOVE_COMPLETE notifications - Fix sending EventCategoryTargetDeviceChange notifications - Remove some incorrect checks (IRP_MN_START_DEVICE CAN be called for a device that is already "started") - Check the final status of the IRP_MN_START_DEVICE request sent after resource rebalancing and send IRP_MN_REMOVE_DEVICE if it fails Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Mon May 30 04:15:27 2011 @@ -160,12 +160,21 @@ { IO_STACK_LOCATION Stack; PVOID Dummy; + NTSTATUS Status; RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); Stack.MajorFunction = IRP_MJ_PNP; Stack.MinorFunction = IRP_MN_QUERY_REMOVE_DEVICE; - - return IopSynchronousCall(DeviceObject, &Stack, &Dummy); + + Status = IopSynchronousCall(DeviceObject, &Stack, &Dummy); + + IopNotifyPlugPlayNotification(DeviceObject, + EventCategoryTargetDeviceChange, + &GUID_TARGET_DEVICE_QUERY_REMOVE, + NULL, + NULL); + + return Status; } NTSTATUS @@ -195,6 +204,12 @@ /* Drivers should never fail a IRP_MN_REMOVE_DEVICE request */ IopSynchronousCall(DeviceObject, &Stack, &Dummy); + + IopNotifyPlugPlayNotification(DeviceObject, + EventCategoryTargetDeviceChange, + &GUID_TARGET_DEVICE_REMOVE_COMPLETE, + NULL, + NULL); } VOID @@ -239,9 +254,6 @@ DeviceNode->ResourceListTranslated; } - /* I don't think we set this flag yet */ - ASSERT(!(DeviceNode->Flags & DNF_STOPPED)); - /* Do the call */ Status = IopSynchronousCall(DeviceObject, &Stack, &Dummy); if (!NT_SUCCESS(Status)) @@ -258,6 +270,7 @@ /* Otherwise, mark us as started */ DeviceNode->Flags |= DNF_STARTED; + DeviceNode->Flags &= ~DNF_STOPPED; /* We now need enumeration */ DeviceNode->Flags |= DNF_NEED_ENUMERATION_ONLY; @@ -276,9 +289,6 @@ ASSERT((DeviceNode->Flags & (DNF_RESOURCE_ASSIGNED | DNF_RESOURCE_REPORTED | DNF_NO_RESOURCE_REQUIRED))); - ASSERT((!(DeviceNode->Flags & (DNF_HAS_PROBLEM | - DNF_STARTED | - DNF_START_REQUEST_PENDING)))); /* Get the device object */ DeviceObject = DeviceNode->PhysicalDeviceObject; @@ -327,12 +337,6 @@ HANDLE InstanceHandle = INVALID_HANDLE_VALUE, ControlHandle = INVALID_HANDLE_VALUE; UNICODE_STRING KeyName; OBJECT_ATTRIBUTES ObjectAttributes; - - if (((DeviceNode->Flags & DNF_STARTED) && !(DeviceNode->Flags & DNF_HAS_PROBLEM)) || - (DeviceNode->Flags & DNF_START_REQUEST_PENDING)) - { - return STATUS_SUCCESS; - } Status = IopAssignDeviceResources(DeviceNode); if (!NT_SUCCESS(Status)) @@ -3623,6 +3627,9 @@ if (NT_SUCCESS(IopQueryStopDevice(PhysicalDeviceObject))) { IopSendStopDevice(PhysicalDeviceObject); + + DeviceNode->Flags &= ~(DNF_STARTED | DNF_START_REQUEST_PENDING); + DeviceNode->Flags |= DNF_STOPPED; } } @@ -3665,7 +3672,15 @@ } /* IRP_MN_FILTER_RESOURCE_REQUIREMENTS is called indirectly by IopStartDevice */ - IopStartDevice(DeviceNode); + if (IopStartDevice(DeviceNode) != STATUS_SUCCESS) + { + DPRINT1("Restart after resource rebalance failed\n"); + + DeviceNode->Flags &= ~(DNF_STARTED | DNF_START_REQUEST_PENDING); + DeviceNode->Flags |= DNF_START_FAILED; + + IopSendRemoveDevice(PhysicalDeviceObject); + } } } Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpnoti… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c [iso-8859-1] Mon May 30 04:15:27 2011 @@ -119,7 +119,6 @@ NotificationInfos->Version = 1; NotificationInfos->Size = sizeof(TARGET_DEVICE_REMOVAL_NOTIFICATION); RtlCopyMemory(&NotificationInfos->Event, Event, sizeof(GUID)); - NotificationInfos->FileObject = (PFILE_OBJECT)EventCategoryData1; } else { @@ -177,22 +176,21 @@ } case EventCategoryTargetDeviceChange: { - if (Event != &GUID_PNP_CUSTOM_NOTIFICATION) - { - if (ChangeEntry->FileObject == (PFILE_OBJECT)EventCategoryData1) - CallCurrentEntry = TRUE; - } - else - { - Status = IoGetRelatedTargetDevice(ChangeEntry->FileObject, &EntryDeviceObject); - if (NT_SUCCESS(Status)) - { - if (DeviceObject == EntryDeviceObject) - { - ((PTARGET_DEVICE_CUSTOM_NOTIFICATION)NotificationStructure)->FileObject = ChangeEntry->FileObject; - CallCurrentEntry = TRUE; - } - } + Status = IoGetRelatedTargetDevice(ChangeEntry->FileObject, &EntryDeviceObject); + if (NT_SUCCESS(Status)) + { + if (DeviceObject == EntryDeviceObject) + { + if (Event == &GUID_PNP_CUSTOM_NOTIFICATION) + { + ((PTARGET_DEVICE_CUSTOM_NOTIFICATION)NotificationStructure)->FileObject = ChangeEntry->FileObject; + } + else + { + ((PTARGET_DEVICE_REMOVAL_NOTIFICATION)NotificationStructure)->FileObject = ChangeEntry->FileObject; + } + CallCurrentEntry = TRUE; + } } } default:

1 0

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 May 2011