Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 43955: revert r43851
by tkreuzer＠svn.reactos.org 04 Nov '09

04 Nov '09

Author: tkreuzer Date: Wed Nov 4 22:08:42 2009 New Revision: 43955 URL: http://svn.reactos.org/svn/reactos?rev=43955&view=rev Log: revert r43851 Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Wed Nov 4 22:08:42 2009 @@ -1513,8 +1513,8 @@ linkerScriptArgument.c_str (), objectsMacro.c_str (), link_defaultlibs ? "$(PROJECT_LPPFLAGS) " : "", + libsMacro.c_str (), GetLinkerMacro ().c_str (), - libsMacro.c_str (), target_macro.c_str () ); } else @@ -1555,8 +1555,8 @@ backend->GetFullName ( temp_exp ).c_str (), objectsMacro.c_str (), link_defaultlibs ? "$(PROJECT_LPPFLAGS) " : "", + libsMacro.c_str (), GetLinkerMacro ().c_str (), - libsMacro.c_str (), target_macro.c_str () ); fprintf ( fMakefile,

1 0

[tkreuzer] 43954: fix the pspec, too
by tkreuzer＠svn.reactos.org 04 Nov '09

04 Nov '09

Author: tkreuzer Date: Wed Nov 4 22:05:47 2009 New Revision: 43954 URL: http://svn.reactos.org/svn/reactos?rev=43954&view=rev Log: fix the pspec, too Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Wed Nov 4 22:05:47 2009 @@ -759,7 +759,7 @@ @ stdcall ResetWriteWatch(ptr long) @ stdcall RestoreLastError(long) ntdll.RtlRestoreLastWin32Error @ stdcall ResumeThread(long) -@ stdcall -arch=x86_64 RtlAddFunctionTable(ptr long double double) +@ stdcall -arch=x86_64 RtlAddFunctionTable(ptr long double) @ stdcall RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace @ stdcall -arch=x86_64 RtlCompareMemory(ptr ptr ptr)

1 0

[tkreuzer] 43953: fix RtlAddFunctionTable
by tkreuzer＠svn.reactos.org 04 Nov '09

04 Nov '09

Author: tkreuzer Date: Wed Nov 4 22:05:16 2009 New Revision: 43953 URL: http://svn.reactos.org/svn/reactos?rev=43953&view=rev Log: fix RtlAddFunctionTable Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] Wed Nov 4 22:05:16 2009 @@ -165,8 +165,7 @@ RtlAddFunctionTable( IN PRUNTIME_FUNCTION FunctionTable, IN DWORD EntryCount, - IN DWORD64 BaseAddress, - IN ULONGLONG TargetGp) + IN DWORD64 BaseAddress) { UNIMPLEMENTED; return FALSE;

1 0

[tkreuzer] 43952: Add some amd64 specific exports to kernel32
by tkreuzer＠svn.reactos.org 04 Nov '09

04 Nov '09

Author: tkreuzer Date: Wed Nov 4 21:39:05 2009 New Revision: 43952 URL: http://svn.reactos.org/svn/reactos?rev=43952&view=rev Log: Add some amd64 specific exports to kernel32 Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Wed Nov 4 21:39:05 2009 @@ -759,9 +759,14 @@ @ stdcall ResetWriteWatch(ptr long) @ stdcall RestoreLastError(long) ntdll.RtlRestoreLastWin32Error @ stdcall ResumeThread(long) +@ stdcall -arch=x86_64 RtlAddFunctionTable(ptr long double double) @ stdcall RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace +@ stdcall -arch=x86_64 RtlCompareMemory(ptr ptr ptr) +@ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr ptr) +@ stdcall -arch=x86_64 RtlDeleteFunctionTable(ptr) @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory +@ stdcall -arch=x86_64 RtlInstallFunctionTableCallback(double double long ptr ptr ptr) @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory @ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind @ stdcall RtlVirtualUnwind(ptr ptr ptr long) ntdll.RtlVirtualUnwind

1 0

[tkreuzer] 43951: Add RtlAddFunctionTable, RtlDeleteFunctionTable, RtlInstallFunctionTableCallback stubs
by tkreuzer＠svn.reactos.org 04 Nov '09

04 Nov '09

Author: tkreuzer Date: Wed Nov 4 21:38:19 2009 New Revision: 43951 URL: http://svn.reactos.org/svn/reactos?rev=43951&view=rev Log: Add RtlAddFunctionTable, RtlDeleteFunctionTable, RtlInstallFunctionTableCallback stubs Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] Wed Nov 4 21:38:19 2009 @@ -158,6 +158,41 @@ /* Nothing found, return NULL */ return NULL; +} + +BOOLEAN +NTAPI +RtlAddFunctionTable( + IN PRUNTIME_FUNCTION FunctionTable, + IN DWORD EntryCount, + IN DWORD64 BaseAddress, + IN ULONGLONG TargetGp) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOLEAN +NTAPI +RtlDeleteFunctionTable( + IN PRUNTIME_FUNCTION FunctionTable) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOLEAN +NTAPI +RtlInstallFunctionTableCallback( + IN DWORD64 TableIdentifier, + IN DWORD64 BaseAddress, + IN DWORD Length, + IN PGET_RUNTIME_FUNCTION_CALLBACK Callback, + IN PVOID Context, + IN PCWSTR OutOfProcessCallbackDll) +{ + UNIMPLEMENTED; + return FALSE; } void

1 0

[ablackmann] 43950: Add some helpful debug output to LAYOUT parsing, and enable DoLAYOUT code. The tool is able to fully decode/parse the test.klc English US layout file!
by ablackmann＠svn.reactos.org 04 Nov '09

04 Nov '09

Author: ablackmann Date: Wed Nov 4 20:52:36 2009 New Revision: 43950 URL: http://svn.reactos.org/svn/reactos?rev=43950&view=rev Log: Add some helpful debug output to LAYOUT parsing, and enable DoLAYOUT code. The tool is able to fully decode/parse the test.klc English US layout file! Modified: trunk/reactos/tools/kbdtool/parser.c Modified: trunk/reactos/tools/kbdtool/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/parser.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] Wed Nov 4 20:52:36 2009 @@ -890,9 +890,6 @@ PLAYOUTENTRY Entry; UCHAR CharacterType, LigatureChar; - /* Only attempt this is Verbose is enabled (FOR DEBUGGING ONLY) */ - if (!Verbose) return SkipLines(); - /* Zero out the layout */ memset(LayoutData, 0, sizeof(LAYOUT)); @@ -930,6 +927,7 @@ } /* One more */ + DPRINT1("RAW ENTRY: [%x %s %s]\n", ScanCode, Token, Cap); Entry++; if (++ScanCodeCount >= 110) { @@ -988,6 +986,8 @@ /* Get the virtual key from the entry */ VirtualKey = getVKNum(Token); Entry->VirtualKey = VirtualKey; + DPRINT1("ENTRY: [%x %x %x %s] with ", + Entry->VirtualKey, Entry->OriginalVirtualKey, Entry->ScanCode, Entry->Name); /* Make sure it's valid */ if (VirtualKey == 0xFFFF) @@ -1024,6 +1024,7 @@ State[6], State[7]); Entry->StateCount = Count; + DPRINT1("%d STATES: [", Count); /* Check if there are less than 2 states */ if ((Count < 2) && (FullEntry)) @@ -1037,6 +1038,7 @@ for (i = 0; i < Count; i++) { /* Check if this is an undefined state */ + DPRINT1("%s ", State[i]); if (!strcmp(State[i], "-1")) { /* No data for this state */ @@ -1061,6 +1063,7 @@ } /* Check for sanity checks */ + DPRINT1("]\n"); if (SanityCheck) { /* Not yet handled... */

1 0

[ablackmann] 43949: Implement getCharacterInfo so the tool can now handle most LAYOUT entries, but not complicated ligature entries (dead keys are fine though). Also cleaned up the parsing loop of DoLAYOUT to avoid a goto, and finally added detection of SGCAP entries (in which case the tool will fail, since these are complex and not needed for now). The main parsing loop is pretty much done, now the tool "just" has to merge the states and perform a check for duplicate entries. Then it'll be read
by ablackmann＠svn.reactos.org 04 Nov '09

04 Nov '09

Author: ablackmann Date: Wed Nov 4 20:38:21 2009 New Revision: 43949 URL: http://svn.reactos.org/svn/reactos?rev=43949&view=rev Log: Implement getCharacterInfo so the tool can now handle most LAYOUT entries, but not complicated ligature entries (dead keys are fine though). Also cleaned up the parsing loop of DoLAYOUT to avoid a goto, and finally added detection of SGCAP entries (in which case the tool will fail, since these are complex and not needed for now). The main parsing loop is pretty much done, now the tool "just" has to merge the states and perform a check for duplicate entries. Then it'll be ready to generate the output files. Modified: trunk/reactos/tools/kbdtool/parser.c Modified: trunk/reactos/tools/kbdtool/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/parser.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] Wed Nov 4 20:38:21 2009 @@ -42,7 +42,7 @@ UCHAR OriginalVirtualKey; ULONG Cap; ULONG StateCount; - ULONGLONG CharData[8]; + ULONG CharData[8]; ULONG DeadCharData[8]; ULONG OtherCharData[8]; struct LAYOUTENTRY* CapData; @@ -60,7 +60,7 @@ #define KEYWORD_COUNT 17 -extern BOOLEAN Verbose, UnicodeFile; +extern BOOLEAN Verbose, UnicodeFile, SanityCheck; extern PCHAR gpszFileName; extern FILE* gfpInput; CHAR gBuf[256]; @@ -318,12 +318,74 @@ UCHAR getCharacterInfo(IN PCHAR State, - IN PLAYOUTENTRY Entry, + OUT PULONG EntryChar, OUT PCHAR LigatureChar) { - /* FIXME: NOT YET IMPLEMENTED */ - ASSERT(FALSE); - return 0; + ULONG Length; + ULONG CharInfo = CHAR_NORMAL_KEY; + UCHAR StateChar; + ULONG CharCode; + + /* Calculate the length of the state */ + Length = strlen(State); + + /* Check if this is at least a simple key state */ + if (Length > 1) + { + /* Read the first character and check if it's a dead key */ + StateChar = State[Length - 1]; + if (StateChar == '@') + { + /* This is a dead key */ + CharInfo = CHAR_DEAD_KEY; + } + else if (StateChar == '%') + { + /* This is another key */ + CharInfo = CHAR_OTHER_KEY; + } + } + + /* Check if this is a numerical key state */ + if ((Length - 1) >= 2) + { + /* Scan for extended character code entry */ + if ((sscanf(State, "%6x", &CharCode) == 1) && + ((Length == 5) && (State[0] == '0') || + (Length == 6) && ((State[0] == '0') && (State[1] == '0')))) + { + /* Handle a ligature key */ + CharInfo = CHAR_LIGATURE_KEY; + + /* Not yet handled */ + printf("Ligatured character entries not yet supported!\n"); + exit(1); + } + else + { + /* Get the normal character entry */ + if (sscanf(State, "%4x", &CharCode) == 1) + { + /* Does the caller want the key? */ + if (EntryChar) *EntryChar = CharCode; + } + else + { + /* The entry is totally invalid */ + if (Verbose) printf("An unparseable character entry '%s' was found.\n", State); + if (EntryChar) *EntryChar = 0; + CharInfo = CHAR_INVALID_KEY; + } + } + } + else + { + /* Save the key if the caller requested it */ + if (EntryChar) *EntryChar = *State; + } + + /* Return the type of character this is */ + return CharInfo; } BOOLEAN @@ -892,34 +954,34 @@ /* Fill out the entry */ Entry->VirtualKey = getVKNum(Token); - goto FillEntry; + break; } - - /* If we found it, process it */ - if (ScanCode == CurrentCode) break; - } - - /* Make sure we didn't already process it */ - if (ScVk[i].Processed) - { - /* Fail */ - printf("Scancode %X was previously defined.\n", ScanCode); - exit(1); - } - - /* Check if there is a valid virtual key */ - if (ScVk[i].VirtualKey == 0xFFFF) - { - /* Fail */ - printf("The Scancode you tried to use (%X) is reserved.\n", ScanCode); - exit(1); - } - - /* Fill out the entry */ - Entry->OriginalVirtualKey = ScVk[i].VirtualKey; - Entry->Name = ScVk[i].Name; - -FillEntry: + else if (ScanCode == CurrentCode) + { + /* Make sure we didn't already process it */ + if (ScVk[i].Processed) + { + /* Fail */ + printf("Scancode %X was previously defined.\n", ScanCode); + exit(1); + } + + /* Check if there is a valid virtual key */ + if (ScVk[i].VirtualKey == 0xFFFF) + { + /* Fail */ + printf("The Scancode you tried to use (%X) is reserved.\n", ScanCode); + exit(1); + } + + /* Fill out the entry */ + Entry->OriginalVirtualKey = ScVk[i].VirtualKey; + Entry->Name = ScVk[i].Name; + break; + } + } + + /* The entry is now processed */ Entry->Processed = TRUE; ScVk[i].Processed = TRUE; @@ -983,7 +1045,9 @@ } /* Otherwise, check what kind of character this is */ - CharacterType = getCharacterInfo(State[i], Entry, &LigatureChar); + CharacterType = getCharacterInfo(State[i], + &Entry->CharData[i], + &LigatureChar); if (CharacterType == CHAR_DEAD_KEY) { /* Save it as such */ @@ -995,6 +1059,22 @@ Entry->OtherCharData[i] = 1; } } + + /* Check for sanity checks */ + if (SanityCheck) + { + /* Not yet handled... */ + printf("Sanity checks not yet handled!\n"); + exit(1); + } + + /* Check if we had SGCAP data */ + if (Entry->Cap & 2) + { + /* Not yet handled... */ + printf("SGCAP state not yet handled!\n"); + exit(1); + } } /* Skip what's left */

1 0

[cwittich] 43948: sync wininet with wine 1.1.32
by cwittich＠svn.reactos.org 04 Nov '09

04 Nov '09

Author: cwittich Date: Wed Nov 4 12:16:25 2009 New Revision: 43948 URL: http://svn.reactos.org/svn/reactos?rev=43948&view=rev Log: sync wininet with wine 1.1.32 Modified: trunk/reactos/dll/win32/wininet/cookie.c trunk/reactos/dll/win32/wininet/dialogs.c trunk/reactos/dll/win32/wininet/ftp.c trunk/reactos/dll/win32/wininet/http.c trunk/reactos/dll/win32/wininet/internet.c trunk/reactos/dll/win32/wininet/internet.h trunk/reactos/dll/win32/wininet/netconnection.c trunk/reactos/dll/win32/wininet/resource.h trunk/reactos/dll/win32/wininet/urlcache.c trunk/reactos/dll/win32/wininet/utility.c trunk/reactos/dll/win32/wininet/wininet.rbuild trunk/reactos/dll/win32/wininet/wininet.spec trunk/reactos/dll/win32/wininet/wininet_Bg.rc trunk/reactos/dll/win32/wininet/wininet_Cs.rc trunk/reactos/dll/win32/wininet/wininet_Da.rc trunk/reactos/dll/win32/wininet/wininet_De.rc trunk/reactos/dll/win32/wininet/wininet_En.rc trunk/reactos/dll/win32/wininet/wininet_Eo.rc trunk/reactos/dll/win32/wininet/wininet_Es.rc trunk/reactos/dll/win32/wininet/wininet_Fi.rc trunk/reactos/dll/win32/wininet/wininet_Fr.rc trunk/reactos/dll/win32/wininet/wininet_Hu.rc trunk/reactos/dll/win32/wininet/wininet_It.rc trunk/reactos/dll/win32/wininet/wininet_Ja.rc trunk/reactos/dll/win32/wininet/wininet_Ko.rc trunk/reactos/dll/win32/wininet/wininet_Nl.rc trunk/reactos/dll/win32/wininet/wininet_No.rc trunk/reactos/dll/win32/wininet/wininet_Pl.rc trunk/reactos/dll/win32/wininet/wininet_Pt.rc trunk/reactos/dll/win32/wininet/wininet_Ro.rc trunk/reactos/dll/win32/wininet/wininet_Ru.rc trunk/reactos/dll/win32/wininet/wininet_Si.rc trunk/reactos/dll/win32/wininet/wininet_Sv.rc trunk/reactos/dll/win32/wininet/wininet_Tr.rc trunk/reactos/dll/win32/wininet/wininet_Uk.rc trunk/reactos/dll/win32/wininet/wininet_Zh.rc trunk/reactos/include/psdk/wininet.h trunk/reactos/include/psdk/winineti.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/wininet/cookie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/cookie.c… Modified: trunk/reactos/dll/win32/wininet/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/dialogs.… Modified: trunk/reactos/dll/win32/wininet/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/ftp.c?re… Modified: trunk/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/http.c?r… Modified: trunk/reactos/dll/win32/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… Modified: trunk/reactos/dll/win32/wininet/internet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… Modified: trunk/reactos/dll/win32/wininet/netconnection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/netconne… Modified: trunk/reactos/dll/win32/wininet/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/resource… Modified: trunk/reactos/dll/win32/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/urlcache… Modified: trunk/reactos/dll/win32/wininet/utility.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/utility.… Modified: trunk/reactos/dll/win32/wininet/wininet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet.… Modified: trunk/reactos/dll/win32/wininet/wininet.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet.… Modified: trunk/reactos/dll/win32/wininet/wininet_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/include/psdk/wininet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wininet.h?rev… Modified: trunk/reactos/include/psdk/winineti.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winineti.h?re…

1 0

[ablackmann] 43947: Started adding support for reading the different character states and the cap data (including detecting SGCAP). Now the tool has to determine the type of each character defined at every stage (dead, valid, invalid, ligature, etc...) and save the character in the appropriate slot. Dead and other keys are currently handled, as are undefined keys. Major work remains to be done...
by ablackmann＠svn.reactos.org 04 Nov '09

04 Nov '09

Author: ablackmann Date: Wed Nov 4 05:49:00 2009 New Revision: 43947 URL: http://svn.reactos.org/svn/reactos?rev=43947&view=rev Log: Started adding support for reading the different character states and the cap data (including detecting SGCAP). Now the tool has to determine the type of each character defined at every stage (dead, valid, invalid, ligature, etc...) and save the character in the appropriate slot. Dead and other keys are currently handled, as are undefined keys. Major work remains to be done... Modified: trunk/reactos/tools/kbdtool/parser.c Modified: trunk/reactos/tools/kbdtool/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/parser.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] Wed Nov 4 05:49:00 2009 @@ -40,9 +40,9 @@ USHORT ScanCode; UCHAR VirtualKey; UCHAR OriginalVirtualKey; - UCHAR Cap; + ULONG Cap; ULONG StateCount; - ULONG CharData[8]; + ULONGLONG CharData[8]; ULONG DeadCharData[8]; ULONG OtherCharData[8]; struct LAYOUTENTRY* CapData; @@ -250,6 +250,11 @@ {0xe6, "RGROUPSHIFT"} }; +#define CHAR_NORMAL_KEY 0 +#define CHAR_DEAD_KEY 1 +#define CHAR_OTHER_KEY 2 +#define CHAR_INVALID_KEY 3 +#define CHAR_LIGATURE_KEY 4 /* FUNCTIONS ******************************************************************/ @@ -311,6 +316,16 @@ return -1; } +UCHAR +getCharacterInfo(IN PCHAR State, + IN PLAYOUTENTRY Entry, + OUT PCHAR LigatureChar) +{ + /* FIXME: NOT YET IMPLEMENTED */ + ASSERT(FALSE); + return 0; +} + BOOLEAN NextLine(PCHAR LineBuffer, ULONG BufferSize, @@ -806,9 +821,12 @@ ULONG TokenCount; ULONG VirtualKey; ULONG i; + ULONG Count; BOOLEAN FullEntry; + CHAR State[8][8]; ULONG ScanCodeCount = -1; PLAYOUTENTRY Entry; + UCHAR CharacterType, LigatureChar; /* Only attempt this is Verbose is enabled (FOR DEBUGGING ONLY) */ if (!Verbose) return SkipLines(); @@ -915,6 +933,67 @@ /* Warn the user */ if (Verbose) printf("An invalid Virtual Key '%s' was defined.\n", Token); continue; + } + + /* Is this a full entry */ + if (FullEntry) + { + /* Do we have SGCAP data? Set cap mode to 2 */ + if (!strcmp(Cap, "SGCAP")) *Cap = '2'; + + /* Read the cap mode */ + if (sscanf(Cap, "%1d[012]", &Entry->Cap) != 1) + { + /* Invalid cap mode */ + printf("invalid Cap specified (%s). Must be 0, 1, or 2.\n", Cap); + exit(1); + } + } + + /* Read the states */ + Count = sscanf(gBuf, + " %*s %*s %*s %s %s %s %s %s %s %s %s", + State[0], + State[1], + State[2], + State[3], + State[4], + State[5], + State[6], + State[7]); + Entry->StateCount = Count; + + /* Check if there are less than 2 states */ + if ((Count < 2) && (FullEntry)) + { + /* Fail */ + printf("You must have at least 2 characters.\n"); + exit(1); + } + + /* Loop all states */ + for (i = 0; i < Count; i++) + { + /* Check if this is an undefined state */ + if (!strcmp(State[i], "-1")) + { + /* No data for this state */ + Entry->CharData[i] = -1; + continue; + } + + /* Otherwise, check what kind of character this is */ + CharacterType = getCharacterInfo(State[i], Entry, &LigatureChar); + if (CharacterType == CHAR_DEAD_KEY) + { + /* Save it as such */ + Entry->DeadCharData[i] = 1; + } + else if (CharacterType == CHAR_OTHER_KEY) + { + /* Save it as such */ + Entry->OtherCharData[i] = 1; + } } }

1 0

[janderwald] 43946: - Add sanity checks - Implement IDirectSoundCaptureBuffer8::Stop - Implement changing the stream format for secondary buffers - Silence debug flood
by janderwald＠svn.reactos.org 04 Nov '09

04 Nov '09

Author: janderwald Date: Wed Nov 4 03:16:49 2009 New Revision: 43946 URL: http://svn.reactos.org/svn/reactos?rev=43946&view=rev Log: - Add sanity checks - Implement IDirectSoundCaptureBuffer8::Stop - Implement changing the stream format for secondary buffers - Silence debug flood Modified: trunk/reactos/dll/directx/dsound_new/capturebuffer.c trunk/reactos/dll/directx/dsound_new/misc.c trunk/reactos/dll/directx/dsound_new/precomp.h trunk/reactos/dll/directx/dsound_new/primary.c trunk/reactos/dll/directx/dsound_new/secondary.c Modified: trunk/reactos/dll/directx/dsound_new/capturebuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/cap… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/capturebuffer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/capturebuffer.c [iso-8859-1] Wed Nov 4 03:16:49 2009 @@ -335,8 +335,10 @@ if (This->State == KSSTATE_RUN) return DS_OK; - /* sanity check */ - ASSERT(This->hPin); + + /* check if there is a pin instance */ + if (!This->hPin) + return DSERR_GENERIC; /* setup request */ Property.Set = KSPROPSETID_Connection; @@ -385,8 +387,42 @@ WINAPI IDirectSoundCaptureBufferImpl_Stop( LPDIRECTSOUNDCAPTUREBUFFER8 iface ) { - UNIMPLEMENTED - return DSERR_INVALIDPARAM; + KSPROPERTY Property; + DWORD Result; + KSSTATE State; + + LPCDirectSoundCaptureBufferImpl This = (LPCDirectSoundCaptureBufferImpl)CONTAINING_RECORD(iface, CDirectSoundCaptureBufferImpl, lpVtbl); + + if (This->State == KSSTATE_STOP) + { + /* stream has already been stopped */ + return DS_OK; + } + + if (!This->hPin) + return DSERR_GENERIC; + + /* setup request */ + Property.Set = KSPROPSETID_Connection; + Property.Id = KSPROPERTY_CONNECTION_STATE; + Property.Flags = KSPROPERTY_TYPE_SET; + State = KSSTATE_STOP; + + + /* set pin to stop */ + Result = SyncOverlappedDeviceIoControl(This->hPin, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSPROPERTY), (PVOID)&State, sizeof(KSSTATE), NULL); + + ASSERT(Result == ERROR_SUCCESS); + + if (Result == ERROR_SUCCESS) + { + /* store result */ + This->State = State; + return DS_OK; + } + + DPRINT("Failed to stop pin\n"); + return DSERR_GENERIC; } HRESULT Modified: trunk/reactos/dll/directx/dsound_new/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/mis… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/misc.c [iso-8859-1] Wed Nov 4 03:16:49 2009 @@ -12,6 +12,45 @@ const GUID KSPROPSETID_Pin = {0x8C134960L, 0x51AD, 0x11CF, {0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00}}; const GUID KSPROPSETID_Topology = {0x720D4AC0L, 0x7533, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; const GUID KSPROPSETID_Audio = {0x45FFAAA0L, 0x6E1B, 0x11D0, {0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}}; + +BOOL +SetPinFormat( + IN HANDLE hPin, + IN LPWAVEFORMATEX WaveFormatEx) +{ + DWORD dwResult; + KSPROPERTY Property; + KSDATAFORMAT_WAVEFORMATEX DataFormat; + + /* setup connection request */ + Property.Id = KSPROPERTY_CONNECTION_DATAFORMAT; + Property.Set = KSPROPSETID_Connection; + Property.Flags = KSPROPERTY_TYPE_SET; + + /* setup data format */ + DataFormat.WaveFormatEx.wFormatTag = WaveFormatEx->wFormatTag; + DataFormat.WaveFormatEx.nSamplesPerSec = WaveFormatEx->nSamplesPerSec; + DataFormat.WaveFormatEx.nBlockAlign = WaveFormatEx->nBlockAlign; + DataFormat.WaveFormatEx.cbSize = 0; + DataFormat.DataFormat.FormatSize = sizeof(KSDATAFORMAT) + sizeof(WAVEFORMATEX); + DataFormat.DataFormat.Flags = 0; + DataFormat.DataFormat.Reserved = 0; + DataFormat.DataFormat.MajorFormat = KSDATAFORMAT_TYPE_AUDIO; + DataFormat.DataFormat.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + DataFormat.DataFormat.Specifier = KSDATAFORMAT_SPECIFIER_WAVEFORMATEX; + DataFormat.DataFormat.SampleSize = 4; + DataFormat.WaveFormatEx.nChannels = WaveFormatEx->nChannels; + DataFormat.WaveFormatEx.nAvgBytesPerSec = WaveFormatEx->nAvgBytesPerSec; + DataFormat.WaveFormatEx.wBitsPerSample = WaveFormatEx->wBitsPerSample; + + dwResult = SyncOverlappedDeviceIoControl(hPin, IOCTL_KS_PROPERTY, (LPVOID)&Property, sizeof(KSPROPERTY),(LPVOID)&DataFormat, sizeof(KSDATAFORMAT_WAVEFORMATEX), NULL); + + if (dwResult == ERROR_SUCCESS) + return TRUE; + else + return FALSE; +} + BOOL DoDataIntersection( Modified: trunk/reactos/dll/directx/dsound_new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/pre… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/precomp.h [iso-8859-1] Wed Nov 4 03:16:49 2009 @@ -15,7 +15,7 @@ #include <dsconf.h> #include <vfwmsgs.h> #include <setupapi.h> -#define YDEBUG +#define NDEBUG #include <debug.h> #include <ks.h> #include <ksmedia.h> @@ -111,6 +111,11 @@ /* misc.c */ BOOL +SetPinFormat( + IN HANDLE hPin, + IN LPWAVEFORMATEX WaveFormatEx); + +BOOL CreateCompatiblePin( IN HANDLE hFilter, IN DWORD PinId, Modified: trunk/reactos/dll/directx/dsound_new/primary.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/pri… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/primary.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/primary.c [iso-8859-1] Wed Nov 4 03:16:49 2009 @@ -519,8 +519,14 @@ if (This->hPin) { - /* fixme change format */ - ASSERT(0); + // FIXME + // check if multiple buffers are active + // in that case need mixing + + if (SetPinFormat(This->hPin, pcfxFormat)) + return DS_OK; + else + return DSERR_GENERIC; } do Modified: trunk/reactos/dll/directx/dsound_new/secondary.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/sec… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/secondary.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/secondary.c [iso-8859-1] Wed Nov 4 03:16:49 2009 @@ -294,25 +294,29 @@ return DSERR_INVALIDPARAM; } - DPRINT("SecondaryDirectSoundBuffer8Impl_fnPlay dwPriority %x dwFlags %x\n", dwPriority, dwFlags); - hResult = PrimaryDirectSoundBuffer_SetFormat(This->PrimaryBuffer, This->Format, (dwFlags & DSBPLAY_LOOPING)); - - DPRINT("Result %x\n", hResult); + /* sanity check */ + ASSERT(dwFlags & DSBPLAY_LOOPING); + + /* set dataformat */ + hResult = PrimaryDirectSoundBuffer_SetFormat(This->PrimaryBuffer, This->Format, TRUE); + if (!SUCCEEDED(hResult)) { /* failed */ + DPRINT1("Failed to set format Tag %u Samples %u Bytes %u nChannels %u\n", This->Format->wFormatTag, This->Format->nSamplesPerSec, This->Format->wBitsPerSample, This->Format->nChannels); return hResult; } + /* start primary buffer */ PrimaryDirectSoundBuffer_SetState(This->PrimaryBuffer, KSSTATE_RUN); - - + /* acquire primary buffer */ PrimaryDirectSoundBuffer_AcquireLock(This->PrimaryBuffer); - + /* HACK write buffer */ PrimaryDirectSoundBuffer_Write(This->PrimaryBuffer, This->Buffer, This->BufferSize); - + /* release primary buffer */ PrimaryDirectSoundBuffer_ReleaseLock(This->PrimaryBuffer); + DPRINT1("SetFormatSuccess PrimaryBuffer %p\n", This->PrimaryBuffer); return DS_OK; }

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