Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 38420: - Fix a patching problem, which put MmInitSectionImplementation2() call to a wrong place. - Handle situation when *ViewSize is 0, which equals old behaviour of ViewSize being NULL. - Fix debug macro. - These changes get CC rewrite branch back into working stage.
by fireball＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: fireball Date: Sun Dec 28 07:01:13 2008 New Revision: 38420 URL: http://svn.reactos.org/svn/reactos?rev=38420&view=rev Log: - Fix a patching problem, which put MmInitSectionImplementation2() call to a wrong place. - Handle situation when *ViewSize is 0, which equals old behaviour of ViewSize being NULL. - Fix debug macro. - These changes get CC rewrite branch back into working stage. Modified: branches/cache_manager_rewrite/mm.patch Modified: branches/cache_manager_rewrite/mm.patch URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm.patch?… ============================================================================== --- branches/cache_manager_rewrite/mm.patch [iso-8859-1] (original) +++ branches/cache_manager_rewrite/mm.patch [iso-8859-1] Sun Dec 28 07:01:13 2008 @@ -53,13 +53,15 @@ /* PRIVATE FUNCTIONS *********************************************************/ VOID -@@ -509,6 +512,7 @@ +@@ -506,6 +509,9 @@ + /* Initialize the balance set manager */ + MmInitBsmThread(); + ++ /* Initialize section implementation, phase 2 */ ++ MmInitSectionImplementation2(); ++ /* FIXME: Read parameters from memory */ } - -+ MmInitSectionImplementation2(); - return TRUE; - } Index: mpw.c =================================================================== @@ -2746,7 +2748,7 @@ - DPRINT("MmpCloseSection(OB %x, HC %d)\n", - Object, ProcessHandleCount); + DPRINT("MmpCloseSection(OB %x, HC %d) RC %d\n", -+ Object, ProcessHandleCount, ObGetObjectPointerCount(Object)); ++ Object, ProcessHandleCount, OBJECT_TO_OBJECT_HEADER(Object)->PointerCount); } NTSTATUS @@ -2960,7 +2962,7 @@ + * FIXME: Revise this once a locking order for file size changes is + * decided + */ -+ if (UMaximumSize != NULL) ++ if (UMaximumSize && (UMaximumSize->QuadPart != 0)) { - /* FIXME: handle this situation */ - ObDereferenceObject(Section); @@ -3672,7 +3674,17 @@ } /* -@@ -4944,9 +6110,12 @@ +@@ -4797,7 +5963,8 @@ + } + else if ((*ViewSize) > Section->MaximumSize.u.LowPart) + { +- (*ViewSize) = Section->MaximumSize.u.LowPart; ++ DPRINT1("Out of bounds view size passed: 0x%x!\n", *ViewSize); ++ (*ViewSize) = Section->MaximumSize.u.LowPart; + } + + MmLockSectionSegment(Section->Segment); +@@ -4944,9 +6111,12 @@ IN ULONG SectionPageProtection, IN ULONG AllocationAttributes, IN HANDLE FileHandle OPTIONAL, @@ -3686,7 +3698,7 @@ PROS_SECTION_OBJECT *SectionObject = (PROS_SECTION_OBJECT *)Section; /* -@@ -4965,37 +6134,557 @@ +@@ -4965,37 +6135,558 @@ return STATUS_INVALID_PAGE_PROTECTION; } @@ -3962,6 +3974,7 @@ + + MmInitializeMdl(Mdl, NULL, ((PPAGE_IO_CONTEXT)Context)->PageCount * PAGE_SIZE); + MmBuildMdlFromPages(Mdl, Pfn); ++ Mdl->MdlFlags |= (MDL_PAGES_LOCKED | MDL_WRITE_OPERATION); + + FileOffset.u.HighPart = 0; + FileOffset.u.LowPart = ((PPAGE_IO_CONTEXT)Context)->Offset;

1 0

[dgorbachev] 38419: Fix bug #3984.
by dgorbachev＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: dgorbachev Date: Sun Dec 28 06:53:08 2008 New Revision: 38419 URL: http://svn.reactos.org/svn/reactos?rev=38419&view=rev Log: Fix bug #3984. Modified: trunk/reactos/base/applications/notepad/lang/hy-AM.rc Modified: trunk/reactos/base/applications/notepad/lang/hy-AM.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/hy-AM.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/hy-AM.rc [iso-8859-1] Sun Dec 28 06:53:08 2008 @@ -1,4 +1,4 @@ -ï»¿/* +/* * Notepad (Armenian resources) */ @@ -28,51 +28,51 @@ BEGIN POPUP "&ÕÕ¡ÕµÕ¬" BEGIN - MENUITEM "&ÕÕ¿Õ¥Õ²Õ®Õ¥Õ¬\tCtrl+N", CMD_NEW - MENUITEM "&Ô²Õ¡ÖÕ¥Õ¬...\tCtrl+O", CMD_OPEN - MENUITEM "&ÕÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬\tCtrl+S", CMD_SAVE - MENUITEM "ÕÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬ &Õ«Õ¶Õ¹ÕºÕ¥Õ½...", CMD_SAVE_AS + MENUITEM "&ÕÕ¿Õ¥Õ²Õ®Õ¥Õ¬\tCtrl+N", CMD_NEW + MENUITEM "&Ô²Õ¡ÖÕ¥Õ¬...\tCtrl+O", CMD_OPEN + MENUITEM "&ÕÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬\tCtrl+S", CMD_SAVE + MENUITEM "ÕÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬ &Õ«Õ¶Õ¹ÕºÕ¥Õ½...", CMD_SAVE_AS MENUITEM SEPARATOR - MENUITEM "Ô·Õ»Õ«& ÕºÕ¡ÖÕ¡Õ´Õ¥Õ¿ÖÕ¥ÖÕ¨...", CMD_PAGE_SETUP - MENUITEM "&ÕÕºÕ¥Õ¬\tCtrl+P", CMD_PRINT - MENUITEM "&ÕÕºÕ«Õ¹Õ« Õ¯Õ¡ÖÕ£Õ¡Õ¾Õ¸ÖÕ¸ÖÕ´...", CMD_PRINTER_SETUP + MENUITEM "Ô·Õ»Õ«& ÕºÕ¡ÖÕ¡Õ´Õ¥Õ¿ÖÕ¥ÖÕ¨...", CMD_PAGE_SETUP + MENUITEM "&ÕÕºÕ¥Õ¬\tCtrl+P", CMD_PRINT + MENUITEM "&ÕÕºÕ«Õ¹Õ« Õ¯Õ¡ÖÕ£Õ¡Õ¾Õ¸ÖÕ¸ÖÕ´...", CMD_PRINTER_SETUP MENUITEM SEPARATOR - MENUITEM "Ôµ&Õ¬Ö", CMD_EXIT + MENUITEM "Ôµ&Õ¬Ö", CMD_EXIT END POPUP "&Ô½Õ´Õ¢Õ¡Õ£ÖÕ¥Õ¬" BEGIN - MENUITEM "&ÕÕ¥ÖÕªÕ¥Õ¬\tCtrl+Z", CMD_UNDO + MENUITEM "&ÕÕ¥ÖÕªÕ¥Õ¬\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR - MENUITEM "&Ô¿Õ¿ÖÕ¥Õ¬\tCtrl+X", CMD_CUT - MENUITEM "&ÕÕ¡Õ¿Õ¹Õ³Õ¥Õ¶Õ¡Õ°Õ¡Õ¶Õ¥Õ¬\tCtrl+C", CMD_COPY - MENUITEM "ÕÕ¥Õ²Õ¡&Õ¤ÖÕ¥Õ¬\tCtrl+V", CMD_PASTE - MENUITEM "&ÕÕ¶Õ»Õ¥Õ¬\tDel", CMD_DELETE + MENUITEM "&Ô¿Õ¿ÖÕ¥Õ¬\tCtrl+X", CMD_CUT + MENUITEM "&ÕÕ¡Õ¿Õ¹Õ³Õ¥Õ¶Õ¡Õ°Õ¡Õ¶Õ¥Õ¬\tCtrl+C", CMD_COPY + MENUITEM "ÕÕ¥Õ²Õ¡&Õ¤ÖÕ¥Õ¬\tCtrl+V", CMD_PASTE + MENUITEM "&ÕÕ¶Õ»Õ¥Õ¬\tDel", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "&Ô³Õ¿Õ¶Õ¥Õ¬", CMD_SEARCH - MENUITEM "Ô³Õ¿Õ¶Õ¥Õ¬ &Õ°Õ¡Õ»Õ¸ÖÕ¤Õ¨\tF3", CMD_SEARCH_NEXT - MENUITEM "ÕÕ¸ÕÕ¡ÖÕ«Õ¶Õ¥Õ¬\tCtrl+H", CMD_REPLACE - MENUITEM "ÕÕ¥Õ²Õ¡ÖÕ¸ÕÕ¾Õ¥Õ¬...\tCtrl+G", CMD_GOTO + MENUITEM "&Ô³Õ¿Õ¶Õ¥Õ¬", CMD_SEARCH + MENUITEM "Ô³Õ¿Õ¶Õ¥Õ¬ &Õ°Õ¡Õ»Õ¸ÖÕ¤Õ¨\tF3", CMD_SEARCH_NEXT + MENUITEM "ÕÕ¸ÕÕ¡ÖÕ«Õ¶Õ¥Õ¬\tCtrl+H", CMD_REPLACE + MENUITEM "ÕÕ¥Õ²Õ¡ÖÕ¸ÕÕ¾Õ¥Õ¬...\tCtrl+G", CMD_GOTO MENUITEM SEPARATOR - MENUITEM "ÕÕ·Õ¥Õ¬ Õ¢Õ¥Õ¬Õ¥ÖÕ¨", CMD_SELECT_ALL - MENUITEM "ÔºÕ¡Õ´Õ¨& Ö Õ¡Õ´Õ½Õ¡Õ©Õ«Õ¾Õ¨\tF5", CMD_TIME_DATE + MENUITEM "ÕÕ·Õ¥Õ¬ Õ¢Õ¥Õ¬Õ¥ÖÕ¨", CMD_SELECT_ALL + MENUITEM "ÔºÕ¡Õ´Õ¨& Ö Õ¡Õ´Õ½Õ¡Õ©Õ«Õ¾Õ¨\tF5", CMD_TIME_DATE END POPUP "ÕÕ¸Ö&Õ´Õ¡Õ¿Õ¡Õ¾Õ¸ÖÕ¸ÖÕ´" BEGIN - MENUITEM "&ÕÕ¸Õ²Õ¡Õ¤Õ¡ÖÕ± Õ¢Õ¡Õ¼Õ¥ÖÕ¸Õ¾", CMD_WRAP - MENUITEM "&ÕÕ¡Õ¼Õ¡Õ¿Õ¥Õ½Õ¡Õ¯...", CMD_FONT + MENUITEM "&ÕÕ¸Õ²Õ¡Õ¤Õ¡ÖÕ± Õ¢Õ¡Õ¼Õ¥ÖÕ¸Õ¾", CMD_WRAP + MENUITEM "&ÕÕ¡Õ¼Õ¡Õ¿Õ¥Õ½Õ¡Õ¯...", CMD_FONT END POPUP "&ÕÕ¥Õ½Ö" BEGIN - MENUITEM "ÕÕ«Õ³Õ¡Õ¯Õ« &Õ¿Õ¥Õ²Õ¥Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶", CMD_STATUSBAR + MENUITEM "ÕÕ«Õ³Õ¡Õ¯Õ« &Õ¿Õ¥Õ²Õ¥Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶", CMD_STATUSBAR END POPUP "ÕÕ¥Õ²Õ¥&Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶" BEGIN - MENUITEM "&Ô²Õ¸Õ¾Õ¡Õ¶Õ¤Õ¡Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶", CMD_HELP_CONTENTS - MENUITEM "&ÕÕ¶Õ¿ÖÕ¥Õ¬...", CMD_HELP_SEARCH - MENUITEM "&ÕÕ£Õ¶Õ¸ÖÕ©ÕµÕ¸Õ¶ ÖÕ£Õ¿Õ¡Õ£Õ¸ÖÕ®Õ¸ÖÕ´", CMD_HELP_ON_HELP + MENUITEM "&Ô²Õ¸Õ¾Õ¡Õ¶Õ¤Õ¡Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶", CMD_HELP_CONTENTS + MENUITEM "&ÕÕ¶Õ¿ÖÕ¥Õ¬...", CMD_HELP_SEARCH + MENUITEM "&ÕÕ£Õ¶Õ¸ÖÕ©ÕµÕ¸Õ¶ ÖÕ£Õ¿Õ¡Õ£Õ¸ÖÕ®Õ¸ÖÕ´", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&Ô¾ÖÕ¡Õ£ÖÕ« Õ´Õ¡Õ½Õ«Õ¶" CMD_ABOUT - MENUITEM "&ÕÕ¥Õ²Õ¥Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶...", CMD_ABOUT_WINE + MENUITEM "&Ô¾ÖÕ¡Õ£ÖÕ« Õ´Õ¡Õ½Õ«Õ¶" CMD_ABOUT + MENUITEM "&ÕÕ¥Õ²Õ¥Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶...", CMD_ABOUT_WINE END END @@ -98,9 +98,9 @@ LTEXT "&ÕÕ¥ÖÖÖÕ«:", 0x14E, 100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "ÕÕ¶Õ¤Õ¸ÖÕ¶Õ¥Õ¬", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&ÕÕ¥Õ²Õ¥Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶", IDHELP, 180, 39, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "ÕÕ¶Õ¤Õ¸ÖÕ¶Õ¥Õ¬", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&ÕÕ¥Õ²Õ¥Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶", IDHELP, 180, 39, 40, 15, WS_TABSTOP END /* Dialog `Encoding' */

1 0

[dgorbachev] 38418: Fix bug #3975.
by dgorbachev＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: dgorbachev Date: Sun Dec 28 06:32:20 2008 New Revision: 38418 URL: http://svn.reactos.org/svn/reactos?rev=38418&view=rev Log: Fix bug #3975. Modified: trunk/reactos/dll/ntdll/ldr/startup.c Modified: trunk/reactos/dll/ntdll/ldr/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/startup.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Sun Dec 28 06:32:20 2008 @@ -27,6 +27,8 @@ static RTL_CRITICAL_SECTION LoaderLock; static RTL_BITMAP TlsBitMap; static RTL_BITMAP TlsExpansionBitMap; +static volatile BOOLEAN LdrpInitialized = FALSE; +static LONG LdrpInitLock = 0; #define VALUE_BUFFER_SIZE 256 @@ -250,11 +252,11 @@ return FALSE; } +static VOID -NTAPI -LdrpInit(PCONTEXT Context, - PVOID SystemArgument1, - PVOID SystemArgument2) +LdrpInit2(PCONTEXT Context, + PVOID SystemArgument1, + PVOID SystemArgument2) { PIMAGE_NT_HEADERS NTHeaders; PEPFUNC EntryPoint; @@ -273,8 +275,6 @@ ImageBase = Peb->ImageBaseAddress; DPRINT("ImageBase %p\n", ImageBase); - if (NtCurrentPeb()->Ldr == NULL) - { if (ImageBase <= (PVOID) 0x1000) { DPRINT("ImageBase is null\n"); @@ -432,10 +432,7 @@ LdrpLoadUserModuleSymbols(NtModule); #endif /* DBG || KDBG */ - } - - if (NtCurrentPeb()->Ldr->Initialized == FALSE) - { + /* add entry for executable (becomes first list entry) */ ExeModule = (PLDR_DATA_TABLE_ENTRY) RtlAllocateHeap(Peb->ProcessHeap, @@ -500,7 +497,32 @@ /* Break into debugger */ if (Peb->BeingDebugged) DbgBreakPoint(); - } +} + +VOID +NTAPI +LdrpInit(PCONTEXT Context, + PVOID SystemArgument1, + PVOID SystemArgument2) +{ + if (!LdrpInitialized) + { + if (!_InterlockedExchange(&LdrpInitLock, 1)) + { + LdrpInit2(Context, SystemArgument1, SystemArgument2); + LdrpInitialized = TRUE; + } + else + { + LARGE_INTEGER Interval = {{-200000, -1}}; + + do + { + NtDelayExecution(FALSE, &Interval); + } + while (!LdrpInitialized); + } + } /* attach the thread */ RtlEnterCriticalSection(NtCurrentPeb()->LoaderLock);

1 0

[cwittich] 38417: sync browseui winetest to wine 1.1.11
by cwittich＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: cwittich Date: Sun Dec 28 05:31:26 2008 New Revision: 38417 URL: http://svn.reactos.org/svn/reactos?rev=38417&view=rev Log: sync browseui winetest to wine 1.1.11 Modified: trunk/rostests/winetests/browseui/autocomplete.c Modified: trunk/rostests/winetests/browseui/autocomplete.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/browseui/autoco… ============================================================================== --- trunk/rostests/winetests/browseui/autocomplete.c [iso-8859-1] (original) +++ trunk/rostests/winetests/browseui/autocomplete.c [iso-8859-1] Sun Dec 28 05:31:26 2008 @@ -20,9 +20,11 @@ #include <assert.h> #include <stdarg.h> +#include <initguid.h> #include <windows.h> #include <shlobj.h> #include <shlwapi.h> +#include <shlguid.h> #include "wine/test.h"

1 0

[cwittich] 38416: sync usp10 winetest to wine 1.1.11
by cwittich＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: cwittich Date: Sun Dec 28 05:28:48 2008 New Revision: 38416 URL: http://svn.reactos.org/svn/reactos?rev=38416&view=rev Log: sync usp10 winetest to wine 1.1.11 Modified: trunk/rostests/winetests/usp10/usp10.c Modified: trunk/rostests/winetests/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/usp10/usp10.c?r… ============================================================================== --- trunk/rostests/winetests/usp10/usp10.c [iso-8859-1] (original) +++ trunk/rostests/winetests/usp10/usp10.c [iso-8859-1] Sun Dec 28 05:28:48 2008 @@ -61,12 +61,21 @@ hr = ScriptShape(hdc, &sc, test1, 4, 4, &items[0].a, glyphs, NULL, attrs, NULL); ok(hr == E_INVALIDARG, "ScriptShape should return E_INVALIDARG not %08x\n", hr); + hr = ScriptShape(NULL, &sc, test1, 4, 4, &items[0].a, glyphs, NULL, attrs, &nb); + ok(hr == E_PENDING, "ScriptShape should return E_PENDING not %08x\n", hr); + hr = ScriptShape(hdc, &sc, test1, 4, 4, &items[0].a, glyphs, NULL, attrs, &nb); ok(!hr, "ScriptShape should return S_OK not %08x\n", hr); ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); + hr = ScriptShape(NULL, &sc, test1, 4, 4, &items[0].a, glyphs, NULL, attrs, &nb); + ok(!hr, "ScriptShape should return S_OK not %08x\n", hr); + hr = ScriptPlace(hdc, &sc, glyphs, 4, NULL, &items[0].a, widths, NULL, NULL); ok(hr == E_INVALIDARG, "ScriptPlace should return E_INVALIDARG not %08x\n", hr); + + hr = ScriptPlace(NULL, &sc, glyphs, 4, attrs, &items[0].a, widths, NULL, NULL); + ok(hr == E_PENDING, "ScriptPlace should return E_PENDING not %08x\n", hr); hr = ScriptPlace(hdc, &sc, glyphs, 4, attrs, &items[0].a, widths, NULL, NULL); ok(!hr, "ScriptPlace should return S_OK not %08x\n", hr); @@ -615,22 +624,26 @@ * This routine tests the ScriptXtoCP and ScriptCPtoX functions using static variables * ****************************************************************************************/ { + static const WCHAR test[] = {'t', 'e', 's', 't',0}; + SCRIPT_ITEM items[2]; int iX, iCP; int cChars; int cGlyphs; WORD pwLogClust[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; SCRIPT_VISATTR psva[10]; int piAdvance[10] = {200, 190, 210, 180, 170, 204, 189, 195, 212, 203}; - SCRIPT_ANALYSIS psa; int piCP, piX; int piTrailing; BOOL fTrailing; HRESULT hr; + hr = ScriptItemize(test, lstrlenW(test), sizeof(items)/sizeof(items[0]), NULL, NULL, items, NULL); + ok(!hr, "ScriptItemize should return S_OK not %08x\n", hr); + iX = -1; cChars = 10; cGlyphs = 10; - hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); if (piTrailing) ok(piCP == -1, "Negative iX should return piCP=-1 not %d\n", piCP); @@ -640,7 +653,7 @@ iX = 1954; cChars = 10; cGlyphs = 10; - hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); if (piTrailing) /* win2k3 */ ok(piCP == -1, "Negative iX should return piCP=-1 not %d\n", piCP); @@ -650,7 +663,7 @@ iX = 779; cChars = 10; cGlyphs = 10; - hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); ok(piCP == 3 || piCP == -1, /* win2k3 */ @@ -660,7 +673,7 @@ iX = 780; cChars = 10; cGlyphs = 10; - hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); ok(piCP == 3 || piCP == -1, /* win2k3 */ @@ -670,7 +683,7 @@ iX = 868; cChars = 10; cGlyphs = 10; - hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); ok(piCP == 4 || piCP == -1, /* win2k3 */ @@ -679,7 +692,7 @@ iX = 0; cChars = 10; cGlyphs = 10; - hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); ok(piCP == 0 || piCP == 10, /* win2k3 */ @@ -688,14 +701,14 @@ iX = 195; cChars = 10; cGlyphs = 10; - hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); ok(piCP == 0, "iX=%d should return piCP=0 not %d\n", iX, piCP); iX = 196; cChars = 10; cGlyphs = 10; - hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); ok(piCP == 1 || piCP == 0, /* win2k3 */ @@ -705,7 +718,7 @@ fTrailing = FALSE; cChars = 10; cGlyphs = 10; - hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piX); ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); ok(piX == 976 || piX == 100, /* win2k3 */ @@ -715,7 +728,7 @@ fTrailing = TRUE; cChars = 10; cGlyphs = 10; - hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piX); ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); ok(piX == 1171 || piX == 80, /* win2k3 */ @@ -725,7 +738,7 @@ fTrailing = FALSE; cChars = 10; cGlyphs = 10; - hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piX); ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); ok(piX == 1171 || piX == 80, /* win2k3 */ @@ -735,7 +748,7 @@ fTrailing = FALSE; cChars = 10; cGlyphs = 10; - hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piX); ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); ok(piX == 1953 || piX == 0, /* win2k3 */ @@ -745,7 +758,7 @@ fTrailing = TRUE; cChars = 10; cGlyphs = 10; - hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piX); ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); ok(piX == 1953 || piX == 0, /* win2k3 */ @@ -1339,7 +1352,7 @@ if (!pEnumLanguageGroupLocalesA) { - trace("EnumLanguageGroupLocalesA not available on this platform\n"); + win_skip("EnumLanguageGroupLocalesA not available on this platform\n"); return; } @@ -1390,7 +1403,7 @@ ok( hdc != NULL, "HDC failed to be created %p\n", hdc); memset(&lf, 0, sizeof(LOGFONTA)); - lstrcpyA(lf.lfFaceName, "Symbol"); + lstrcpyA(lf.lfFaceName, "Tahoma"); lf.lfHeight = 10; lf.lfWeight = 3; lf.lfWidth = 10;

1 0

[cwittich] 38415: sync version winetest to wine 1.1.11
by cwittich＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: cwittich Date: Sun Dec 28 05:27:26 2008 New Revision: 38415 URL: http://svn.reactos.org/svn/reactos?rev=38415&view=rev Log: sync version winetest to wine 1.1.11 Modified: trunk/rostests/winetests/version/info.c trunk/rostests/winetests/version/install.c Modified: trunk/rostests/winetests/version/info.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/version/info.c?… ============================================================================== --- trunk/rostests/winetests/version/info.c [iso-8859-1] (original) +++ trunk/rostests/winetests/version/info.c [iso-8859-1] Sun Dec 28 05:27:26 2008 @@ -167,7 +167,7 @@ } } else - trace("skipping GetModuleFileNameA(NULL,..) failed\n"); + trace("skipping GetSystemDirectoryA(mypath,..) failed\n"); create_file("test.txt"); @@ -247,6 +247,13 @@ ok (boolret, "GetFileVersionInfoA failed: GetLastError = %u\n", GetLastError()); if (!boolret) goto cleanup; + + boolret = VerQueryValueA( pVersionInfo, NULL, (LPVOID *)&pFixedVersionInfo, &uiLength ); + ok (boolret || GetLastError() == NO_ERROR /* Win98 */, + "VerQueryValueA failed: GetLastError = %u\n", GetLastError()); + + boolret = VerQueryValueA( pVersionInfo, "", (LPVOID *)&pFixedVersionInfo, &uiLength ); + ok (boolret, "VerQueryValueA failed: GetLastError = %u\n", GetLastError()); boolret = VerQueryValueA( pVersionInfo, backslash, (LPVOID *)&pFixedVersionInfo, &uiLength ); ok (boolret, "VerQueryValueA failed: GetLastError = %u\n", GetLastError()); @@ -286,6 +293,7 @@ WCHAR mypathW[MAX_PATH]; char rootA[] = "\\"; WCHAR rootW[] = { '\\', 0 }; + WCHAR emptyW[] = { 0 }; char varfileinfoA[] = "\\VarFileInfo\\Translation"; WCHAR varfileinfoW[] = { '\\','V','a','r','F','i','l','e','I','n','f','o', '\\','T','r','a','n','s','l','a','t','i','o','n', 0 }; @@ -324,7 +332,7 @@ GetModuleFileNameW(NULL, mypathW, MAX_PATH); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - trace("GetModuleFileNameW not existing on this platform, skipping comparison between A- and W-calls\n"); + win_skip("GetModuleFileNameW not existing on this platform, skipping comparison between A- and W-calls\n"); is_unicode_enabled = FALSE; } @@ -392,6 +400,15 @@ if (is_unicode_enabled) { + if(0) + { /* This causes Vista and w2k8 to crash */ + retW = VerQueryValueW( pVersionInfoW, NULL, (LPVOID *)&pBufW, &uiLengthW ); + ok (retW, "VerQueryValueW failed: GetLastError = %u\n", GetLastError()); + } + + retW = VerQueryValueW( pVersionInfoW, emptyW, (LPVOID *)&pBufW, &uiLengthW ); + ok (retW, "VerQueryValueW failed: GetLastError = %u\n", GetLastError()); + retW = VerQueryValueW( pVersionInfoW, rootW, (LPVOID *)&pBufW, &uiLengthW ); ok (retW, "VerQueryValueW failed: GetLastError = %u\n", GetLastError()); ok ( uiLengthA == sizeof(VS_FIXEDFILEINFO), "Size (%d) doesn't match the size of the VS_FIXEDFILEINFO struct\n", uiLengthA); Modified: trunk/rostests/winetests/version/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/version/install… ============================================================================== --- trunk/rostests/winetests/version/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/version/install.c [iso-8859-1] Sun Dec 28 05:27:26 2008 @@ -165,7 +165,48 @@ } } +static void test_install_file(void) +{ + CHAR tmpname[MAX_PATH]; + UINT size = MAX_PATH; + DWORD rc; + static const CHAR szSrcFileName[] = "nofile.txt"; + static const CHAR szDestFileName[] = "nofile2.txt"; + static const CHAR szSrcDir[] = "D:\\oes\\not\\exist"; + static const CHAR szDestDir[] = "D:\\oes\\not\\exist\\either"; + static const CHAR szCurDir[] = "C:\\"; + + /* testing Invalid Parameters */ + memset(tmpname,0,sizeof(tmpname)); + rc = VerInstallFileA(0x0, NULL, NULL, NULL, NULL, NULL, tmpname, &size); + ok (rc == 0x10000 && tmpname[0]==0," expected return 0x10000 and no tempname, got %08x/\'%s\'\n",rc,tmpname); + memset(tmpname,0,sizeof(tmpname)); + size = MAX_PATH; + rc = VerInstallFileA(0x0, szSrcFileName, NULL, NULL, NULL, NULL, tmpname, &size); + ok (rc == 0x10000 && tmpname[0]==0," expected return 0x10000 and no tempname, got %08x/\'%s\'\n",rc,tmpname); + memset(tmpname,0,sizeof(tmpname)); + size = MAX_PATH; + rc = VerInstallFileA(0x0, szSrcFileName, szDestFileName, NULL, NULL, NULL, tmpname, &size); + ok (rc == 0x10000 && tmpname[0]==0," expected return 0x10000 and no tempname, got %08x/\'%s\'\n",rc,tmpname); + memset(tmpname,0,sizeof(tmpname)); + size = MAX_PATH; + rc = VerInstallFileA(0x0, szSrcFileName, szDestFileName, szSrcDir, NULL, NULL, tmpname, &size); + ok (rc == 0x10000 && tmpname[0]==0," expected return 0x10000 and no tempname, got %08x/\'%s\'\n",rc,tmpname); + + /* Source file does not exist*/ + + memset(tmpname,0,sizeof(tmpname)); + size = MAX_PATH; + rc = VerInstallFileA(0x0, szSrcFileName, szDestFileName, szSrcDir, szDestDir, NULL, tmpname, &size); + ok (rc == 0x10000 && tmpname[0]==0," expected return 0x10000 and no tempname, got %08x/\'%s\'\n",rc,tmpname); + memset(tmpname,0,sizeof(tmpname)); + size = MAX_PATH; + rc = VerInstallFileA(0x0, szSrcFileName, szDestFileName, szSrcDir, szDestDir, szCurDir, tmpname, &size); + ok (rc == 0x10000 && tmpname[0]==0," expected return 0x10000 and no tempname, got %08x/\'%s\'\n",rc,tmpname); +} + START_TEST(install) { test_find_file(); + test_install_file(); }

1 0

[cwittich] 38414: sync lz32 winetest to wine 1.1.11
by cwittich＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: cwittich Date: Sun Dec 28 05:24:41 2008 New Revision: 38414 URL: http://svn.reactos.org/svn/reactos?rev=38414&view=rev Log: sync lz32 winetest to wine 1.1.11 Modified: trunk/rostests/winetests/lz32/lzexpand_main.c Modified: trunk/rostests/winetests/lz32/lzexpand_main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/lz32/lzexpand_m… ============================================================================== --- trunk/rostests/winetests/lz32/lzexpand_main.c [iso-8859-1] (original) +++ trunk/rostests/winetests/lz32/lzexpand_main.c [iso-8859-1] Sun Dec 28 05:24:41 2008 @@ -230,7 +230,8 @@ /* d, using underscore-terminated file name. */ file = LZOpenFileA(_terminated, &test, OF_EXIST); ok(file >= 0, "LZOpenFileA failed on switching to a compressed file name\n"); - ok(test.cBytes == sizeof(OFSTRUCT), + ok(test.cBytes == sizeof(OFSTRUCT) || + broken(test.cBytes == 40), /* win95 */ "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == 0, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); @@ -370,7 +371,7 @@ ok(test.cBytes == sizeof(OFSTRUCT), "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_SUCCESS || - test.nErrCode == ERROR_FILE_NOT_FOUND, /* win9x */ + broken(test.nErrCode != ERROR_SUCCESS), /* win9x */ "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); ok(lstrcmpA(test.szPathName, expected) == 0, "LZOpenFileA returned '%s', but was expected to return '%s'\n", @@ -388,7 +389,8 @@ /* a, for reading. */ file = LZOpenFileA(filename_, &test, OF_READ); ok(file >= 0, "LZOpenFileA failed on read\n"); - ok(test.cBytes == sizeof(OFSTRUCT), + ok(test.cBytes == sizeof(OFSTRUCT) || + broken(test.cBytes == 40), /* win95 */ "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_SUCCESS, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); @@ -403,7 +405,8 @@ /* b, for writing. */ file = LZOpenFileA(filename_, &test, OF_WRITE); ok(file >= 0, "LZOpenFileA failed on write\n"); - ok(test.cBytes == sizeof(OFSTRUCT), + ok(test.cBytes == sizeof(OFSTRUCT) || + broken(test.cBytes == 40), /* win95 */ "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_SUCCESS, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); @@ -418,7 +421,8 @@ /* c, for reading and writing. */ file = LZOpenFileA(filename_, &test, OF_READWRITE); ok(file >= 0, "LZOpenFileA failed on read/write\n"); - ok(test.cBytes == sizeof(OFSTRUCT), + ok(test.cBytes == sizeof(OFSTRUCT) || + broken(test.cBytes == 40), /* win95 */ "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_SUCCESS, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); @@ -433,7 +437,8 @@ /* d, for checking file existence. */ file = LZOpenFileA(filename_, &test, OF_EXIST); ok(file >= 0, "LZOpenFileA failed on read/write\n"); - ok(test.cBytes == sizeof(OFSTRUCT), + ok(test.cBytes == sizeof(OFSTRUCT) || + broken(test.cBytes == 40), /* win95 */ "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_SUCCESS, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); @@ -448,7 +453,8 @@ /* Delete the file then make sure it doesn't exist anymore. */ file = LZOpenFileA(filename_, &test, OF_DELETE); ok(file >= 0, "LZOpenFileA failed on delete\n"); - ok(test.cBytes == sizeof(OFSTRUCT), + ok(test.cBytes == sizeof(OFSTRUCT) || + broken(test.cBytes == 40), /* win95 */ "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_SUCCESS, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); @@ -764,13 +770,13 @@ SetLastError(0xfaceabee); /* Check for nonexistent file. */ file = LZOpenFileW(badfilenameW, &test, OF_READ); - ok(GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_CALL_NOT_IMPLEMENTED, - "GetLastError() returns %d\n", GetLastError()); if(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - trace("LZOpenFileW call not implemented, skipping rest of the test\n"); + win_skip("LZOpenFileW call is not implemented\n"); return; } + ok(GetLastError() == ERROR_FILE_NOT_FOUND, + "GetLastError() returns %d\n", GetLastError()); ok(file == LZERROR_BADINHANDLE, "LZOpenFileW succeeded on nonexistent file\n"); LZClose(file);

1 0

[cwittich] 38413: sync mstask winetest to wine 1.1.11
by cwittich＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: cwittich Date: Sun Dec 28 05:22:23 2008 New Revision: 38413 URL: http://svn.reactos.org/svn/reactos?rev=38413&view=rev Log: sync mstask winetest to wine 1.1.11 Modified: trunk/rostests/winetests/mstask/task.c Modified: trunk/rostests/winetests/mstask/task.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mstask/task.c?r… ============================================================================== --- trunk/rostests/winetests/mstask/task.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mstask/task.c [iso-8859-1] Sun Dec 28 05:22:23 2008 @@ -121,7 +121,7 @@ ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); if (hres == S_OK) { - ok(!lstrcmpW(stored_name, empty), + ok(!lstrcmpiW(stored_name, empty), "Got %s, expected empty string\n", dbgstr_w(stored_name)); CoTaskMemFree(stored_name); } @@ -136,7 +136,7 @@ if (hres == S_OK) { full_name = path_resolve_name(non_application_name); - ok(!lstrcmpW(stored_name, full_name), "Got %s, expected %s\n", + ok(!lstrcmpiW(stored_name, full_name), "Got %s, expected %s\n", dbgstr_w(stored_name), dbgstr_w(full_name)); CoTaskMemFree(stored_name); } @@ -151,7 +151,7 @@ if (hres == S_OK) { full_name = path_resolve_name(notepad_exe); - ok(!lstrcmpW(stored_name, full_name), "Got %s, expected %s\n", + ok(!lstrcmpiW(stored_name, full_name), "Got %s, expected %s\n", dbgstr_w(stored_name), dbgstr_w(full_name)); CoTaskMemFree(stored_name); } @@ -164,9 +164,13 @@ ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); if (hres == S_OK) { - full_name = path_resolve_name(notepad); - ok(!lstrcmpW(stored_name, full_name), "Got %s, expected %s\n", - dbgstr_w(stored_name), dbgstr_w(full_name)); + full_name = path_resolve_name(notepad_exe); /* XP SP1 appends .exe */ + if (lstrcmpiW(stored_name, full_name) != 0) + { + full_name = path_resolve_name(notepad); + ok(!lstrcmpiW(stored_name, full_name), "Got %s, expected %s\n", + dbgstr_w(stored_name), dbgstr_w(full_name)); + } CoTaskMemFree(stored_name); } @@ -181,7 +185,7 @@ if (hres == S_OK) { full_name = path_resolve_name(non_application_name); - ok(!lstrcmpW(stored_name, full_name), "Got %s, expected %s\n", + ok(!lstrcmpiW(stored_name, full_name), "Got %s, expected %s\n", dbgstr_w(stored_name), dbgstr_w(full_name)); CoTaskMemFree(stored_name); } @@ -193,7 +197,7 @@ ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); if (hres == S_OK) { - ok(!lstrcmpW(stored_name, empty), + ok(!lstrcmpiW(stored_name, empty), "Got %s, expected empty string\n", dbgstr_w(stored_name)); CoTaskMemFree(stored_name); } @@ -466,7 +470,10 @@ ok(hres == S_OK, "Failed setting dummy account with no password: %08x\n", hres); hres = ITask_GetAccountInformation(test_task, &account_name); - ok(hres == S_OK, "GetAccountInformation failed: %08x\n", hres); + ok(hres == S_OK || + broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || + hres == SCHED_E_CANNOT_OPEN_TASK), + "GetAccountInformation failed: %08x\n", hres); if (hres == S_OK) { ok(!lstrcmpW(account_name, dummy_account_name), @@ -482,7 +489,10 @@ ok(hres == S_OK, "Failed setting dummy account with password: %08x\n", hres); hres = ITask_GetAccountInformation(test_task, &account_name); - ok(hres == S_OK, "GetAccountInformation failed: %08x\n", hres); + ok(hres == S_OK || + broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || + hres == SCHED_E_CANNOT_OPEN_TASK), + "GetAccountInformation failed: %08x\n", hres); if (hres == S_OK) { ok(!lstrcmpW(account_name, dummy_account_name_b), @@ -495,7 +505,10 @@ hres = ITask_SetAccountInformation(test_task, empty, NULL); ok(hres == S_OK, "Failed setting system account: %08x\n", hres); hres = ITask_GetAccountInformation(test_task, &account_name); - ok(hres == S_OK, "GetAccountInformation failed: %08x\n", hres); + ok(hres == S_OK || + broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || + hres == SCHED_E_CANNOT_OPEN_TASK), + "GetAccountInformation failed: %08x\n", hres); if (hres == S_OK) { ok(!lstrcmpW(account_name, empty),

1 0

[silverblade] 38412: Misc. code changes I forgot to commit previously. Just wanted to get this into the branch before I do more work on this.
by silverblade＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: silverblade Date: Sun Dec 28 04:53:31 2008 New Revision: 38412 URL: http://svn.reactos.org/svn/reactos?rev=38412&view=rev Log: Misc. code changes I forgot to commit previously. Just wanted to get this into the branch before I do more work on this. Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/functiontable.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c (with props) Modified: branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h branches/silverblade-audio/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/deviceinstance.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/midMessage.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/modMessage.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/widMessage.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c Modified: branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Sun Dec 28 04:53:31 2008 @@ -127,6 +127,7 @@ typedef UCHAR MMDEVICE_TYPE, *PMMDEVICE_TYPE; struct _SOUND_DEVICE; +struct _SOUND_DEVICE_INSTANCE; #define DEFINE_GETCAPS_FUNCTYPE(func_typename, caps_type) \ @@ -144,32 +145,29 @@ DEFINE_GETCAPS_FUNCTYPE(MMGETMIDIOUTCAPS_FUNC, LPMIDIOUTCAPS); DEFINE_GETCAPS_FUNCTYPE(MMGETMIDIINCAPS_FUNC, LPMIDIINCAPS ); +typedef MMRESULT (*MMWAVEQUERYFORMATSUPPORT_FUNC)( + IN struct _SOUND_DEVICE* Device, + IN PWAVEFORMATEX WaveFormat, + IN DWORD WaveFormatSize); + +typedef MMRESULT (*MMWAVESETFORMAT_FUNC)( + IN struct _SOUND_DEVICE_INSTANCE* Instance, + IN PWAVEFORMATEX WaveFormat, + IN DWORD WaveFormatSize); + typedef struct _MMFUNCTION_TABLE { union { - MMGETCAPS_FUNC GetCapabilities; - MMGETWAVEOUTCAPS_FUNC GetWaveOutCapabilities; - MMGETWAVEINCAPS_FUNC GetWaveInCapabilities; - MMGETMIDIOUTCAPS_FUNC GetMidiOutCapabilities; - MMGETMIDIINCAPS_FUNC GetMidiInCapabilities; + MMGETCAPS_FUNC GetCapabilities; + MMGETWAVEOUTCAPS_FUNC GetWaveOutCapabilities; + MMGETWAVEINCAPS_FUNC GetWaveInCapabilities; + MMGETMIDIOUTCAPS_FUNC GetMidiOutCapabilities; + MMGETMIDIINCAPS_FUNC GetMidiInCapabilities; }; -/* - MMCREATEINSTANCE_FUNC Constructor; - MMDESTROYINSTANCE_FUNC Destructor; - MMGETCAPS_FUNC GetCapabilities; - - MMWAVEQUERYFORMAT_FUNC QueryWaveFormat; - MMWAVESETFORMAT_FUNC SetWaveFormat; - MMWAVEQUEUEBUFFER_FUNC QueueWaveBuffer; - - MMGETWAVESTATE_FUNC GetWaveDeviceState; - MMSETWAVESTATE_FUNC PauseWaveDevice; - MMSETWAVESTATE_FUNC RestartWaveDevice; - MMSETWAVESTATE_FUNC ResetWaveDevice; - MMSETWAVESTATE_FUNC BreakWaveDeviceLoop; -*/ + MMWAVEQUERYFORMATSUPPORT_FUNC QueryWaveFormatSupport; + MMWAVESETFORMAT_FUNC SetWaveFormat; } MMFUNCTION_TABLE, *PMMFUNCTION_TABLE; typedef struct _SOUND_DEVICE @@ -299,6 +297,24 @@ IsValidSoundDeviceInstance( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); +MMRESULT +CreateSoundDeviceInstance( + IN PSOUND_DEVICE SoundDevice, + OUT PSOUND_DEVICE_INSTANCE* SoundDeviceInstance); + +MMRESULT +DestroySoundDeviceInstance( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); + +MMRESULT +DestroyAllSoundDeviceInstances( + IN PSOUND_DEVICE SoundDevice); + +MMRESULT +GetSoundDeviceFromInstance( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + OUT PSOUND_DEVICE* SoundDevice); + /* nt4.c @@ -358,6 +374,35 @@ MMRESULT TranslateInternalMmResult( IN MMRESULT Result); + + +/* + wave/format.c +*/ + +MMRESULT +QueryWaveDeviceFormatSupport( + IN PSOUND_DEVICE SoundDevice, + IN LPWAVEFORMATEX Format, + IN DWORD FormatSize); + +MMRESULT +DefaultQueryWaveDeviceFormatSupport( + IN PSOUND_DEVICE SoundDevice, + IN LPWAVEFORMATEX Format, + IN DWORD FormatSize); + +MMRESULT +SetWaveDeviceFormat( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN LPWAVEFORMATEX Format, + IN DWORD FormatSize); + +MMRESULT +DefaultSetWaveDeviceFormat( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN LPWAVEFORMATEX Format, + IN DWORD FormatSize); /* Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c [iso-8859-1] Sun Dec 28 04:53:31 2008 @@ -41,7 +41,18 @@ Result = GetSoundDeviceCount(AUX_DEVICE_TYPE); break; } + + case AUXDM_GETDEVCAPS : + { + Result = MmeGetSoundDeviceCapabilities(AUX_DEVICE_TYPE, + DeviceId, + (PVOID) Parameter1, + Parameter2); + break; + } } + + SND_TRACE(L"auxMessage returning MMRESULT %d\n", Result); ReleaseEntrypointMutex(AUX_DEVICE_TYPE); Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c [iso-8859-1] Sun Dec 28 04:53:31 2008 @@ -1,0 +1,207 @@ +/* + * PROJECT: ReactOS Sound System "MME Buddy" Library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/sound/mmebuddy/capabilities.c + * + * PURPOSE: Queries sound devices for their capabilities. + * + * PROGRAMMERS: Andrew Greenwood (silverblade(a)reactos.org) +*/ + +#include <windows.h> +#include <mmsystem.h> +#include <ntddk.h> +#include <ntddsnd.h> +#include <mmebuddy.h> + +/* + This is a helper function to alleviate some of the repetition involved with + implementing the various MME message functions. +*/ +MMRESULT +MmeGetSoundDeviceCapabilities( + IN MMDEVICE_TYPE DeviceType, + IN DWORD DeviceId, + IN PVOID Capabilities, + IN DWORD CapabilitiesSize) +{ + PSOUND_DEVICE SoundDevice; + MMRESULT Result; + + SND_TRACE(L"MME *_GETCAPS for device %d of type %d\n", DeviceId, DeviceType); + + /* Our parameter checks are done elsewhere */ + Result = GetSoundDevice(DeviceType, DeviceId, &SoundDevice); + + if ( Result != MMSYSERR_NOERROR ) + return Result; + + return GetSoundDeviceCapabilities(SoundDevice, + Capabilities, + CapabilitiesSize); +} + +/* + Obtains the capabilities of a sound device. This routine ensures that the + supplied CapabilitiesSize parameter at least meets the minimum size of the + relevant capabilities structure. + + Ultimately, it will call the GetCapabilities function specified in the + sound device's function table. Note that there are several of these, in a + union. This is simply to avoid manually typecasting when implementing the + functions. +*/ +MMRESULT +GetSoundDeviceCapabilities( + IN PSOUND_DEVICE SoundDevice, + OUT PVOID Capabilities, + IN DWORD CapabilitiesSize) +{ + MMDEVICE_TYPE DeviceType; + PMMFUNCTION_TABLE FunctionTable; + BOOLEAN GoodSize = FALSE; + MMRESULT Result; + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); + VALIDATE_MMSYS_PARAMETER( Capabilities ); + VALIDATE_MMSYS_PARAMETER( CapabilitiesSize > 0 ); + + /* Obtain the device type */ + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + if ( Result != MMSYSERR_NOERROR ) + return TranslateInternalMmResult(Result); + + /* Obtain the function table */ + Result = GetSoundDeviceFunctionTable(SoundDevice, &FunctionTable); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + if ( Result != MMSYSERR_NOERROR ) + return TranslateInternalMmResult(Result); + + /* Check that the capabilities structure is of a valid size */ + switch ( DeviceType ) + { + case WAVE_OUT_DEVICE_TYPE : + { + GoodSize = CapabilitiesSize >= sizeof(WAVEOUTCAPS); + break; + } + case WAVE_IN_DEVICE_TYPE : + { + GoodSize = CapabilitiesSize >= sizeof(WAVEINCAPS); + break; + } + case MIDI_OUT_DEVICE_TYPE : + { + GoodSize = CapabilitiesSize >= sizeof(MIDIOUTCAPS); + break; + } + case MIDI_IN_DEVICE_TYPE : + { + GoodSize = CapabilitiesSize >= sizeof(MIDIINCAPS); + break; + } + /* TODO: Others... */ + default : + { + SND_ASSERT(FALSE); + } + }; + + if ( ! GoodSize ) + { + SND_ERR(L"Device capabilities structure too small\n"); + return MMSYSERR_INVALPARAM; + } + + /* Call the "get capabilities" function within the function table */ + SND_ASSERT( FunctionTable->GetCapabilities ); + + if ( ! FunctionTable->GetCapabilities ) + return MMSYSERR_NOTSUPPORTED; + + return FunctionTable->GetCapabilities(SoundDevice, + Capabilities, + CapabilitiesSize); +} + +/* + Provides a default implementation for the "get capabilities" request, + using the standard IOCTLs used by NT4 sound drivers. +*/ +MMRESULT +DefaultGetSoundDeviceCapabilities( + IN PSOUND_DEVICE SoundDevice, + OUT PVOID Capabilities, + IN DWORD CapabilitiesSize) +{ + MMRESULT Result; + MMDEVICE_TYPE DeviceType; + PWSTR DevicePath; + DWORD IoCtl; + DWORD BytesTransferred; + HANDLE DeviceHandle; + + /* If these are bad there's an internal error with MME-Buddy! */ + SND_ASSERT( SoundDevice ); + SND_ASSERT( Capabilities ); + SND_ASSERT( CapabilitiesSize > 0 ); + + SND_TRACE(L"Default get-capabilities routine called\n"); + + /* Get the device type */ + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + if ( Result != MMSYSERR_NOERROR ); + return TranslateInternalMmResult(Result); + + /* Get the device path */ + Result = GetSoundDevicePath(SoundDevice, &DevicePath); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + if ( Result != MMSYSERR_NOERROR ); + return TranslateInternalMmResult(Result); + + /* Choose the appropriate IOCTL */ + if ( IS_WAVE_DEVICE_TYPE(DeviceType) ) + { + IoCtl = IOCTL_WAVE_GET_CAPABILITIES; + } + else if ( IS_MIDI_DEVICE_TYPE(DeviceType) ) + { + IoCtl = IOCTL_MIDI_GET_CAPABILITIES; + } + else + { + /* TODO */ + SND_ASSERT( FALSE ); + } + + /* Get the capabilities information from the driver */ + Result = OpenKernelSoundDeviceByName(DevicePath, TRUE, &DeviceHandle); + + if ( Result != MMSYSERR_NOERROR ) + { + SND_ERR(L"Failed to open %wS\n", DevicePath); + return TranslateInternalMmResult(Result); + } + + Result = QueryDevice(DeviceHandle, + IoCtl, + Capabilities, + CapabilitiesSize, + &BytesTransferred, + NULL); + + CloseKernelSoundDevice(DeviceHandle); + + if ( Result != MMSYSERR_NOERROR ) + { + SND_ERR(L"Retrieval of capabilities information failed\n"); + } + + return Result; +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/deviceinstance.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/deviceinstance.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/deviceinstance.c [iso-8859-1] Sun Dec 28 04:53:31 2008 @@ -9,12 +9,86 @@ */ #include <windows.h> +#include <mmsystem.h> #include <mmebuddy.h> + +MMRESULT +AllocateSoundDeviceInstance( + OUT PSOUND_DEVICE_INSTANCE* SoundDeviceInstance) +{ + PSOUND_DEVICE_INSTANCE NewInstance; + + VALIDATE_MMSYS_PARAMETER( SoundDeviceInstance ); + + /* Allocate memory for the new instance */ + NewInstance = AllocateStruct(SOUND_DEVICE_INSTANCE); + + if ( ! NewInstance ) + return MMSYSERR_NOMEM; + + /* Provide the caller with the new instance pointer */ + *SoundDeviceInstance = NewInstance; + + return MMSYSERR_NOERROR; +} + +VOID +FreeSoundDeviceInstance( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) +{ + SND_ASSERT( SoundDeviceInstance ); + FreeMemory(SoundDeviceInstance); +} BOOLEAN IsValidSoundDeviceInstance( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) { - /* TODO */ - return TRUE; + /* TODO - do this better */ + return ( SoundDeviceInstance != NULL ); } + +MMRESULT +ListSoundDeviceInstance( + IN PSOUND_DEVICE SoundDevice, + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) +{ + return MMSYSERR_NOTSUPPORTED; +} + +MMRESULT +UnlistSoundDeviceInstance( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) +{ + return MMSYSERR_NOTSUPPORTED; +} + +MMRESULT +CreateSoundDeviceInstance( + IN PSOUND_DEVICE SoundDevice, + OUT PSOUND_DEVICE_INSTANCE* SoundDeviceInstance) +{ + return MMSYSERR_NOTSUPPORTED; +} + +MMRESULT +DestroySoundDeviceInstance( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) +{ + return MMSYSERR_NOTSUPPORTED; +} + +MMRESULT +DestroyAllSoundDeviceInstances( + IN PSOUND_DEVICE SoundDevice) +{ + return MMSYSERR_NOTSUPPORTED; +} + +MMRESULT +GetSoundDeviceFromInstance( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + OUT PSOUND_DEVICE* SoundDevice) +{ + return MMSYSERR_NOTSUPPORTED; +} Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/functiontable.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/functiontable.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/functiontable.c [iso-8859-1] Sun Dec 28 04:53:31 2008 @@ -1,0 +1,78 @@ +/* + * PROJECT: ReactOS Sound System "MME Buddy" Library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/sound/mmebuddy/functiontable.c + * + * PURPOSE: Routes function calls through a function table, calling + * implementation-defined routines or a default function, depending + * on configuration. + * + * PROGRAMMERS: Andrew Greenwood (silverblade(a)reactos.org) +*/ + +#include <windows.h> +#include <mmebuddy.h> + +/* + Attaches a function table to a sound device. Any NULL entries in this + table are automatically set to point to a default routine to handle + the appropriate function. If NULL is passed as the function table itself, + the entire function table will use only the default routines. +*/ +MMRESULT +SetSoundDeviceFunctionTable( + IN PSOUND_DEVICE SoundDevice, + IN PMMFUNCTION_TABLE FunctionTable OPTIONAL) +{ + VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); + /*VALIDATE_MMSYS_PARAMETER( FunctionTable );*/ + + /* Zero out the existing function table (if present) */ + ZeroMemory(&SoundDevice->FunctionTable, sizeof(MMFUNCTION_TABLE)); + + /* Fill in the client-supplied functions, if provided */ + if ( FunctionTable ) + { + CopyMemory(&SoundDevice->FunctionTable, + FunctionTable, + sizeof(MMFUNCTION_TABLE)); + } + + /* Plug any gaps in the function table */ + if ( ! SoundDevice->FunctionTable.GetCapabilities ) + { + SoundDevice->FunctionTable.GetCapabilities = + DefaultGetSoundDeviceCapabilities; + } + + if ( ! SoundDevice->FunctionTable.QueryWaveFormatSupport ) + { + SoundDevice->FunctionTable.QueryWaveFormatSupport = + DefaultQueryWaveDeviceFormatSupport; + } + + if ( ! SoundDevice->FunctionTable.SetWaveFormat ) + { + SoundDevice->FunctionTable.SetWaveFormat = + DefaultSetWaveDeviceFormat; + } + + return MMSYSERR_NOERROR; +} + +/* + Retrieves the function table for a sound device, as previously set using + SetSoundDeviceFunctionTable. +*/ +MMRESULT +GetSoundDeviceFunctionTable( + IN PSOUND_DEVICE SoundDevice, + OUT PMMFUNCTION_TABLE* FunctionTable) +{ + VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); + VALIDATE_MMSYS_PARAMETER( FunctionTable ); + + *FunctionTable = &SoundDevice->FunctionTable; + + return MMSYSERR_NOERROR; +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/functiontable.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/midMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/midMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/midMessage.c [iso-8859-1] Sun Dec 28 04:53:31 2008 @@ -41,7 +41,18 @@ Result = GetSoundDeviceCount(MIDI_IN_DEVICE_TYPE); break; } + + case MIDM_GETDEVCAPS : + { + Result = MmeGetSoundDeviceCapabilities(MIDI_IN_DEVICE_TYPE, + DeviceId, + (PVOID) Parameter1, + Parameter2); + break; + } } + + SND_TRACE(L"midMessage returning MMRESULT %d\n", Result); ReleaseEntrypointMutex(MIDI_IN_DEVICE_TYPE); Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/modMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/modMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/modMessage.c [iso-8859-1] Sun Dec 28 04:53:31 2008 @@ -41,7 +41,18 @@ Result = GetSoundDeviceCount(MIDI_OUT_DEVICE_TYPE); break; } + + case MODM_GETDEVCAPS : + { + Result = MmeGetSoundDeviceCapabilities(MIDI_OUT_DEVICE_TYPE, + DeviceId, + (PVOID) Parameter1, + Parameter2); + break; + } } + + SND_TRACE(L"modMessage returning MMRESULT %d\n", Result); ReleaseEntrypointMutex(MIDI_OUT_DEVICE_TYPE); Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] Sun Dec 28 04:53:31 2008 @@ -41,7 +41,18 @@ Result = GetSoundDeviceCount(MIXER_DEVICE_TYPE); break; } + + case MXDM_GETDEVCAPS : + { + Result = MmeGetSoundDeviceCapabilities(MIXER_DEVICE_TYPE, + DeviceId, + (PVOID) Parameter1, + Parameter2); + break; + } } + + SND_TRACE(L"mxdMessage returning MMRESULT %d\n", Result); ReleaseEntrypointMutex(MIXER_DEVICE_TYPE); Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c [iso-8859-1] Sun Dec 28 04:53:31 2008 @@ -1,0 +1,59 @@ +/* + * PROJECT: ReactOS Sound System "MME Buddy" Library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/sound/mmebuddy/wave/format.c + * + * PURPOSE: Queries and sets wave device format (sample rate, etc.) + * + * PROGRAMMERS: Andrew Greenwood (silverblade(a)reactos.org) +*/ + +#include <windows.h> +#include <mmsystem.h> +#include <ntddk.h> +#include <ntddsnd.h> +#include <mmebuddy.h> + +MMRESULT +QueryWaveDeviceFormatSupport( + IN PSOUND_DEVICE SoundDevice, + IN LPWAVEFORMATEX Format, + IN DWORD FormatSize) +{ + MMRESULT Result; + MMDEVICE_TYPE DeviceType; + MMFUNCTION_TABLE FunctionTable; + + SND_TRACE(L"Querying wave format support\n"); + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); + VALIDATE_MMSYS_PARAMETER( Format ); + VALIDATE_MMSYS_PARAMETER( FormatSize >= sizeof(WAVEFORMATEX) ); + + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + /* Ensure we have a wave device (TODO: check if wavein as well) */ + VALIDATE_MMSYS_PARAMETER( IS_WAVE_DEVICE_TYPE(DeviceType) ); + + /* Obtain the function table */ + Result = GetSoundDeviceFunctionTable(SoundDevice, &FunctionTable); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + if ( Result != MMSYSERR_NOERROR ) + return TranslateInternalMmResult(Result); + + SND_ASSERT( FunctionTable->QueryWaveFormatSupport ); + + return FunctionTable->QueryWaveFormatSupport(SoundDevice, Format, FormatSize); +} + +MMRESULT +SetWaveDeviceFormat( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN LPWAVEFORMATEX Format, + IN DWORD FormatSize) +{ + SND_TRACE(L"Setting wave format\n"); + return MMSYSERR_NOTSUPPORTED; +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/widMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] Sun Dec 28 04:53:31 2008 @@ -53,6 +53,8 @@ } } + SND_TRACE(L"widMessage returning MMRESULT %d\n", Result); + ReleaseEntrypointMutex(WAVE_IN_DEVICE_TYPE); return Result; Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Sun Dec 28 04:53:31 2008 @@ -51,7 +51,71 @@ Parameter2); break; } + + case WODM_OPEN : + { + PSOUND_DEVICE SoundDevice; + PSOUND_DEVICE_INSTANCE SoundDeviceInstance; + LPWAVEOPENDESC OpenParameters = (LPWAVEOPENDESC) Parameter1; + + /* Obtain the sound device */ + Result = GetSoundDevice(WAVE_OUT_DEVICE_TYPE, DeviceId, &SoundDevice); + + if ( Result != MMSYSERR_NOERROR ); + break; + + /* See if the device supports this format */ + Result = QueryWaveDeviceFormatSupport(SoundDevice, + OpenParameters->lpFormat, + sizeof(WAVEFORMATEX)); + + if ( Parameter2 & WAVE_FORMAT_QUERY ) + { + /* Nothing more to be done - keep the result */ + break; + } + + /* The MME API should provide us with a place to store a handle */ + SND_ASSERT( PrivateHandle ); + if ( ! PrivateHandle ) + { + /* Not so much an invalid parameter as something messed up!! */ + SND_ERR(L"MME API supplied a NULL private handle pointer!\n"); + Result = MMSYSERR_ERROR; + break; + } + + /* Spawn an instance of the sound device */ + Result = CreateSoundDeviceInstance(SoundDevice, &SoundDeviceInstance); + + if ( Result != MMSYSERR_NOERROR ) + { + SND_ERR(L"Failed to create sound device instance\n"); + break; + } + + /* Set the sample rate, bits per sample, etc. */ + Result = SetWaveDeviceFormat(SoundDeviceInstance, + OpenParameters->lpFormat, + sizeof(WAVEFORMATEX)); + + if ( Result != MMSYSERR_NOERROR ) + { + SND_ERR(L"Failed to set wave device format\n"); + DestroySoundDeviceInstance(SoundDeviceInstance); + break; + } + + break; + } + + case WODM_CLOSE : + { + break; + } } + + SND_TRACE(L"wodMessage returning MMRESULT %d\n", Result); ReleaseEntrypointMutex(WAVE_OUT_DEVICE_TYPE);

1 0

[cwittich] 38411: sync comdlg32 winetest to wine 1.1.11
by cwittich＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: cwittich Date: Sun Dec 28 04:42:08 2008 New Revision: 38411 URL: http://svn.reactos.org/svn/reactos?rev=38411&view=rev Log: sync comdlg32 winetest to wine 1.1.11 Added: trunk/rostests/winetests/comdlg32/rsrc.rc (with props) Modified: trunk/rostests/winetests/comdlg32/comdlg32.rbuild trunk/rostests/winetests/comdlg32/filedlg.c trunk/rostests/winetests/comdlg32/printdlg.c Modified: trunk/rostests/winetests/comdlg32/comdlg32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/comdlg… ============================================================================== --- trunk/rostests/winetests/comdlg32/comdlg32.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/comdlg32/comdlg32.rbuild [iso-8859-1] Sun Dec 28 04:42:08 2008 @@ -7,9 +7,11 @@ <file>filedlg.c</file> <file>printdlg.c</file> <file>testlist.c</file> + <file>rsrc.rc</file> <library>wine</library> <library>comdlg32</library> <library>user32</library> + <library>gdi32</library> <library>kernel32</library> <library>ntdll</library> </module> Modified: trunk/rostests/winetests/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/filedl… ============================================================================== --- trunk/rostests/winetests/comdlg32/filedlg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comdlg32/filedlg.c [iso-8859-1] Sun Dec 28 04:42:08 2008 @@ -22,6 +22,10 @@ #include <windows.h> #include <wine/test.h> +#include "initguid.h" +#include "shlguid.h" +#define COBJMACROS +#include "shobjidl.h" /* ##### */ @@ -131,9 +135,144 @@ } } +static UINT CALLBACK create_view_window2_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +{ + if (msg == WM_NOTIFY) + { + if (((LPNMHDR)lParam)->code == CDN_FOLDERCHANGE) + { + IShellBrowser *shell_browser = (IShellBrowser *)SendMessage(GetParent(dlg), WM_USER + 7 /* WM_GETISHELLBROWSER */, 0, 0); + IShellView *shell_view = NULL; + IShellView2 *shell_view2 = NULL; + SV2CVW2_PARAMS view_params; + FOLDERSETTINGS folder_settings; + HRESULT hr; + RECT rect = {0, 0, 0, 0}; + + hr = IShellBrowser_QueryActiveShellView(shell_browser, &shell_view); + ok(SUCCEEDED(hr), "QueryActiveShellView returned %#x\n", hr); + if (FAILED(hr)) goto cleanup; + + hr = IShellView_QueryInterface(shell_view, &IID_IShellView2, (void **)&shell_view2); + if (hr == E_NOINTERFACE) + { + skip("IShellView2 not supported\n"); + goto cleanup; + } + ok(SUCCEEDED(hr), "QueryInterface returned %#x\n", hr); + if (FAILED(hr)) goto cleanup; + + hr = IShellView2_DestroyViewWindow(shell_view2); + ok(SUCCEEDED(hr), "DestroyViewWindow returned %#x\n", hr); + + folder_settings.ViewMode = FVM_LIST; + folder_settings.fFlags = 0; + + view_params.cbSize = sizeof(view_params); + view_params.psvPrev = NULL; + view_params.pfs = &folder_settings; + view_params.psbOwner = shell_browser; + view_params.prcView = &rect; + view_params.pvid = NULL; + view_params.hwndView = NULL; + + hr = IShellView2_CreateViewWindow2(shell_view2, &view_params); + ok(SUCCEEDED(hr), "CreateViewWindow2 returned %#x\n", hr); + if (FAILED(hr)) goto cleanup; + + hr = IShellView2_GetCurrentInfo(shell_view2, &folder_settings); + ok(SUCCEEDED(hr), "GetCurrentInfo returned %#x\n", hr); + ok(folder_settings.ViewMode == FVM_LIST, "view mode is %d, expected %d\n", folder_settings.ViewMode, FVM_LIST); + + hr = IShellView2_DestroyViewWindow(shell_view2); + ok(SUCCEEDED(hr), "DestroyViewWindow returned %#x\n", hr); + + /* XP and W2K3 need this. On Win9x and W2K the call to DestroyWindow() fails and has + * no side effects. NT4 doesn't get here. (FIXME: Vista doesn't get here yet). + */ + DestroyWindow(view_params.hwndView); + + view_params.pvid = &VID_Details; + hr = IShellView2_CreateViewWindow2(shell_view2, &view_params); + ok(SUCCEEDED(hr), "CreateViewWindow2 returned %#x\n", hr); + if (FAILED(hr)) goto cleanup; + + hr = IShellView2_GetCurrentInfo(shell_view2, &folder_settings); + ok(SUCCEEDED(hr), "GetCurrentInfo returned %#x\n", hr); + ok(folder_settings.ViewMode == FVM_DETAILS || + broken(folder_settings.ViewMode == FVM_LIST), /* Win9x */ + "view mode is %d, expected %d\n", folder_settings.ViewMode, FVM_DETAILS); + +cleanup: + if (shell_view2) IShellView2_Release(shell_view2); + if (shell_view) IShellView_Release(shell_view); + PostMessage(GetParent(dlg), WM_COMMAND, IDCANCEL, 0); + } + } + return 0; +} + +static LONG_PTR WINAPI template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +{ + if (msg == WM_INITDIALOG) + { + HWND p,cb; + INT sel; + p = GetParent(dlg); + ok(p!=NULL, "Failed to get parent of template\n"); + cb = GetDlgItem(p,0x470); + ok(cb!=NULL, "Failed to get filter combobox\n"); + sel = SendMessage(cb, CB_GETCURSEL, 0, 0); + ok (sel != -1, "Failed to get selection from filter listbox\n"); + } + if (msg == WM_NOTIFY) + { + if (((LPNMHDR)lParam)->code == CDN_FOLDERCHANGE) + PostMessage(GetParent(dlg), WM_COMMAND, IDCANCEL, 0); + } + return 0; +} + +static void test_create_view_window2(void) +{ + OPENFILENAMEA ofn = {0}; + char filename[1024] = {0}; + DWORD ret; + + ofn.lStructSize = sizeof(ofn); + ofn.lpstrFile = filename; + ofn.nMaxFile = 1042; + ofn.lpfnHook = create_view_window2_hook; + ofn.Flags = OFN_ENABLEHOOK | OFN_EXPLORER; + ret = GetOpenFileNameA(&ofn); + ok(!ret, "GetOpenFileNameA returned %#x\n", ret); + ret = CommDlgExtendedError(); + ok(!ret, "CommDlgExtendedError returned %#x\n", ret); +} + +static void test_create_view_template(void) +{ + OPENFILENAMEA ofn = {0}; + char filename[1024] = {0}; + DWORD ret; + + ofn.lStructSize = sizeof(ofn); + ofn.lpstrFile = filename; + ofn.nMaxFile = 1042; + ofn.lpfnHook = (LPOFNHOOKPROC)template_hook; + ofn.Flags = OFN_ENABLEHOOK | OFN_EXPLORER| OFN_ENABLETEMPLATE; + ofn.hInstance = GetModuleHandleA(NULL); + ofn.lpTemplateName = "template1"; + ofn.lpstrFilter="text\0*.txt\0All\0*\0\0"; + ret = GetOpenFileNameA(&ofn); + ok(!ret, "GetOpenFileNameA returned %#x\n", ret); + ret = CommDlgExtendedError(); + ok(!ret, "CommDlgExtendedError returned %#x\n", ret); +} START_TEST(filedlg) { test_DialogCancel(); - -} + test_create_view_window2(); + test_create_view_template(); +} Modified: trunk/rostests/winetests/comdlg32/printdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/printd… ============================================================================== --- trunk/rostests/winetests/comdlg32/printdlg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comdlg32/printdlg.c [iso-8859-1] Sun Dec 28 04:42:08 2008 @@ -289,6 +289,77 @@ } +static BOOL abort_proc_called = FALSE; +static BOOL CALLBACK abort_proc(HDC hdc, int error) { return abort_proc_called = TRUE; } +static void test_abort_proc(void) +{ + HDC print_dc; + RECT rect = {0, 0, 100, 100}; + DOCINFOA doc_info = {0}; + PRINTDLGA pd = {0}; + char filename[MAX_PATH]; + + if (!GetTempFileNameA(".", "prn", 0, filename)) + { + skip("Failed to create a temporary file name\n"); + return; + } + + pd.lStructSize = sizeof(pd); + pd.Flags = PD_RETURNDEFAULT | PD_ALLPAGES | PD_RETURNDC | PD_PRINTTOFILE; + pd.nFromPage = 1; + pd.nToPage = 1; + pd.nCopies = 1; + + if (!PrintDlgA(&pd)) + { + skip("No default printer available.\n"); + ok(DeleteFileA(filename), "Failed to delete temporary file\n"); + return; + } + + ok(pd.hDC != NULL, "PrintDlg didn't return a DC.\n"); + if (!(print_dc = pd.hDC)) + { + ok(DeleteFileA(filename), "Failed to delete temporary file\n"); + return; + } + + ok(SetAbortProc(print_dc, abort_proc) > 0, "SetAbortProc failed\n"); + ok(!abort_proc_called, "AbortProc got called unexpectedly by SetAbortProc.\n"); + abort_proc_called = FALSE; + + doc_info.cbSize = sizeof(doc_info); + doc_info.lpszDocName = "Some document"; + doc_info.lpszOutput = filename; + + ok(StartDocA(print_dc, &doc_info) > 0, "StartDocA failed\n"); + ok(abort_proc_called, "AbortProc didn't get called by StartDoc.\n"); + abort_proc_called = FALSE; + + ok(StartPage(print_dc) > 0, "StartPage failed\n"); + ok(!abort_proc_called, "AbortProc got called unexpectedly by StartPage.\n"); + abort_proc_called = FALSE; + + ok(FillRect(print_dc, &rect, (HBRUSH)(COLOR_BACKGROUND + 1)), "FillRect failed\n"); + ok(!abort_proc_called, "AbortProc got called unexpectedly by StretchBlt.\n"); + abort_proc_called = FALSE; + + ok(EndPage(print_dc) > 0, "EndPage failed\n"); + ok(!abort_proc_called, "AbortProc got called unexpectedly by EndPage.\n"); + abort_proc_called = FALSE; + + ok(EndDoc(print_dc) > 0, "EndDoc failed\n"); + ok(!abort_proc_called, "AbortProc got called unexpectedly by EndDoc.\n"); + abort_proc_called = FALSE; + + ok(DeleteDC(print_dc), "DeleteDC failed\n"); + ok(!abort_proc_called, "AbortProc got called unexpectedly by DeleteDC.\n"); + abort_proc_called = FALSE; + + ok(DeleteFileA(filename), "Failed to delete temporary file\n"); +} + /* ########################### */ START_TEST(printdlg) @@ -299,6 +370,7 @@ test_PageSetupDlgA(); test_PrintDlgA(); + test_abort_proc(); /* PrintDlgEx not present before w2k */ if (ptr) { Added: trunk/rostests/winetests/comdlg32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/rsrc.r… ============================================================================== --- trunk/rostests/winetests/comdlg32/rsrc.rc (added) +++ trunk/rostests/winetests/comdlg32/rsrc.rc [iso-8859-1] Sun Dec 28 04:42:08 2008 @@ -1,0 +1,34 @@ +/* Resources for the common dialog unit test suite. + * + * Copyright 2008 CodeWeavers, Aric Stewart + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" +#include "winuser.h" + +TEMPLATE1 DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215 +STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS +FONT 8, "MS Shell Dlg" +{ + LTEXT "Path:",-1,28,4,36,8 + LTEXT "Text1",-1,4,16,20,40 + LTEXT "Selected:",-1,32,49,40,8 + EDITTEXT 55,74,47,200,12,ES_AUTOHSCROLL + LTEXT "Text2",-1,232,20,65,8 + LTEXT "",-1,28,16,204,31 + EDITTEXT 56,65,2,200,12,ES_AUTOHSCROLL +} Propchange: trunk/rostests/winetests/comdlg32/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs