Ros-diffs February 2009

ros-diffs@reactos.org

29 participants
559 discussions

[tkreuzer] 39600: Add PPROCESSOR_IDLE_FUNCTION, fix PROCESSOR_POWER_STATE

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Feb 13 20:19:52 2009 New Revision: 39600 URL: http://svn.reactos.org/svn/reactos?rev=39600&view=rev Log: Add PPROCESSOR_IDLE_FUNCTION, fix PROCESSOR_POWER_STATE Modified: trunk/reactos/include/ndk/potypes.h Modified: trunk/reactos/include/ndk/potypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/potypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/potypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/potypes.h [iso-8859-1] Fri Feb 13 20:19:52 2009 @@ -42,9 +42,16 @@ // // Processor Power State Data // +struct _PROCESSOR_POWER_STATE; + +typedef +VOID +(FASTCALL *PPROCESSOR_IDLE_FUNCTION)( + struct _PROCESSOR_POWER_STATE *PState); + typedef struct _PROCESSOR_POWER_STATE { - PVOID IdleFunction; + PPROCESSOR_IDLE_FUNCTION IdleFunction; ULONG Idle0KernelTimeLimit; ULONG Idle0LastTime; PVOID IdleHandlers; @@ -61,10 +68,10 @@ UCHAR ThermalThrottleIndex; ULONG LastKernelUserTime; ULONG PerfIdleTime; - ULONG DebugDelta; + ULONGLONG DebugDelta; ULONG DebugCount; ULONG LastSysTime; - ULONG TotalIdleStateTime[3]; + ULONGLONG TotalIdleStateTime[3]; ULONG TotalIdleTransitions[3]; ULONGLONG PreviousC3StateTime; UCHAR KneeThrottleIndex;

15 years, 10 months

[tkreuzer] 39599: Revert last commit. MS doesn't want poor ddk users mess with their secret structures and instead present them only some censored stuff.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Feb 13 20:10:32 2009 New Revision: 39599 URL: http://svn.reactos.org/svn/reactos?rev=39599&view=rev Log: Revert last commit. MS doesn't want poor ddk users mess with their secret structures and instead present them only some censored stuff. Modified: trunk/reactos/include/ddk/ntpoapi.h trunk/reactos/include/ndk/potypes.h Modified: trunk/reactos/include/ddk/ntpoapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntpoapi.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ntpoapi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntpoapi.h [iso-8859-1] Fri Feb 13 20:10:32 2009 @@ -270,64 +270,6 @@ ULONG CurrentIdleState; } PROCESSOR_POWER_INFORMATION, *PPROCESSOR_POWER_INFORMATION; -// -// Processor Power State Data -// -struct _PROCESSOR_POWER_STATE; - -typedef -VOID -(FASTCALL *PPROCESSOR_IDLE_FUNCTION)( - struct _PROCESSOR_POWER_STATE *PState); - -typedef struct _PROCESSOR_POWER_STATE -{ - PPROCESSOR_IDLE_FUNCTION IdleFunction; - ULONG Idle0KernelTimeLimit; - ULONG Idle0LastTime; - PVOID IdleHandlers; - PVOID IdleState; - ULONG IdleHandlersCount; - ULONGLONG LastCheck; - PROCESSOR_IDLE_TIMES IdleTimes; - ULONG IdleTime1; - ULONG PromotionCheck; - ULONG IdleTime2; - UCHAR CurrentThrottle; - UCHAR ThermalThrottleLimit; - UCHAR CurrentThrottleIndex; - UCHAR ThermalThrottleIndex; - ULONG LastKernelUserTime; - ULONG PerfIdleTime; - ULONGLONG DebugDelta; - ULONG DebugCount; - ULONG LastSysTime; - ULONGLONG TotalIdleStateTime[3]; - ULONG TotalIdleTransitions[3]; - ULONGLONG PreviousC3StateTime; - UCHAR KneeThrottleIndex; - UCHAR ThrottleLimitIndex; - UCHAR PerfStatesCount; - UCHAR ProcessorMinThrottle; - UCHAR ProcessorMaxThrottle; - UCHAR LastBusyPercentage; - UCHAR LastC3Percentage; - UCHAR LastAdjustedBusyPercentage; - ULONG PromotionCount; - ULONG DemotionCount; - ULONG ErrorCount; - ULONG RetryCount; - ULONG Flags; - LARGE_INTEGER PerfCounterFrequency; - ULONG PerfTickCount; - KTIMER PerfTimer; - KDPC PerfDpc; - PROCESSOR_PERF_STATE *PerfStates; - PVOID PerfSetThrottle; - ULONG LastC3KernelUserTime; - ULONG Spare1[1]; -} PROCESSOR_POWER_STATE, *PPROCESSOR_POWER_STATE; - #ifdef __cplusplus } #endif Modified: trunk/reactos/include/ndk/potypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/potypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/potypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/potypes.h [iso-8859-1] Fri Feb 13 20:10:32 2009 @@ -40,6 +40,57 @@ #ifndef NTOS_MODE_USER // +// Processor Power State Data +// +typedef struct _PROCESSOR_POWER_STATE +{ + PVOID IdleFunction; + ULONG Idle0KernelTimeLimit; + ULONG Idle0LastTime; + PVOID IdleHandlers; + PVOID IdleState; + ULONG IdleHandlersCount; + ULONGLONG LastCheck; + PROCESSOR_IDLE_TIMES IdleTimes; + ULONG IdleTime1; + ULONG PromotionCheck; + ULONG IdleTime2; + UCHAR CurrentThrottle; + UCHAR ThermalThrottleLimit; + UCHAR CurrentThrottleIndex; + UCHAR ThermalThrottleIndex; + ULONG LastKernelUserTime; + ULONG PerfIdleTime; + ULONG DebugDelta; + ULONG DebugCount; + ULONG LastSysTime; + ULONG TotalIdleStateTime[3]; + ULONG TotalIdleTransitions[3]; + ULONGLONG PreviousC3StateTime; + UCHAR KneeThrottleIndex; + UCHAR ThrottleLimitIndex; + UCHAR PerfStatesCount; + UCHAR ProcessorMinThrottle; + UCHAR ProcessorMaxThrottle; + UCHAR LastBusyPercentage; + UCHAR LastC3Percentage; + UCHAR LastAdjustedBusyPercentage; + ULONG PromotionCount; + ULONG DemotionCount; + ULONG ErrorCount; + ULONG RetryCount; + ULONG Flags; + LARGE_INTEGER PerfCounterFrequency; + ULONG PerfTickCount; + KTIMER PerfTimer; + KDPC PerfDpc; + PROCESSOR_PERF_STATE *PerfStates; + PVOID PerfSetThrottle; + ULONG LastC3KernelUserTime; + ULONG Spare1[1]; +} PROCESSOR_POWER_STATE, *PPROCESSOR_POWER_STATE; + +// // Device Notification Structure // typedef struct _PO_DEVICE_NOTIFY

15 years, 10 months

[tkreuzer] 39598: Add PPROCESSOR_IDLE_FUNCTION, fix PROCESSOR_POWER_STATE and move it from ndk to ntpoapi.h

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Feb 13 19:57:28 2009 New Revision: 39598 URL: http://svn.reactos.org/svn/reactos?rev=39598&view=rev Log: Add PPROCESSOR_IDLE_FUNCTION, fix PROCESSOR_POWER_STATE and move it from ndk to ntpoapi.h Modified: trunk/reactos/include/ddk/ntpoapi.h trunk/reactos/include/ndk/potypes.h Modified: trunk/reactos/include/ddk/ntpoapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntpoapi.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ntpoapi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntpoapi.h [iso-8859-1] Fri Feb 13 19:57:28 2009 @@ -270,6 +270,64 @@ ULONG CurrentIdleState; } PROCESSOR_POWER_INFORMATION, *PPROCESSOR_POWER_INFORMATION; +// +// Processor Power State Data +// +struct _PROCESSOR_POWER_STATE; + +typedef +VOID +(FASTCALL *PPROCESSOR_IDLE_FUNCTION)( + struct _PROCESSOR_POWER_STATE *PState); + +typedef struct _PROCESSOR_POWER_STATE +{ + PPROCESSOR_IDLE_FUNCTION IdleFunction; + ULONG Idle0KernelTimeLimit; + ULONG Idle0LastTime; + PVOID IdleHandlers; + PVOID IdleState; + ULONG IdleHandlersCount; + ULONGLONG LastCheck; + PROCESSOR_IDLE_TIMES IdleTimes; + ULONG IdleTime1; + ULONG PromotionCheck; + ULONG IdleTime2; + UCHAR CurrentThrottle; + UCHAR ThermalThrottleLimit; + UCHAR CurrentThrottleIndex; + UCHAR ThermalThrottleIndex; + ULONG LastKernelUserTime; + ULONG PerfIdleTime; + ULONGLONG DebugDelta; + ULONG DebugCount; + ULONG LastSysTime; + ULONGLONG TotalIdleStateTime[3]; + ULONG TotalIdleTransitions[3]; + ULONGLONG PreviousC3StateTime; + UCHAR KneeThrottleIndex; + UCHAR ThrottleLimitIndex; + UCHAR PerfStatesCount; + UCHAR ProcessorMinThrottle; + UCHAR ProcessorMaxThrottle; + UCHAR LastBusyPercentage; + UCHAR LastC3Percentage; + UCHAR LastAdjustedBusyPercentage; + ULONG PromotionCount; + ULONG DemotionCount; + ULONG ErrorCount; + ULONG RetryCount; + ULONG Flags; + LARGE_INTEGER PerfCounterFrequency; + ULONG PerfTickCount; + KTIMER PerfTimer; + KDPC PerfDpc; + PROCESSOR_PERF_STATE *PerfStates; + PVOID PerfSetThrottle; + ULONG LastC3KernelUserTime; + ULONG Spare1[1]; +} PROCESSOR_POWER_STATE, *PPROCESSOR_POWER_STATE; + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/ndk/potypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/potypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/potypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/potypes.h [iso-8859-1] Fri Feb 13 19:57:28 2009 @@ -40,57 +40,6 @@ #ifndef NTOS_MODE_USER // -// Processor Power State Data -// -typedef struct _PROCESSOR_POWER_STATE -{ - PVOID IdleFunction; - ULONG Idle0KernelTimeLimit; - ULONG Idle0LastTime; - PVOID IdleHandlers; - PVOID IdleState; - ULONG IdleHandlersCount; - ULONGLONG LastCheck; - PROCESSOR_IDLE_TIMES IdleTimes; - ULONG IdleTime1; - ULONG PromotionCheck; - ULONG IdleTime2; - UCHAR CurrentThrottle; - UCHAR ThermalThrottleLimit; - UCHAR CurrentThrottleIndex; - UCHAR ThermalThrottleIndex; - ULONG LastKernelUserTime; - ULONG PerfIdleTime; - ULONG DebugDelta; - ULONG DebugCount; - ULONG LastSysTime; - ULONG TotalIdleStateTime[3]; - ULONG TotalIdleTransitions[3]; - ULONGLONG PreviousC3StateTime; - UCHAR KneeThrottleIndex; - UCHAR ThrottleLimitIndex; - UCHAR PerfStatesCount; - UCHAR ProcessorMinThrottle; - UCHAR ProcessorMaxThrottle; - UCHAR LastBusyPercentage; - UCHAR LastC3Percentage; - UCHAR LastAdjustedBusyPercentage; - ULONG PromotionCount; - ULONG DemotionCount; - ULONG ErrorCount; - ULONG RetryCount; - ULONG Flags; - LARGE_INTEGER PerfCounterFrequency; - ULONG PerfTickCount; - KTIMER PerfTimer; - KDPC PerfDpc; - PROCESSOR_PERF_STATE *PerfStates; - PVOID PerfSetThrottle; - ULONG LastC3KernelUserTime; - ULONG Spare1[1]; -} PROCESSOR_POWER_STATE, *PPROCESSOR_POWER_STATE; - -// // Device Notification Structure // typedef struct _PO_DEVICE_NOTIFY

15 years, 10 months

[jmorlan] 39597: Make delayed environment-variable expansions actually be delayed.

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Fri Feb 13 19:13:17 2009 New Revision: 39597 URL: http://svn.reactos.org/svn/reactos?rev=39597&view=rev Log: Make delayed environment-variable expansions actually be delayed. Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/if.c trunk/reactos/base/shell/cmd/redir.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Fri Feb 13 19:13:17 2009 @@ -868,6 +868,7 @@ { BOOL bNewBatch = TRUE; PARSED_COMMAND *Sub; + LPTSTR ExpandedLine; BOOL Success = TRUE; if (!PerformRedirection(Cmd->Redirections)) @@ -879,7 +880,14 @@ if(bc) bNewBatch = FALSE; - Success = DoCommand(Cmd->Command.CommandLine); + ExpandedLine = DoDelayedExpansion(Cmd->Command.CommandLine); + if (!ExpandedLine) + { + Success = FALSE; + break; + } + Success = DoCommand(ExpandedLine); + cmd_free(ExpandedLine); if(bNewBatch && bc) AddBatchRedirection(&Cmd->Redirections); @@ -1097,8 +1105,11 @@ return NULL; } +BOOL bNoInteractive; +BOOL bIsBatch; + BOOL -SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim, BOOL bIsBatch) +SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim) { #define APPEND(From, Length) { \ if (Dest + (Length) > DestEnd) \ @@ -1250,14 +1261,26 @@ #undef APPEND1 } +LPTSTR +DoDelayedExpansion(LPTSTR Line) +{ + TCHAR Buf[CMDLINE_LENGTH]; + if (!_tcschr(Line, _T('!'))) + return cmd_dup(Line); + + /* FIXME: Delayed substitutions actually aren't quite the same as + * immediate substitutions. In particular, it's possible to escape + * the exclamation point using ^. */ + if (!SubstituteVars(Line, Buf, _T('!'))) + return NULL; + return cmd_dup(Buf); +} + /* * do the prompt/input/process loop * */ - -BOOL bNoInteractive; -BOOL bIsBatch; BOOL ReadLine (TCHAR *commandline, BOOL bMore) @@ -1299,15 +1322,7 @@ bIsBatch = TRUE; } - if (!SubstituteVars(ip, commandline, _T('%'), bIsBatch)) - return FALSE; - - /* FIXME: !vars! should be substituted later, after parsing. */ - if (!SubstituteVars(commandline, readline, _T('!'), bIsBatch)) - return FALSE; - _tcscpy(commandline, readline); - - return TRUE; + return SubstituteVars(ip, commandline, _T('%')); } static INT Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Fri Feb 13 19:13:17 2009 @@ -102,6 +102,7 @@ LPCTSTR GetEnvVarOrSpecial ( LPCTSTR varName ); VOID AddBreakHandler (VOID); VOID RemoveBreakHandler (VOID); +LPTSTR DoDelayedExpansion(LPTSTR Line); BOOL DoCommand (LPTSTR line); BOOL ReadLine(TCHAR *commandline, BOOL bMore); int cmd_main (int argc, const TCHAR *argv[]); Modified: trunk/reactos/base/shell/cmd/if.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/if.c?rev=39… ============================================================================== --- trunk/reactos/base/shell/cmd/if.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/if.c [iso-8859-1] Fri Feb 13 19:13:17 2009 @@ -67,15 +67,30 @@ { INT result = FALSE; /* when set cause 'then' clause to be executed */ LPTSTR param; + LPTSTR Left = NULL, Right; + + if (Cmd->If.LeftArg) + { + Left = DoDelayedExpansion(Cmd->If.LeftArg); + if (!Left) + return FALSE; + } + Right = DoDelayedExpansion(Cmd->If.RightArg); + if (!Right) + { + cmd_free(Left); + return FALSE; + } if (Cmd->If.Operator == IF_CMDEXTVERSION) { /* IF CMDEXTVERSION n: check if Command Extensions version * is greater or equal to n */ - DWORD n = _tcstoul(Cmd->If.RightArg, &param, 10); + DWORD n = _tcstoul(Right, &param, 10); if (*param != _T('\0')) { - error_syntax(Cmd->If.RightArg); + error_syntax(Right); + cmd_free(Right); return FALSE; } result = (2 >= n); @@ -83,7 +98,7 @@ else if (Cmd->If.Operator == IF_DEFINED) { /* IF DEFINED var: check if environment variable exists */ - result = (GetEnvVarOrSpecial(Cmd->If.RightArg) != NULL); + result = (GetEnvVarOrSpecial(Right) != NULL); } else if (Cmd->If.Operator == IF_ERRORLEVEL) { @@ -91,7 +106,8 @@ INT n = _tcstol(Cmd->If.RightArg, &param, 10); if (*param != _T('\0')) { - error_syntax(Cmd->If.RightArg); + error_syntax(Right); + cmd_free(Right); return FALSE; } result = (nErrorLevel >= n); @@ -102,9 +118,9 @@ WIN32_FIND_DATA f; HANDLE hFind; - StripQuotes(Cmd->If.RightArg); + StripQuotes(Right); - hFind = FindFirstFile(Cmd->If.RightArg, &f); + hFind = FindFirstFile(Right, &f); if (hFind != INVALID_HANDLE_VALUE) { result = TRUE; @@ -120,11 +136,11 @@ if (Cmd->If.Operator == IF_STRINGEQ) { /* IF str1 == str2 */ - result = StringCmp(Cmd->If.LeftArg, Cmd->If.RightArg) == 0; + result = StringCmp(Left, Right) == 0; } else { - result = GenericCmp(StringCmp, Cmd->If.LeftArg, Cmd->If.RightArg); + result = GenericCmp(StringCmp, Left, Right); switch (Cmd->If.Operator) { case IF_EQU: result = (result == 0); break; @@ -136,6 +152,9 @@ } } } + + cmd_free(Left); + cmd_free(Right); if (result ^ ((Cmd->If.Flags & IFFLAG_NEGATE) != 0)) { Modified: trunk/reactos/base/shell/cmd/redir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/redir.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/redir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/redir.c [iso-8859-1] Fri Feb 13 19:13:17 2009 @@ -54,7 +54,7 @@ PerformRedirection(REDIRECTION *RedirList) { REDIRECTION *Redir; - TCHAR Filename[MAX_PATH]; + LPTSTR Filename; HANDLE hNew; UINT DupNumber; static SECURITY_ATTRIBUTES SecAttr = { sizeof(SECURITY_ATTRIBUTES), NULL, TRUE }; @@ -78,8 +78,9 @@ for (Redir = RedirList; Redir; Redir = Redir->Next) { - *Filename = _T('\0'); - _tcsncat(Filename, Redir->Filename, MAX_PATH - 1); + Filename = DoDelayedExpansion(Redir->Filename); + if (!Filename) + goto redir_error; StripQuotes(Filename); if (*Filename == _T('&')) @@ -112,6 +113,8 @@ { ConErrResPrintf(Redir->Type == REDIR_READ ? STRING_CMD_ERROR1 : STRING_CMD_ERROR3, Filename); + cmd_free(Filename); +redir_error: /* Undo all the redirections before this one */ UndoRedirection(RedirList, Redir); return FALSE; @@ -123,6 +126,7 @@ SetHandle(Redir->Number, hNew); TRACE("%d redirected to: %s\n", Redir->Number, debugstr_aw(Filename)); + cmd_free(Filename); } return TRUE; }

15 years, 10 months

[tkreuzer] 39596: Get rid of VOLATILE, use volatile instead and fix PENTER_STATE_HANDLER by using "LONG volatile *" like in ms header, which means a pointer to a volatile LONG, instead of "volatile PLONG", which would be a volatile pointer to a LONG.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Feb 13 18:58:55 2009 New Revision: 39596 URL: http://svn.reactos.org/svn/reactos?rev=39596&view=rev Log: Get rid of VOLATILE, use volatile instead and fix PENTER_STATE_HANDLER by using "LONG volatile *" like in ms header, which means a pointer to a volatile LONG, instead of "volatile PLONG", which would be a volatile pointer to a LONG. Modified: trunk/reactos/include/ddk/ntpoapi.h Modified: trunk/reactos/include/ddk/ntpoapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntpoapi.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ntpoapi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntpoapi.h [iso-8859-1] Fri Feb 13 18:58:55 2009 @@ -90,7 +90,7 @@ IN PENTER_STATE_SYSTEM_HANDLER SystemHandler OPTIONAL, IN PVOID SystemContext, IN LONG NumberProcessors, - IN VOLATILE PLONG Number); + IN LONG volatile *Number); typedef struct _POWER_STATE_HANDLER { POWER_STATE_HANDLER_TYPE Type;

15 years, 10 months

[cwittich] 39595: sync translations, remove a little change from ros.diff

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Feb 13 13:10:55 2009 New Revision: 39595 URL: http://svn.reactos.org/svn/reactos?rev=39595&view=rev Log: sync translations, remove a little change from ros.diff Added: trunk/reactos/dll/win32/wininet/wininet_Zh.rc (with props) Modified: trunk/reactos/dll/win32/wininet/rsrc.rc trunk/reactos/dll/win32/wininet/wininet_Ja.rc trunk/reactos/dll/win32/wininet/wininet_Ko.rc trunk/reactos/dll/win32/wininet/wininet_Uk.rc trunk/reactos/dll/win32/wininet/wininet_ros.diff Modified: trunk/reactos/dll/win32/wininet/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/wininet/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/rsrc.rc [iso-8859-1] Fri Feb 13 13:10:55 2009 @@ -63,3 +63,4 @@ #include "wininet_Sv.rc" #include "wininet_Uk.rc" #include "wininet_Tr.rc" +#include "wininet_Zh.rc" Modified: trunk/reactos/dll/win32/wininet/wininet_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/wininet_Ja.rc [iso-8859-1] Fri Feb 13 13:10:55 2009 @@ -16,24 +16,34 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "lbg[NpX[hÌüÍ" -FONT 9, "MS UI Gothic" +CAPTION "ãããã¯ã¼ã¯ ãã¹ã¯ã¼ãã®å¥å" +FONT 9, "MS Shell Dlg" { - LTEXT "[U¼ÆpX[hðüÍµÄº³¢:", -1, 40, 6, 150, 15 - LTEXT "vLV", -1, 40, 26, 50, 10 - LTEXT "næ", -1, 40, 46, 50, 10 - LTEXT "[U¼", -1, 40, 66, 50, 10 - LTEXT "pX[h", -1, 40, 86, 50, 10 + LTEXT "ã¦ã¼ã¶åã¨ãã¹ã¯ã¼ããå¥åãã¦ä¸ãã:", -1, 40, 6, 150, 15 + LTEXT "ãããã·", -1, 40, 26, 50, 10 + LTEXT "å°å", -1, 40, 46, 50, 10 + LTEXT "ã¦ã¼ã¶å", -1, 40, 66, 50, 10 + LTEXT "ãã¹ã¯ã¼ã", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "pX[hðÛ¶·é(&S)(ZLAÅÍ èÜ¹ñ)", IDC_SAVEPASSWORD, + CHECKBOX "ãã¹ã¯ã¼ããä¿åãã(&S)(ã»ãã¥ã¢ã§ã¯ããã¾ãã)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "LZ", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } + +STRINGTABLE DISCARDABLE +{ + IDS_LANCONNECTION "LAN æ¥ç¶" +} + +#pragma code_page(default) Modified: trunk/reactos/dll/win32/wininet/wininet_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/wininet_Ko.rc [iso-8859-1] Fri Feb 13 13:10:55 2009 @@ -16,12 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "³×Æ®¿öÅ© ¾ÏÈ£ ÀÔ·Â" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" { LTEXT "´ç½ÅÀÇ »ç¿ëÀÚ ÀÌ¸§°ú ¾ÏÈ£¸¦ ÀÔ·ÂÇÏ½Ã¿À:", -1, 40, 6, 150, 15 LTEXT "ÇÁ·Ï½Ã", -1, 40, 26, 50, 10 Modified: trunk/reactos/dll/win32/wininet/wininet_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/wininet_Uk.rc [iso-8859-1] Fri Feb 13 13:10:55 2009 @@ -15,7 +15,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT Added: trunk/reactos/dll/win32/wininet/wininet_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet_Zh.rc (added) +++ trunk/reactos/dll/win32/wininet/wininet_Zh.rc [iso-8859-1] Fri Feb 13 13:10:55 2009 @@ -1,0 +1,78 @@ +/* + * wininet (Simplified and Traditional Chinese Resources) + * + * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> + * + * 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 + */ + +/* Chinese text is encoded in UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "è¾å¥ç½ç»å¯ç " +FONT 9, "MS Shell Dlg" +{ + LTEXT "è¯·è¾å¥ä½ çç¨æ·ååå¯ç :", -1, 40, 6, 150, 15 + LTEXT "ä»£ç", -1, 40, 26, 50, 10 + LTEXT "Realm", -1, 40, 46, 50, 10 + LTEXT "ç¨æ·", -1, 40, 66, 50, 10 + LTEXT "å¯ç ", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "ä¿åå¯ç (ä¸å®å¨)(&S)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "ç¡®å®", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "åæ¶", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + IDS_LANCONNECTION "å±åç½è¿æ¥" +} + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "è¼¸å¥ç¶²è·¯å¯ç¢¼" +FONT 9, "MS Shell Dlg" +{ + LTEXT "è«è¼¸å¥ä½ çç¨æ¶ååå¯ç¢¼:", -1, 40, 6, 150, 15 + LTEXT "ä»£ç", -1, 40, 26, 50, 10 + LTEXT "Realm", -1, 40, 46, 50, 10 + LTEXT "ç¨æ¶", -1, 40, 66, 50, 10 + LTEXT "å¯ç¢¼", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "å²åå¯ç¢¼(ä¸å®å¨)(&S)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "ç¢ºå®", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "åæ¶", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + IDS_LANCONNECTION "å±åç¶²é£æ¥" +} + +#pragma code_page(default) Propchange: trunk/reactos/dll/win32/wininet/wininet_Zh.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/wininet/wininet_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/wininet_ros.diff [iso-8859-1] Fri Feb 13 13:10:55 2009 @@ -101,11 +101,3 @@ { if (recv(connection->socketFD, &lpszBuffer[nRecv], 1, 0) <= 0) { ---- D:/Wine-CVS/wine/dlls/wininet/rsrc.rc Thu May 08 21:26:20 2008 -+++ D:/ReactOS-Trunk/reactos/dll/win32/wininet/rsrc.rc Thu May 29 18:57:29 2008 -@@ -60,4 +60,5 @@ - #include "wininet_Ru.rc" - #include "wininet_Si.rc" - #include "wininet_Sv.rc" -+#include "wininet_Uk.rc" - #include "wininet_Tr.rc"

15 years, 10 months

[cwittich] 39594: sync mshtml and shdocvw winetests with wine 1.1.15

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Feb 13 12:47:09 2009 New Revision: 39594 URL: http://svn.reactos.org/svn/reactos?rev=39594&view=rev Log: sync mshtml and shdocvw winetests with wine 1.1.15 Modified: trunk/rostests/winetests/mshtml/dom.c trunk/rostests/winetests/mshtml/script.c trunk/rostests/winetests/shdocvw/webbrowser.c Modified: trunk/rostests/winetests/mshtml/dom.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/dom.c?re… ============================================================================== --- trunk/rostests/winetests/mshtml/dom.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/dom.c [iso-8859-1] Fri Feb 13 12:47:09 2009 @@ -307,6 +307,8 @@ &IID_IDispatchEx, &IID_IHTMLStyle, &IID_IHTMLStyle2, + &IID_IHTMLStyle3, + &IID_IHTMLStyle4, NULL }; @@ -2411,6 +2413,7 @@ float f; BSTR sOverflowDefault; BSTR sDefault; + VARIANT vDefault; test_disp((IUnknown*)style, &DIID_DispHTMLStyle); test_ifaces((IUnknown*)style, style_iids); @@ -2428,6 +2431,82 @@ hres = IHTMLStyle_get_fontWeight(style, &str); ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres); ok(!str, "fontWeight = %s\n", dbgstr_w(str)); + + hres = IHTMLStyle_get_fontWeight(style, &sDefault); + ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres); + + str = a2bstr("test"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == E_INVALIDARG, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("bold"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("bolder"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("lighter"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("100"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("200"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("300"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("400"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("500"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("600"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("700"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("800"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("900"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLStyle_get_fontWeight(style, &str); + ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres); + ok(!strcmp_wa(str, "900"), "str != style900\n"); + SysFreeString(str); + + hres = IHTMLStyle_put_fontWeight(style, sDefault); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); /* font Variant */ hres = IHTMLStyle_get_fontVariant(style, NULL); @@ -2482,10 +2561,32 @@ ok(hres == S_OK, "get_textDecorationUnderline failed: %08x\n", hres); ok(b == VARIANT_FALSE, "textDecorationUnderline = %x\n", b); + hres = IHTMLStyle_put_textDecorationUnderline(style, VARIANT_TRUE); + ok(hres == S_OK, "get_textDecorationUnderline failed: %08x\n", hres); + ok(b == VARIANT_FALSE, "textDecorationUnderline = %x\n", b); + + hres = IHTMLStyle_get_textDecorationUnderline(style, &b); + ok(hres == S_OK, "get_textDecorationUnderline failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "textDecorationUnderline = %x\n", b); + + hres = IHTMLStyle_put_textDecorationUnderline(style, VARIANT_FALSE); + ok(hres == S_OK, "get_textDecorationUnderline failed: %08x\n", hres); + b = 0xfefe; hres = IHTMLStyle_get_textDecorationLineThrough(style, &b); ok(hres == S_OK, "get_textDecorationLineThrough failed: %08x\n", hres); ok(b == VARIANT_FALSE, "textDecorationLineThrough = %x\n", b); + + hres = IHTMLStyle_put_textDecorationLineThrough(style, VARIANT_TRUE); + ok(hres == S_OK, "get_textDecorationLineThrough failed: %08x\n", hres); + ok(b == VARIANT_FALSE, "textDecorationLineThrough = %x\n", b); + + hres = IHTMLStyle_get_textDecorationLineThrough(style, &b); + ok(hres == S_OK, "get_textDecorationLineThrough failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "textDecorationLineThrough = %x\n", b); + + hres = IHTMLStyle_put_textDecorationLineThrough(style, VARIANT_FALSE); + ok(hres == S_OK, "get_textDecorationLineThrough failed: %08x\n", hres); hres = IHTMLStyle_get_posWidth(style, NULL); ok(hres == E_POINTER, "get_posWidth failed: %08x\n", hres); @@ -2903,6 +3004,29 @@ str = a2bstr("bordertopstyle"); test_border_styles(style, str); SysFreeString(str); + + hres = IHTMLStyle_get_backgroundColor(style, &v); + ok(hres == S_OK, "get_backgroundColor: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "type failed: %d\n", V_VT(&v)); + ok(!V_BSTR(&v), "str=%s\n", dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + /* PaddingLeft */ + hres = IHTMLStyle_get_paddingLeft(style, &vDefault); + ok(hres == S_OK, "get_paddingLeft: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("10"); + hres = IHTMLStyle_put_paddingLeft(style, v); + ok(hres == S_OK, "get_paddingLeft: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle_get_paddingLeft(style, &v); + ok(hres == S_OK, "get_paddingLeft: %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "10px"), "expecte 10 = %s\n", dbgstr_w(V_BSTR(&v))); + + hres = IHTMLStyle_put_paddingLeft(style, vDefault); + ok(hres == S_OK, "get_paddingLeft: %08x\n", hres); hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); Modified: trunk/rostests/winetests/mshtml/script.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/script.c… ============================================================================== --- trunk/rostests/winetests/mshtml/script.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/script.c [iso-8859-1] Fri Feb 13 12:47:09 2009 @@ -36,6 +36,20 @@ DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +#ifdef _WIN64 + +#define CTXARG_T DWORDLONG +#define IActiveScriptParseVtbl IActiveScriptParse64Vtbl +#define IActiveScriptParseProcedure2Vtbl IActiveScriptParseProcedure2_64Vtbl + +#else + +#define CTXARG_T DWORD +#define IActiveScriptParseVtbl IActiveScriptParse32Vtbl +#define IActiveScriptParseProcedure2Vtbl IActiveScriptParseProcedure2_32Vtbl + +#endif + #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -538,7 +552,7 @@ static HRESULT WINAPI ActiveScriptParseProcedure_ParseProcedureText(IActiveScriptParseProcedure2 *iface, LPCOLESTR pstrCode, LPCOLESTR pstrFormalParams, LPCOLESTR pstrProcedureName, LPCOLESTR pstrItemName, IUnknown *punkContext, LPCOLESTR pstrDelimiter, - DWORD dwSourceContextCookie, ULONG ulStartingLineNumber, DWORD dwFlags, IDispatch **ppdisp) + CTXARG_T dwSourceContextCookie, ULONG ulStartingLineNumber, DWORD dwFlags, IDispatch **ppdisp) { ok(0, "unexpected call\n"); return E_NOTIMPL; @@ -579,7 +593,7 @@ static HRESULT WINAPI ActiveScriptParse_AddScriptlet(IActiveScriptParse *iface, LPCOLESTR pstrDefaultName, LPCOLESTR pstrCode, LPCOLESTR pstrItemName, LPCOLESTR pstrSubItemName, LPCOLESTR pstrEventName, LPCOLESTR pstrDelimiter, - DWORD dwSourceContextCookie, ULONG ulStartingLineNumber, DWORD dwFlags, + CTXARG_T dwSourceContextCookie, ULONG ulStartingLineNumber, DWORD dwFlags, BSTR *pbstrName, EXCEPINFO *pexcepinfo) { ok(0, "unexpected call\n"); @@ -588,7 +602,7 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *iface, LPCOLESTR pstrCode, LPCOLESTR pstrItemName, IUnknown *punkContext, - LPCOLESTR pstrDelimiter, DWORD dwSourceContextCookie, ULONG ulStartingLine, + LPCOLESTR pstrDelimiter, CTXARG_T dwSourceContextCookie, ULONG ulStartingLine, DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo) { IDispatchEx *document; Modified: trunk/rostests/winetests/shdocvw/webbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shdocvw/webbrow… ============================================================================== --- trunk/rostests/winetests/shdocvw/webbrowser.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shdocvw/webbrowser.c [iso-8859-1] Fri Feb 13 12:47:09 2009 @@ -68,6 +68,9 @@ ok(called_ ## func || broken(!called_ ## func), "expected " #func "\n"); \ expect_ ## func = called_ ## func = FALSE; \ }while(0) + +#define CLEAR_CALLED(func) \ + expect_ ## func = called_ ## func = FALSE DEFINE_EXPECT(GetContainer); DEFINE_EXPECT(Site_GetWindow); @@ -1773,6 +1776,35 @@ ok(b == VARIANT_FALSE, "b=%x\n", b); } +static void test_ambient_unknown(IWebBrowser2 *wb, IOleControl *control, BOOL is_clientsite) +{ + HRESULT hres; + + SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + SET_EXPECT(Invoke_AMBIENT_SILENT); + SET_EXPECT(Invoke_AMBIENT_USERMODE); + SET_EXPECT(Invoke_AMBIENT_DLCONTROL); + SET_EXPECT(Invoke_AMBIENT_USERAGENT); + SET_EXPECT(Invoke_AMBIENT_PALETTE); + + hres = IOleControl_OnAmbientPropertyChange(control, DISPID_UNKNOWN); + ok(hres == S_OK, "OnAmbientPropertyChange failed %08x\n", hres); + + CHECK_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + CHECK_EXPECT(Invoke_AMBIENT_SILENT); + CHECK_EXPECT(Invoke_AMBIENT_USERMODE); + CHECK_EXPECT(Invoke_AMBIENT_DLCONTROL); + CHECK_EXPECT(Invoke_AMBIENT_USERAGENT); + CHECK_EXPECT(Invoke_AMBIENT_PALETTE); + + CLEAR_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + CLEAR_CALLED(Invoke_AMBIENT_SILENT); + CLEAR_CALLED(Invoke_AMBIENT_USERMODE); + CLEAR_CALLED(Invoke_AMBIENT_DLCONTROL); + CLEAR_CALLED(Invoke_AMBIENT_USERAGENT); + CLEAR_CALLED(Invoke_AMBIENT_PALETTE); +} + static void test_wb_funcs(IUnknown *unk, BOOL is_clientsite) { IWebBrowser2 *wb; @@ -1787,6 +1819,7 @@ test_Silent(wb, control, is_clientsite); test_Offline(wb, control, is_clientsite); + test_ambient_unknown(wb, control, is_clientsite); IWebBrowser_Release(wb); IOleControl_Release(control);

15 years, 10 months

[cwittich] 39593: apply ros-hack

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Feb 13 12:34:10 2009 New Revision: 39593 URL: http://svn.reactos.org/svn/reactos?rev=39593&view=rev Log: apply ros-hack Modified: trunk/reactos/dll/win32/mshtml/install.c Modified: trunk/reactos/dll/win32/mshtml/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/install.c… ============================================================================== --- trunk/reactos/dll/win32/mshtml/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/install.c [iso-8859-1] Fri Feb 13 12:34:10 2009 @@ -54,6 +54,11 @@ '\\','W','i','n','e', '\\','M','S','H','T','M','L',0}; +static const CHAR mshtml_keyA[] = + {'S','o','f','t','w','a','r','e', + '\\','W','i','n','e', + '\\','M','S','H','T','M','L',0}; + static HWND install_dialog = NULL; static LPWSTR tmp_file_name = NULL; static HANDLE tmp_file = INVALID_HANDLE_VALUE; @@ -219,23 +224,18 @@ static BOOL install_from_registered_dir(void) { char *file_name; - HKEY hkey; DWORD res, type, size = MAX_PATH; BOOL ret; + file_name = heap_alloc(size+sizeof(GECKO_FILE_NAME)); /* @@ Wine registry key: HKCU\Software\Wine\MSHTML */ - res = RegOpenKeyW(HKEY_CURRENT_USER, mshtml_keyW, &hkey); - if(res != ERROR_SUCCESS) - return FALSE; - - file_name = heap_alloc(size+sizeof(GECKO_FILE_NAME)); - res = RegQueryValueExA(hkey, "GeckoCabDir", NULL, &type, (PBYTE)file_name, &size); + res = RegGetValueA(HKEY_CURRENT_USER, mshtml_keyA, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)file_name, &size); if(res == ERROR_MORE_DATA) { file_name = heap_realloc(file_name, size+sizeof(GECKO_FILE_NAME)); - res = RegQueryValueExA(hkey, "GeckoCabDir", NULL, &type, (PBYTE)file_name, &size); - } - RegCloseKey(hkey); - if(res != ERROR_SUCCESS || type != REG_SZ) { + res = RegGetValueA(HKEY_CURRENT_USER, mshtml_keyA, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)file_name, &size); + } + + if(res != ERROR_SUCCESS || (type != REG_SZ && type != REG_EXPAND_SZ)) { heap_free(file_name); return FALSE; }

15 years, 10 months

[cwittich] 39592: readd LANGID until I figured out were wine moved the declaration to

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Feb 13 12:20:42 2009 New Revision: 39592 URL: http://svn.reactos.org/svn/reactos?rev=39592&view=rev Log: readd LANGID until I figured out were wine moved the declaration to Modified: trunk/reactos/dll/win32/msi/msiserver.idl trunk/reactos/include/psdk/msi.h trunk/reactos/include/psdk/msiquery.h Modified: trunk/reactos/dll/win32/msi/msiserver.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiserver.id… ============================================================================== --- trunk/reactos/dll/win32/msi/msiserver.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msiserver.idl [iso-8859-1] Fri Feb 13 12:20:42 2009 @@ -29,6 +29,7 @@ typedef int MSICONDITION; typedef int MSIRUNMODE; typedef int INSTALLSTATE; +typedef WORD LANGID; cpp_quote("#endif") [ Modified: trunk/reactos/include/psdk/msi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msi.h?rev=395… ============================================================================== --- trunk/reactos/include/psdk/msi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msi.h [iso-8859-1] Fri Feb 13 12:20:42 2009 @@ -27,7 +27,7 @@ #include <wincrypt.h> #endif -typedef unsigned long MSIHANDLE; +typedef ULONG MSIHANDLE; typedef enum tagINSTALLSTATE { Modified: trunk/reactos/include/psdk/msiquery.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msiquery.h?re… ============================================================================== --- trunk/reactos/include/psdk/msiquery.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msiquery.h [iso-8859-1] Fri Feb 13 12:20:42 2009 @@ -47,6 +47,7 @@ typedef enum tagMSIMODIFY { + MSIMODIFY_SEEK = -1, MSIMODIFY_REFRESH = 0, MSIMODIFY_INSERT = 1, MSIMODIFY_UPDATE = 2,

15 years, 10 months

[cwittich] 39591: sync msi with wine 1.1.15

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Feb 13 12:14:16 2009 New Revision: 39591 URL: http://svn.reactos.org/svn/reactos?rev=39591&view=rev Log: sync msi with wine 1.1.15 Modified: trunk/reactos/dll/win32/msi/events.c trunk/reactos/dll/win32/msi/helpers.c trunk/reactos/dll/win32/msi/media.c trunk/reactos/dll/win32/msi/msipriv.h trunk/reactos/dll/win32/msi/msiserver.idl trunk/reactos/dll/win32/msi/registry.c trunk/reactos/dll/win32/msi/regsvr.c trunk/reactos/dll/win32/msi/script.c trunk/reactos/dll/win32/msi/string.c Modified: trunk/reactos/dll/win32/msi/events.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/events.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/events.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/events.c [iso-8859-1] Fri Feb 13 12:14:16 2009 @@ -278,27 +278,6 @@ list_add_tail( &package->subscriptions, &sub->entry ); } -VOID ControlEvent_UnSubscribeToEvent( MSIPACKAGE *package, LPCWSTR event, - LPCWSTR control, LPCWSTR attribute ) -{ - struct list *i, *t; - struct subscriber *sub; - - LIST_FOR_EACH_SAFE( i, t, &package->subscriptions ) - { - sub = LIST_ENTRY( i, struct subscriber, entry ); - - if( lstrcmpiW(sub->control,control) ) - continue; - if( lstrcmpiW(sub->attribute,attribute) ) - continue; - if( lstrcmpiW(sub->event,event) ) - continue; - list_remove( &sub->entry ); - free_subscriber( sub ); - } -} - VOID ControlEvent_FireSubscribedEvent( MSIPACKAGE *package, LPCWSTR event, MSIRECORD *rec ) { Modified: trunk/reactos/dll/win32/msi/helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/helpers.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/helpers.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/helpers.c [iso-8859-1] Fri Feb 13 12:14:16 2009 @@ -871,13 +871,6 @@ memmove(filename, p+1, (strlenW(p+1)+1)*sizeof(WCHAR)); } -void reduce_to_shortfilename(WCHAR* filename) -{ - LPWSTR p = strchrW(filename,'|'); - if (p) - *p = 0; -} - LPWSTR create_component_advertise_string(MSIPACKAGE* package, MSICOMPONENT* component, LPCWSTR feature) { @@ -1071,18 +1064,3 @@ msiobj_release( &rec->hdr ); return data; } - -void msi_ui_error( DWORD msg_id, DWORD type ) -{ - WCHAR text[2048]; - - static const WCHAR title[] = { - 'W','i','n','d','o','w','s',' ','I','n','s','t','a','l','l','e','r',0 - }; - - if (!MsiLoadStringW( -1, msg_id, text, sizeof(text) / sizeof(text[0]), - MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL) )) - return; - - MessageBoxW( NULL, text, title, type ); -} Modified: trunk/reactos/dll/win32/msi/media.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/media.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/media.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/media.c [iso-8859-1] Fri Feb 13 12:14:16 2009 @@ -145,7 +145,7 @@ return rc; } -static void CDECL *cabinet_alloc(ULONG cb) +static void * CDECL cabinet_alloc(ULONG cb) { return msi_alloc(cb); } Modified: trunk/reactos/dll/win32/msi/msipriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msipriv.h?re… ============================================================================== --- trunk/reactos/dll/win32/msi/msipriv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msipriv.h [iso-8859-1] Fri Feb 13 12:14:16 2009 @@ -655,11 +655,9 @@ }; extern BOOL msi_addstringW( string_table *st, UINT string_no, const WCHAR *data, int len, UINT refcount, enum StringPersistence persistence ); -extern UINT msi_id2stringW( const string_table *st, UINT string_no, LPWSTR buffer, UINT *sz ); extern UINT msi_string2idW( const string_table *st, LPCWSTR buffer, UINT *id ); extern VOID msi_destroy_stringtable( string_table *st ); -extern UINT msi_strcmp( const string_table *st, UINT lval, UINT rval, UINT *res ); extern const WCHAR *msi_string_lookup_id( const string_table *st, UINT id ); extern HRESULT msi_init_string_table( IStorage *stg ); extern string_table *msi_load_string_table( IStorage *stg, UINT *bytes_per_strref ); @@ -795,7 +793,6 @@ extern BOOL msi_reg_get_val_dword( HKEY hkey, LPCWSTR name, DWORD *val); extern DWORD msi_version_str_to_dword(LPCWSTR p); -extern LPWSTR msi_version_dword_to_str(DWORD version); extern LONG msi_reg_set_val_str( HKEY hkey, LPCWSTR name, LPCWSTR value ); extern LONG msi_reg_set_val_multi_str( HKEY hkey, LPCWSTR name, LPCWSTR value ); @@ -973,14 +970,12 @@ extern BOOL ACTION_VerifyComponentForAction(const MSICOMPONENT*, INSTALLSTATE); extern BOOL ACTION_VerifyFeatureForAction(const MSIFEATURE*, INSTALLSTATE); extern void reduce_to_longfilename(WCHAR*); -extern void reduce_to_shortfilename(WCHAR*); extern LPWSTR create_component_advertise_string(MSIPACKAGE*, MSICOMPONENT*, LPCWSTR); extern void ACTION_UpdateComponentStates(MSIPACKAGE *package, LPCWSTR szFeature); extern UINT register_unique_action(MSIPACKAGE *, LPCWSTR); extern BOOL check_unique_action(const MSIPACKAGE *, LPCWSTR); extern WCHAR* generate_error_string(MSIPACKAGE *, UINT, DWORD, ... ); extern UINT msi_create_component_directories( MSIPACKAGE *package ); -extern void msi_ui_error( DWORD msg_id, DWORD type ); extern UINT msi_set_last_used_source(LPCWSTR product, LPCWSTR usersid, MSIINSTALLCONTEXT context, DWORD options, LPCWSTR value); @@ -1011,8 +1006,6 @@ extern VOID ControlEvent_CleanupSubscriptions(MSIPACKAGE *package); extern VOID ControlEvent_SubscribeToEvent(MSIPACKAGE *package, msi_dialog *dialog, LPCWSTR event, LPCWSTR control, LPCWSTR attribute); -extern VOID ControlEvent_UnSubscribeToEvent( MSIPACKAGE *package, LPCWSTR event, - LPCWSTR control, LPCWSTR attribute ); /* OLE automation */ extern HRESULT create_msiserver(IUnknown *pOuter, LPVOID *ppObj); Modified: trunk/reactos/dll/win32/msi/msiserver.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiserver.id… ============================================================================== --- trunk/reactos/dll/win32/msi/msiserver.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msiserver.idl [iso-8859-1] Fri Feb 13 12:14:16 2009 @@ -29,7 +29,6 @@ typedef int MSICONDITION; typedef int MSIRUNMODE; typedef int INSTALLSTATE; -typedef WORD LANGID; cpp_quote("#endif") [ Modified: trunk/reactos/dll/win32/msi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/registry.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/registry.c [iso-8859-1] Fri Feb 13 12:14:16 2009 @@ -390,17 +390,6 @@ } return MAKELONG(build, MAKEWORD(minor, major)); -} - -LPWSTR msi_version_dword_to_str(DWORD version) -{ - static const WCHAR fmt[] = { '%','u','.','%','u','.','%','u',0 }; - LPWSTR str = msi_alloc(20); - sprintfW(str, fmt, - (version&0xff000000)>>24, - (version&0x00ff0000)>>16, - version&0x0000ffff); - return str; } LONG msi_reg_set_val_str( HKEY hkey, LPCWSTR name, LPCWSTR value ) Modified: trunk/reactos/dll/win32/msi/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/regsvr.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/regsvr.c [iso-8859-1] Fri Feb 13 12:14:16 2009 @@ -41,6 +41,7 @@ #include "msi.h" #include "initguid.h" #include "msipriv.h" + WINE_DEFAULT_DEBUG_CHANNEL(msi); /* Modified: trunk/reactos/dll/win32/msi/script.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/script.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/script.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/script.c [iso-8859-1] Fri Feb 13 12:14:16 2009 @@ -138,14 +138,14 @@ if (FAILED(hr)) goto done; /* Initialize the script engine */ - hr = IActiveScriptParse_InitNew(pActiveScriptParse); + hr = IActiveScriptParse64_InitNew(pActiveScriptParse); if (FAILED(hr)) goto done; /* Add the session object */ hr = IActiveScript_AddNamedItem(pActiveScript, szSession, SCRIPTITEM_ISVISIBLE); /* Pass the script to the engine */ - hr = IActiveScriptParse_ParseScriptText(pActiveScriptParse, script, NULL, NULL, NULL, 0, 0, 0L, NULL, NULL); + hr = IActiveScriptParse64_ParseScriptText(pActiveScriptParse, script, NULL, NULL, NULL, 0, 0, 0L, NULL, NULL); if (FAILED(hr)) goto done; /* Start processing the script */ Modified: trunk/reactos/dll/win32/msi/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/string.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/string.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/string.c [iso-8859-1] Fri Feb 13 12:14:16 2009 @@ -328,45 +328,6 @@ } /* - * msi_id2stringW - * - * [in] st - pointer to the string table - * [in] id - id of the string to retrieve - * [out] buffer - destination of the string - * [in/out] sz - number of bytes available in the buffer on input - * number of bytes used on output - * - * The size includes the terminating nul character. Short buffers - * will be filled, but not nul terminated. - */ -UINT msi_id2stringW( const string_table *st, UINT id, LPWSTR buffer, UINT *sz ) -{ - UINT len; - const WCHAR *str; - - TRACE("Finding string %d of %d\n", id, st->maxcount); - - str = msi_string_lookup_id( st, id ); - if( !str ) - return ERROR_FUNCTION_FAILED; - - len = strlenW( str ) + 1; - - if( !buffer ) - { - *sz = len; - return ERROR_SUCCESS; - } - - if( *sz < len ) - *sz = len; - memcpy( buffer, str, (*sz)*sizeof(WCHAR) ); - *sz = len; - - return ERROR_SUCCESS; -} - -/* * msi_id2stringA * * [in] st - pointer to the string table @@ -437,24 +398,6 @@ return ERROR_INVALID_PARAMETER; } -UINT msi_strcmp( const string_table *st, UINT lval, UINT rval, UINT *res ) -{ - const WCHAR *l_str, *r_str; - - l_str = msi_string_lookup_id( st, lval ); - if( !l_str ) - return ERROR_INVALID_PARAMETER; - - r_str = msi_string_lookup_id( st, rval ); - if( !r_str ) - return ERROR_INVALID_PARAMETER; - - /* does this do the right thing for all UTF-8 strings? */ - *res = strcmpW( l_str, r_str ); - - return ERROR_SUCCESS; -} - static void string_totalsize( const string_table *st, UINT *datasize, UINT *poolsize ) { UINT i, len, holesize;

15 years, 10 months

← Newer
1
...
20
21
22
23
24
25
26
...
56
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2009