Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

[robertk] 14155: Branch for the 0.2.6 version to become stable.

by robertk＠svn.reactos.com

Branch for the 0.2.6 version to become stable. hopefully last 0.2 version of ROS :-) Added: branches/ros-branch-0_2_6/ _____ Copied: branches/ros-branch-0_2_6 (from rev 14154, trunk)

19 years, 9 months

[gdalsnes] 14154: scanf: fix handling of %n token

by gdalsnes＠svn.reactos.com

scanf: fix handling of %n token Modified: trunk/reactos/lib/crt/wine/scanf.h _____ Modified: trunk/reactos/lib/crt/wine/scanf.h --- trunk/reactos/lib/crt/wine/scanf.h 2005-03-16 23:51:26 UTC (rev 14153) +++ trunk/reactos/lib/crt/wine/scanf.h 2005-03-16 23:59:41 UTC (rev 14154) @@ -98,257 +98,257 @@ if (nch == _EOF_) return _EOF_RET; while (*format) { - /* a whitespace character in the format string causes scanf to read, - * but not store, all consecutive white-space characters in the input - * up to the next non-white-space character. One white space character - * in the input matches any number (including zero) and combination of - * white-space characters in the input. */ - if (_ISSPACE_(*format)) { + /* a whitespace character in the format string causes scanf to read, + * but not store, all consecutive white-space characters in the input + * up to the next non-white-space character. One white space character + * in the input matches any number (including zero) and combination of + * white-space characters in the input. */ + if (_ISSPACE_(*format)) { /* skip whitespace */ while ((nch!=_EOF_) && _ISSPACE_(nch)) nch = _GETC_(file); } - /* a format specification causes scanf to read and convert characters - * in the input into values of a specified type. The value is assigned - * to an argument in the argument list. Format specifications have - * the form %[*][width][{h | l | I64 | L}]type */ + /* a format specification causes scanf to read and convert characters + * in the input into values of a specified type. The value is assigned + * to an argument in the argument list. Format specifications have + * the form %[*][width][{h | l | I64 | L}]type */ else if (*format == '%') { int st = 0; int suppress = 0; int width = 0; - int base, number_signed; - int h_prefix = 0; - int l_prefix = 0; - int L_prefix = 0; - int w_prefix = 0; - int prefix_finished = 0; - int I64_prefix = 0; + int base, number_signed; + int h_prefix = 0; + int l_prefix = 0; + int L_prefix = 0; + int w_prefix = 0; + int prefix_finished = 0; + int I64_prefix = 0; format++; - /* look for leading asterisk, which means 'suppress assignment of - * this field'. */ - if (*format=='*') { - format++; - suppress=1; - } - /* look for width specification */ - while (_ISDIGIT_(*format)) { - width*=10; - width+=*format++ - '0'; - } - if (width==0) width=-1; /* no width spec seen */ - /* read prefix (if any) */ - while (!prefix_finished) { - switch(*format) { - case 'h': h_prefix = 1; break; - case 'l': l_prefix = 1; break; - case 'w': w_prefix = 1; break; - case 'L': L_prefix = 1; break; - case 'I': - if (*(format + 1) == '6' && - *(format + 2) == '4') { - I64_prefix = 1; - format += 2; - } - break; - default: - prefix_finished = 1; - } - if (!prefix_finished) format++; - } - /* read type */ + /* look for leading asterisk, which means 'suppress assignment of + * this field'. */ + if (*format=='*') { + format++; + suppress=1; + } + /* look for width specification */ + while (_ISDIGIT_(*format)) { + width*=10; + width+=*format++ - '0'; + } + if (width==0) width=-1; /* no width spec seen */ + /* read prefix (if any) */ + while (!prefix_finished) { + switch(*format) { + case 'h': h_prefix = 1; break; + case 'l': l_prefix = 1; break; + case 'w': w_prefix = 1; break; + case 'L': L_prefix = 1; break; + case 'I': + if (*(format + 1) == '6' && + *(format + 2) == '4') { + I64_prefix = 1; + format += 2; + } + break; + default: + prefix_finished = 1; + } + if (!prefix_finished) format++; + } + /* read type */ switch(*format) { - case 'x': - case 'X': /* hexadecimal integer. */ - base = 16; number_signed = 0; - goto number; - case 'o': /* octal integer */ - base = 8; number_signed = 0; - goto number; - case 'u': /* unsigned decimal integer */ - base = 10; number_signed = 0; - goto number; - case 'd': /* signed decimal integer */ - base = 10; number_signed = 1; - goto number; - case 'i': /* generic integer */ - base = 10; number_signed = 1; - number: { - /* read an integer */ - ULONGLONG cur = 0; - int negative = 0; - int seendigit=0; + case 'x': + case 'X': /* hexadecimal integer. */ + base = 16; number_signed = 0; + goto number; + case 'o': /* octal integer */ + base = 8; number_signed = 0; + goto number; + case 'u': /* unsigned decimal integer */ + base = 10; number_signed = 0; + goto number; + case 'd': /* signed decimal integer */ + base = 10; number_signed = 1; + goto number; + case 'i': /* generic integer */ + base = 10; number_signed = 1; + number: { + /* read an integer */ + ULONGLONG cur = 0; + int negative = 0; + int seendigit=0; /* skip initial whitespace */ while ((nch!=_EOF_) && _ISSPACE_(nch)) nch = _GETC_(file); /* get sign */ if (number_signed && (nch == '-' || - nch == '+')) { - negative = (nch=='-'); + nch == '+')) { + negative = (nch=='-'); nch = _GETC_(file); - if (width>0) width--; + if (width>0) width--; } - /* look for leading indication of base */ - if (width!=0 && nch == '0') { + /* look for leading indication of base */ + if (width!=0 && nch == '0') { nch = _GETC_(file); - if (width>0) width--; - seendigit=1; - if (width!=0 && (nch=='x' || nch=='X')) { - if (base==0) - base=16; - if (base==16) { - nch = _GETC_(file); - if (width>0) width--; - seendigit=0; - } - } else if (base==0) - base = 8; - } - /* throw away leading zeros */ - while (width!=0 && nch=='0') { + if (width>0) width--; + seendigit=1; + if (width!=0 && (nch=='x' || nch=='X')) { + if (base==0) + base=16; + if (base==16) { + nch = _GETC_(file); + if (width>0) width--; + seendigit=0; + } + } else if (base==0) + base = 8; + } + /* throw away leading zeros */ + while (width!=0 && nch=='0') { nch = _GETC_(file); - if (width>0) width--; - seendigit=1; - } - if (width!=0 && _CHAR2DIGIT_(nch, base)!=-1) { - cur = _CHAR2DIGIT_(nch, base); - nch = _GETC_(file); - if (width>0) width--; - seendigit=1; - } + if (width>0) width--; + seendigit=1; + } + if (width!=0 && _CHAR2DIGIT_(nch, base)!=-1) { + cur = _CHAR2DIGIT_(nch, base); + nch = _GETC_(file); + if (width>0) width--; + seendigit=1; + } /* read until no more digits */ while (width!=0 && (nch!=_EOF_) && _CHAR2DIGIT_(nch, base)!=-1) { cur = cur*base + _CHAR2DIGIT_(nch, base); nch = _GETC_(file); - if (width>0) width--; - seendigit=1; + if (width>0) width--; + seendigit=1; } - /* okay, done! */ - if (!seendigit) break; /* not a valid number */ + /* okay, done! */ + if (!seendigit) break; /* not a valid number */ st = 1; if (!suppress) { #define _SET_NUMBER_(type) *va_arg(ap, type*) = negative ? -cur : cur - if (number_signed) { - if (I64_prefix) _SET_NUMBER_(LONGLONG); - else if (l_prefix) _SET_NUMBER_(long int); - else if (h_prefix) _SET_NUMBER_(short int); - else _SET_NUMBER_(int); - } else { - if (negative) { - WARN("Dropping sign in reading a negative number into an unsigned value"); - negative = 0; - } - if (I64_prefix) _SET_NUMBER_(ULONGLONG); - else if (l_prefix) _SET_NUMBER_(unsigned long int); - else if (h_prefix) - _SET_NUMBER_(unsigned short int); - else _SET_NUMBER_(unsigned int); - } - } + if (number_signed) { + if (I64_prefix) _SET_NUMBER_(LONGLONG); + else if (l_prefix) _SET_NUMBER_(long int); + else if (h_prefix) _SET_NUMBER_(short int); + else _SET_NUMBER_(int); + } else { + if (negative) { + WARN("Dropping sign in reading a negative number into an unsigned value"); + negative = 0; + } + if (I64_prefix) _SET_NUMBER_(ULONGLONG); + else if (l_prefix) _SET_NUMBER_(unsigned long int); + else if (h_prefix) + _SET_NUMBER_(unsigned short int); + else _SET_NUMBER_(unsigned int); + } + } } break; - case 'e': - case 'E': - case 'f': - case 'g': + case 'e': + case 'E': + case 'f': + case 'g': case 'G': { /* read a float */ long double cur = 0; - int negative = 0; + int negative = 0; /* skip initial whitespace */ while ((nch!=_EOF_) && _ISSPACE_(nch)) nch = _GETC_(file); - /* get sign. */ + /* get sign. */ if (nch == '-' || nch == '+') { - negative = (nch=='-'); - if (width>0) width--; - if (width==0) break; + negative = (nch=='-'); + if (width>0) width--; + if (width==0) break; nch = _GETC_(file); } - /* get first digit. */ - if ('.' != nch) { - if (!_ISDIGIT_(nch)) break; - cur = (nch - '0'); - nch = _GETC_(file); - if (width>0) width--; - /* read until no more digits */ - while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { + /* get first digit. */ + if ('.' != nch) { + if (!_ISDIGIT_(nch)) break; + cur = (nch - '0'); + nch = _GETC_(file); + if (width>0) width--; + /* read until no more digits */ + while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { cur = cur*10 + (nch - '0'); nch = _GETC_(file); - if (width>0) width--; - } - } else { - cur = 0; /* MaxPayneDemo Fix: .8 -> 0.8 */ - } - /* handle decimals */ + if (width>0) width--; + } + } else { + cur = 0; /* MaxPayneDemo Fix: .8 -> 0.8 */ + } + /* handle decimals */ if (width!=0 && nch == '.') { float dec = 1; nch = _GETC_(file); - if (width>0) width--; + if (width>0) width--; while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { dec /= 10; cur += dec * (nch - '0'); nch = _GETC_(file); - if (width>0) width--; + if (width>0) width--; } } - /* handle exponent */ - if (width!=0 && (nch == 'e' || nch == 'E')) { - int exponent = 0, negexp = 0; - float expcnt; + /* handle exponent */ + if (width!=0 && (nch == 'e' || nch == 'E')) { + int exponent = 0, negexp = 0; + float expcnt; nch = _GETC_(file); - if (width>0) width--; - /* possible sign on the exponent */ - if (width!=0 && (nch=='+' || nch=='-')) { - negexp = (nch=='-'); + if (width>0) width--; + /* possible sign on the exponent */ + if (width!=0 && (nch=='+' || nch=='-')) { + negexp = (nch=='-'); nch = _GETC_(file); - if (width>0) width--; - } - /* exponent digits */ - while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { - exponent *= 10; - exponent += (nch - '0'); + if (width>0) width--; + } + /* exponent digits */ + while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { + exponent *= 10; + exponent += (nch - '0'); nch = _GETC_(file); - if (width>0) width--; + if (width>0) width--; } - /* update 'cur' with this exponent. */ - expcnt = negexp ? .1 : 10; - while (exponent!=0) { - if (exponent&1) - cur*=expcnt; - exponent/=2; - expcnt=expcnt*expcnt; - } - } + /* update 'cur' with this exponent. */ + expcnt = negexp ? .1 : 10; + while (exponent!=0) { + if (exponent&1) + cur*=expcnt; + exponent/=2; + expcnt=expcnt*expcnt; + } + } st = 1; if (!suppress) { - if (L_prefix) _SET_NUMBER_(long double); - else if (l_prefix) _SET_NUMBER_(double); - else _SET_NUMBER_(float); - } + if (L_prefix) _SET_NUMBER_(long double); + else if (l_prefix) _SET_NUMBER_(double); + else _SET_NUMBER_(float); + } } break; - /* According to - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/h tml/_crt_scanf_type_field_characters.asp - * 's' reads a character string in a call to fscanf - * and 'S' a wide character string and vice versa in a - * call to fwscanf. The 'h', 'w' and 'l' prefixes override - * this behaviour. 'h' forces reading char * but 'l' and 'w' - * force reading WCHAR. */ - case 's': - if (w_prefix || l_prefix) goto widecharstring; - else if (h_prefix) goto charstring; + /* According to + * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/h tml/_crt_scanf_type_field_characters.asp + * 's' reads a character string in a call to fscanf + * and 'S' a wide character string and vice versa in a + * call to fwscanf. The 'h', 'w' and 'l' prefixes override + * this behaviour. 'h' forces reading char * but 'l' and 'w' + * force reading WCHAR. */ + case 's': + if (w_prefix || l_prefix) goto widecharstring; + else if (h_prefix) goto charstring; #ifdef WIDE_SCANF - else goto widecharstring; + else goto widecharstring; #else /* WIDE_SCANF */ - else goto charstring; + else goto charstring; #endif /* WIDE_SCANF */ - case 'S': - if (w_prefix || l_prefix) goto widecharstring; - else if (h_prefix) goto charstring; + case 'S': + if (w_prefix || l_prefix) goto widecharstring; + else if (h_prefix) goto charstring; #ifdef WIDE_SCANF - else goto charstring; + else goto charstring; #else /* WIDE_SCANF */ - else goto widecharstring; + else goto widecharstring; #endif /* WIDE_SCANF */ - charstring: { /* read a word into a char */ - char*str = suppress ? NULL : va_arg(ap, char*); + charstring: { /* read a word into a char */ + char*str = suppress ? NULL : va_arg(ap, char*); char*sptr = str; /* skip initial whitespace */ while ((nch!=_EOF_) && _ISSPACE_(nch)) @@ -356,15 +356,15 @@ /* read until whitespace */ while (width!=0 && (nch!=_EOF_) && !_ISSPACE_(nch)) { if (!suppress) *sptr++ = _CHAR2SUPPORTED_(nch); - st++; + st++; nch = _GETC_(file); - if (width>0) width--; + if (width>0) width--; } /* terminate */ if (!suppress) *sptr = 0; } break; - widecharstring: { /* read a word into a wchar_t* */ + widecharstring: { /* read a word into a wchar_t* */ wchar_t*str = suppress ? NULL : va_arg(ap, wchar_t*); wchar_t*sptr = str; @@ -374,33 +374,33 @@ /* read until whitespace */ while (width!=0 && (nch!=_EOF_) && !_ISSPACE_(nch)) { if (!suppress) *sptr++ = _WIDE2SUPPORTED_(nch); - st++; + st++; nch = _GETC_(file); - if (width>0) width--; + if (width>0) width--; } /* terminate */ if (!suppress) *sptr = 0; } break; /* 'c' and 'C work analogously to 's' and 'S' as described - * above */ - case 'c': - if (w_prefix || l_prefix) goto widecharacter; - else if (h_prefix) goto character; + * above */ + case 'c': + if (w_prefix || l_prefix) goto widecharacter; + else if (h_prefix) goto character; #ifdef WIDE_SCANF - else goto widecharacter; + else goto widecharacter; #else /* WIDE_SCANF */ - else goto character; + else goto character; #endif /* WIDE_SCANF */ - case 'C': - if (w_prefix || l_prefix) goto widecharacter; - else if (h_prefix) goto character; + case 'C': + if (w_prefix || l_prefix) goto widecharacter; + else if (h_prefix) goto character; #ifdef WIDE_SCANF - else goto character; + else goto character; #else /* WIDE_SCANF */ - else goto widecharacter; + else goto widecharacter; #endif /* WIDE_SCANF */ - character: { /* read single character into char */ + character: { /* read single character into char */ if (nch!=_EOF_) { if (!suppress) { char*c = va_arg(ap, char*); @@ -410,8 +410,8 @@ nch = _GETC_(file); } } - break; - widecharacter: { /* read single character into a wchar_t */ + break; + widecharacter: { /* read single character into a wchar_t */ if (nch!=_EOF_) { if (!suppress) { wchar_t*c = va_arg(ap, wchar_t*); @@ -420,80 +420,103 @@ nch = _GETC_(file); st = 1; } - } - break; - case 'n': { - if (!suppress) { - int*n = va_arg(ap, int*); - *n = consumed - (nch!=_EOF_); - } - } - break; - case '[': { + } + break; + case 'n': { + if (!suppress) { + int*n = va_arg(ap, int*); + + /* + *n = consumed - (nch!=_EOF_); + + FIXME: The above is the Wine version and it doesnt work in ros + when %n is at end of input string (return one too many). + But does it fail in Wine too?? If so wine also needs fixin. + -Gunnar + */ + + *n = consumed - 1; + } + /* This is an odd one: according to the standard, + * "Execution of a %n directive does not increment the + * assignment count returned at the completion of + * execution" even if it wasn't suppressed with the + * '*' flag. The Corrigendum to the standard seems + * to contradict this (comment out the assignment to + * suppress below if you want to implement these + * alternate semantics) but the windows program I'm + * looking at expects the behavior I've coded here + * (which happens to be what glibc does as well). + */ + suppress = 1; + st = 1; + } + break; + case '[': { _CHAR_ *str = suppress ? NULL : va_arg(ap, _CHAR_*); _CHAR_ *sptr = str; - RTL_BITMAP bitMask; + RTL_BITMAP bitMask; ULONG *Mask; - int invert = 0; /* Set if we are NOT to find the chars */ + int invert = 0; /* Set if we are NOT to find the chars */ - /* Init our bitmap */ + /* Init our bitmap */ Mask = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, _BITMAPSIZE_/8); - RtlInitializeBitMap(&bitMask, Mask, _BITMAPSIZE_); + RtlInitializeBitMap(&bitMask, Mask, _BITMAPSIZE_); - /* Read the format */ - format++; - if(*format == '^') { - invert = 1; - format++; - } - if(*format == ']') { - RtlSetBits(&bitMask, ']', 1); - format++; - } + /* Read the format */ + format++; + if(*format == '^') { + invert = 1; + format++; + } + if(*format == ']') { + RtlSetBits(&bitMask, ']', 1); + format++; + } while(*format && (*format != ']')) { - /* According to: - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore9 8/html/_crt_scanf_width_specification.asp - * "Note that %[a-z] and %[z-a] are interpreted as equivalent to %[abcde...z]." */ - if((*format == '-') && (*(format + 1) != ']')) { - if ((*(format - 1)) < *(format + 1)) - RtlSetBits(&bitMask, *(format - 1) +1 , *(format + 1) - *(format - 1)); - else - RtlSetBits(&bitMask, *(format + 1) , *(format - 1) - *(format + 1)); - format++; - } else - RtlSetBits(&bitMask, *format, 1); - format++; - } + /* According to: + * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore9 8/html/_crt_scanf_width_specification.asp + * "Note that %[a-z] and %[z-a] are interpreted as equivalent to %[abcde...z]." */ + if((*format == '-') && (*(format + 1) != ']')) { + if ((*(format - 1)) < *(format + 1)) + RtlSetBits(&bitMask, *(format - 1) +1 , *(format + 1) - *(format - 1)); + else + RtlSetBits(&bitMask, *(format + 1) , *(format - 1) - *(format + 1)); + format++; + } else + RtlSetBits(&bitMask, *format, 1); + format++; + } /* read until char is not suitable */ while ((width != 0) && (nch != _EOF_)) { - if(!invert) { - if(RtlAreBitsSet(&bitMask, nch, 1)) { - if (!suppress) *sptr++ = _CHAR2SUPPORTED_(nch); - } else - break; - } else { - if(RtlAreBitsClear(&bitMask, nch, 1)) { - if (!suppress) *sptr++ = _CHAR2SUPPORTED_(nch); - } else - break; - } + if(!invert) { + if(RtlAreBitsSet(&bitMask, nch, 1)) { + if (!suppress) *sptr++ = _CHAR2SUPPORTED_(nch); + } else + break; + } else { + if(RtlAreBitsClear(&bitMask, nch, 1)) { + if (!suppress) *sptr++ = _CHAR2SUPPORTED_(nch); + } else + break; + } st++; nch = _GETC_(file); if (width>0) width--; } /* terminate */ if (!suppress) *sptr = 0; - HeapFree(GetProcessHeap(), 0, Mask); + HeapFree(GetProcessHeap(), 0, Mask); } break; default: - /* From spec: "if a percent sign is followed by a character - * that has no meaning as a format-control character, that - * character and the following characters are treated as - * an ordinary sequence of characters, that is, a sequence - * of characters that must match the input. For example, - * to specify that a percent-sign character is to be input, - * use %%." */ + /* From spec: "if a percent sign is followed by a character + * that has no meaning as a format-control character, that + * character and the following characters are treated as + * an ordinary sequence of characters, that is, a sequence + * of characters that must match the input. For example, + * to specify that a percent-sign character is to be input, + * use %%." */ while ((nch!=_EOF_) && _ISSPACE_(nch)) nch = _GETC_(file); if (nch==*format) { @@ -506,18 +529,18 @@ if (st && !suppress) rd++; else if (!st) break; } - /* a non-white-space character causes scanf to read, but not store, - * a matching non-white-space character. */ + /* a non-white-space character causes scanf to read, but not store, + * a matching non-white-space character. */ else { /* check for character match */ if (nch == *format) { - nch = _GETC_(file); + nch = _GETC_(file); } else break; } format++; } if (nch!=_EOF_) { - _UNGETC_(nch, file); + _UNGETC_(nch, file); } TRACE("returning %d\n", rd); return rd;

19 years, 9 months

[robertk] 14153: To do once more a little piece os2ss

by robertk＠svn.reactos.com

To do once more a little piece os2ss Added: trunk/os2/lib/doscalls/memory/ Added: trunk/os2/lib/doscalls/memory/memory.cpp _____ Added: trunk/os2/lib/doscalls/memory/memory.cpp --- trunk/os2/lib/doscalls/memory/memory.cpp 2005-03-16 23:23:44 UTC (rev 14152) +++ trunk/os2/lib/doscalls/memory/memory.cpp 2005-03-16 23:51:26 UTC (rev 14153) @@ -0,0 +1,40 @@ + + + +// TODO: HEader: To be pasted + + + + +// INCL_DOSMEMMGR || !INCL_NOCOMMON +#define INCL_DOSMEMMGR +#undefine INCL_NOCOMMON + +#include <os2.h> + + +// TODO: Expain that this is for memory alloc/free funcs of Os2 api + + + +// TODO: Implement functions and give them bodies +ULONG DosAllocMem (PPVOID pBaseAddress, ULONG ulObjectSize, + ULONG ulAllocationFlags); +ULONG DosAllocSharedMem (PPVOID pBaseAddress, PCSZ pszName, + ULONG ulObjectSize, ULONG ulAllocationFlags); +ULONG DosFreeMem (PVOID pBaseAddress); +ULONG DosGetNamedSharedMem (PPVOID pBaseAddress, PCSZ pszSharedMemName, + ULONG ulAttributeFlags); +ULONG DosGetSharedMem (CPVOID pBaseAddress, ULONG ulAttributeFlags); +ULONG DosGiveSharedMem (CPVOID pBaseAddress, PID idProcessId, + ULONG ulAttributeFlags); +ULONG DosQueryMem (CPVOID pBaseAddress, PULONG pulRegionSize, + PULONG pulAllocationFlags); +ULONG DosSetMem (CPVOID pBaseAddress, ULONG ulRegionSize, + ULONG ulAttributeFlags); +ULONG DosSubAllocMem (PVOID pOffset, PPVOID pBlockOffset, ULONG ulSize); +ULONG DosSubFreeMem (PVOID pOffset, PVOID pBlockOffset, ULONG ulSize); +ULONG DosSubSetMem (PVOID pOffset, ULONG ulFlags, ULONG ulSize); +ULONG DosSubUnsetMem (PVOID pOffset); + +// TODO: Add file to makefile \ No newline at end of file

19 years, 9 months

[greatlrd] 14152: add regsvr.c from wine as frist implement of ddraw.

by greatlrd＠svn.reactos.com

add regsvr.c from wine as frist implement of ddraw. so it can registrate it selv into the register. Modified: trunk/reactos/lib/ddraw/Makefile Modified: trunk/reactos/lib/ddraw/ddraw.c Added: trunk/reactos/lib/ddraw/regsvr.c _____ Modified: trunk/reactos/lib/ddraw/Makefile --- trunk/reactos/lib/ddraw/Makefile 2005-03-16 23:21:00 UTC (rev 14151) +++ trunk/reactos/lib/ddraw/Makefile 2005-03-16 23:23:44 UTC (rev 14152) @@ -7,14 +7,16 @@ TARGET_NAME = ddraw # -fno-builtin -TARGET_CFLAGS = -D__USE_W32API +TARGET_CFLAGS = -D__USE_W32API -I$(PATH_TO_TOP)/include/wine # require os code to explicitly request A/W version of structs/functions -TARGET_CFLAGS += -D_DISABLE_TIDENTS -Wall -Werror +TARGET_CFLAGS += -D_DISABLE_TIDENTS -Wall -Werror -TARGET_SDKLIBS = ntdll.a gdi32.a +TARGET_SDKLIBS = ntdll.a gdi32.a dxguid.a ole32.a user32.a + TARGET_OBJECTS = \ + regsvr.o \ ddraw.o DEP_OBJECTS = $(TARGET_OBJECTS) _____ Modified: trunk/reactos/lib/ddraw/ddraw.c --- trunk/reactos/lib/ddraw/ddraw.c 2005-03-16 23:21:00 UTC (rev 14151) +++ trunk/reactos/lib/ddraw/ddraw.c 2005-03-16 23:23:44 UTC (rev 14152) @@ -19,7 +19,7 @@ DWORD FAR* lplpDD, IUnknown FAR* pUnkOuter ) -{ +{ return DD_OK; } _____ Added: trunk/reactos/lib/ddraw/regsvr.c --- trunk/reactos/lib/ddraw/regsvr.c 2005-03-16 23:21:00 UTC (rev 14151) +++ trunk/reactos/lib/ddraw/regsvr.c 2005-03-16 23:23:44 UTC (rev 14152) @@ -0,0 +1,497 @@ +/* + * self-registerable dll functions for ddraw.dll + * + * Copyright (C) 2003 John K. Hohm + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * this file are from wine ddraw with some modification + */ + +#include <stdarg.h> +#include <string.h> + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "wingdi.h" +#include "winuser.h" +#include "winerror.h" +#include "ddraw.h" + + +//#include "wine/debug.h" + +//WINE_DEFAULT_DEBUG_CHANNEL(ddraw); + +/* + * Near the bottom of this file are the exported DllRegisterServer and + * DllUnregisterServer, which make all this worthwhile. + */ + +/********************************************************************** * + * interface for self-registering + */ +struct regsvr_interface +{ + IID const *iid; /* NULL for end of list */ + LPCSTR name; /* can be NULL to omit */ + IID const *base_iid; /* can be NULL to omit */ + int num_methods; /* can be <0 to omit */ + CLSID const *ps_clsid; /* can be NULL to omit */ + CLSID const *ps_clsid32; /* can be NULL to omit */ +}; + +static HRESULT register_interfaces(struct regsvr_interface const *list); +static HRESULT unregister_interfaces(struct regsvr_interface const *list); + +struct regsvr_coclass +{ + CLSID const *clsid; /* NULL for end of list */ + LPCSTR name; /* can be NULL to omit */ + LPCSTR ips; /* can be NULL to omit */ + LPCSTR ips32; /* can be NULL to omit */ + LPCSTR ips32_tmodel; /* can be NULL to omit */ + LPCSTR clsid_str; /* can be NULL to omit */ + LPCSTR progid; /* can be NULL to omit */ +}; + +static HRESULT register_coclasses(struct regsvr_coclass const *list); +static HRESULT unregister_coclasses(struct regsvr_coclass const *list); + +/********************************************************************** * + * static string constants + */ +static WCHAR const interface_keyname[10] = { + 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 0 }; +static WCHAR const base_ifa_keyname[14] = { + 'B', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', + 'e', 0 }; +static WCHAR const num_methods_keyname[11] = { + 'N', 'u', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', 0 }; +static WCHAR const ps_clsid_keyname[15] = { + 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', + 'i', 'd', 0 }; +static WCHAR const ps_clsid32_keyname[17] = { + 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', + 'i', 'd', '3', '2', 0 }; +static WCHAR const clsid_keyname[6] = { + 'C', 'L', 'S', 'I', 'D', 0 }; +static WCHAR const ips_keyname[13] = { + 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', + 0 }; +static WCHAR const ips32_keyname[15] = { + 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', + '3', '2', 0 }; +static WCHAR const progid_keyname[7] = { + 'P', 'r', 'o', 'g', 'I', 'D', 0 }; +static char const tmodel_valuename[] = "ThreadingModel"; + +/********************************************************************** * + * static helper functions + */ +static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid); +static LONG register_key_defvalueW(HKEY base, WCHAR const *name, + WCHAR const *value); +static LONG register_key_defvalueA(HKEY base, WCHAR const *name, + char const *value); +static LONG recursive_delete_key(HKEY key); +static LONG recursive_delete_keyA(HKEY base, char const *name); +static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); + +/********************************************************************** * + * register_interfaces + */ +static HRESULT register_interfaces(struct regsvr_interface const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY interface_key; + + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &interface_key, NULL); + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->iid; ++list) { + WCHAR buf[39]; + HKEY iid_key; + + StringFromGUID2(list->iid, buf, 39); + res = RegCreateKeyExW(interface_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &iid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_interface_key; + + if (list->name) { + res = RegSetValueExA(iid_key, NULL, 0, REG_SZ, + (CONST BYTE*)(list->name), + strlen(list->name) + 1); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->base_iid) { + register_key_guid(iid_key, base_ifa_keyname, list->base_iid); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (0 <= list->num_methods) { + static WCHAR const fmt[3] = { '%', 'd', 0 }; + HKEY key; + + res = RegCreateKeyExW(iid_key, num_methods_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + + wsprintfW(buf, fmt, list->num_methods); + res = RegSetValueExW(key, NULL, 0, REG_SZ, + (CONST BYTE*)buf, + (lstrlenW(buf) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->ps_clsid) { + register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->ps_clsid32) { + register_key_guid(iid_key, ps_clsid32_keyname, list->ps_clsid32); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + error_close_iid_key: + RegCloseKey(iid_key); + } + +error_close_interface_key: + RegCloseKey(interface_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/********************************************************************** * + * unregister_interfaces + */ +static HRESULT unregister_interfaces(struct regsvr_interface const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY interface_key; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, + KEY_READ | KEY_WRITE, &interface_key); + if (res == ERROR_FILE_NOT_FOUND) return S_OK; + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->iid; ++list) { + WCHAR buf[39]; + + StringFromGUID2(list->iid, buf, 39); + res = recursive_delete_keyW(interface_key, buf); + } + + RegCloseKey(interface_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/********************************************************************** * + * register_coclasses + */ +static HRESULT register_coclasses(struct regsvr_coclass const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY coclass_key; + + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL); + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->clsid; ++list) { + WCHAR buf[39]; + HKEY clsid_key; + + StringFromGUID2(list->clsid, buf, 39); + res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + + if (list->name) { + res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ, + (CONST BYTE*)(list->name), + strlen(list->name) + 1); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->ips) { + res = register_key_defvalueA(clsid_key, ips_keyname, list->ips); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->ips32) { + HKEY ips32_key; + + res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &ips32_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ, + (CONST BYTE*)list->ips32, + lstrlenA(list->ips32) + 1); + if (res == ERROR_SUCCESS && list->ips32_tmodel) + res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ, + (CONST BYTE*)list->ips32_tmodel, + strlen(list->ips32_tmodel) + 1); + RegCloseKey(ips32_key); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->clsid_str) { + res = register_key_defvalueA(clsid_key, clsid_keyname, + list->clsid_str); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->progid) { + HKEY progid_key; + + res = register_key_defvalueA(clsid_key, progid_keyname, + list->progid); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = RegCreateKeyExA(HKEY_CLASSES_ROOT, list->progid, 0, + NULL, 0, KEY_READ | KEY_WRITE, NULL, + &progid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = register_key_defvalueW(progid_key, clsid_keyname, buf); + RegCloseKey(progid_key); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + error_close_clsid_key: + RegCloseKey(clsid_key); + } + +error_close_coclass_key: + RegCloseKey(coclass_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/********************************************************************** * + * unregister_coclasses + */ +static HRESULT unregister_coclasses(struct regsvr_coclass const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY coclass_key; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, + KEY_READ | KEY_WRITE, &coclass_key); + if (res == ERROR_FILE_NOT_FOUND) return S_OK; + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->clsid; ++list) { + WCHAR buf[39]; + + StringFromGUID2(list->clsid, buf, 39); + res = recursive_delete_keyW(coclass_key, buf); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + + if (list->progid) { + res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + } + } + +error_close_coclass_key: + RegCloseKey(coclass_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/********************************************************************** * + * regsvr_key_guid + */ +static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid) +{ + WCHAR buf[39]; + + StringFromGUID2(guid, buf, 39); + return register_key_defvalueW(base, name, buf); +} + +/********************************************************************** * + * regsvr_key_defvalueW + */ +static LONG register_key_defvalueW( + HKEY base, + WCHAR const *name, + WCHAR const *value) +{ + LONG res; + HKEY key; + + res = RegCreateKeyExW(base, name, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) return res; + res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)value, + (lstrlenW(value) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + return res; +} + +/********************************************************************** * + * regsvr_key_defvalueA + */ +static LONG register_key_defvalueA( + HKEY base, + WCHAR const *name, + char const *value) +{ + LONG res; + HKEY key; + + res = RegCreateKeyExW(base, name, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) return res; + res = RegSetValueExA(key, NULL, 0, REG_SZ, (CONST BYTE*)value, + lstrlenA(value) + 1); + RegCloseKey(key); + return res; +} + +/********************************************************************** * + * recursive_delete_key + */ +static LONG recursive_delete_key(HKEY key) +{ + LONG res; + WCHAR subkey_name[MAX_PATH]; + DWORD cName; + HKEY subkey; + + for (;;) { + cName = sizeof(subkey_name) / sizeof(WCHAR); + res = RegEnumKeyExW(key, 0, subkey_name, &cName, + NULL, NULL, NULL, NULL); + if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { + res = ERROR_SUCCESS; /* presumably we're done enumerating */ + break; + } + res = RegOpenKeyExW(key, subkey_name, 0, + KEY_READ | KEY_WRITE, &subkey); + if (res == ERROR_FILE_NOT_FOUND) continue; + if (res != ERROR_SUCCESS) break; + + res = recursive_delete_key(subkey); + RegCloseKey(subkey); + if (res != ERROR_SUCCESS) break; + } + + if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); + return res; +} + +/********************************************************************** * + * recursive_delete_keyA + */ +static LONG recursive_delete_keyA(HKEY base, char const *name) +{ + LONG res; + HKEY key; + + res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); + if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; + if (res != ERROR_SUCCESS) return res; + res = recursive_delete_key(key); + RegCloseKey(key); + return res; +} + +/********************************************************************** * + * recursive_delete_keyW + */ +static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) +{ + LONG res; + HKEY key; + + res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); + if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; + if (res != ERROR_SUCCESS) return res; + res = recursive_delete_key(key); + RegCloseKey(key); + return res; +} + +/********************************************************************** * + * coclass list + */ + +static struct regsvr_coclass const coclass_list[] = { + { &CLSID_DirectDraw, + "DirectDraw Object", + NULL, + "ddraw.dll", + "Both" + }, + { &CLSID_DirectDrawClipper, + "DirectDraw Clipper Object", + NULL, + "ddraw.dll", + "Both" + }, + { NULL } /* list terminator */ +}; + +/********************************************************************** * + * interface list + */ + +static struct regsvr_interface const interface_list[] = { + { NULL } /* list terminator */ +}; + +/********************************************************************** * + * DllRegisterServer (DDRAW.@) + */ +HRESULT WINAPI DDRAW_DllRegisterServer() +{ + HRESULT hr; + + //TRACE("\n"); + + hr = register_coclasses(coclass_list); + if (SUCCEEDED(hr)) + hr = register_interfaces(interface_list); + return hr; +} + +/********************************************************************** * + * DllUnregisterServer (DDRAW.@) + */ +HRESULT WINAPI DDRAW_DllUnregisterServer() +{ + HRESULT hr; + + //TRACE("\n"); + + hr = unregister_coclasses(coclass_list); + if (SUCCEEDED(hr)) + hr = unregister_interfaces(interface_list); + return hr; +}

19 years, 9 months

[greatlrd] 14151: small change to start to implement ddraw.dll

by greatlrd＠svn.reactos.com

small change to start to implement ddraw.dll Modified: trunk/reactos/include/ddraw.h _____ Modified: trunk/reactos/include/ddraw.h --- trunk/reactos/include/ddraw.h 2005-03-16 23:17:33 UTC (rev 14150) +++ trunk/reactos/include/ddraw.h 2005-03-16 23:21:00 UTC (rev 14151) @@ -27,6 +27,21 @@ #ifndef __DDRAW_GUID_DEFINED__ DEFINE_GUID( CLSID_DirectDraw, 0xD7B70EE0,0x4340,0x11CF,0xB0,0x63,0x00,0x20,0xAF,0xC2,0xCD,0x35 ); +DEFINE_GUID( CLSID_DirectDraw7, 0x3C305196,0x50DB,0x11D3,0x9C,0xFE,0x00,0xC0,0x4F,0xD9,0x30,0xC5 ); +DEFINE_GUID( CLSID_DirectDrawClipper, 0x593817A0,0x7DB3,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xb9,0x33,0x56 ); +DEFINE_GUID( IID_IDirectDraw, 0x6C14DB80,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 ); +DEFINE_GUID( IID_IDirectDraw2, 0xB3A6F3E0,0x2B43,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56 ); +DEFINE_GUID( IID_IDirectDraw4, 0x9c59509a,0x39bd,0x11d1,0x8c,0x4a,0x00,0xc0,0x4f,0xd9,0x30,0xc5 ); +DEFINE_GUID( IID_IDirectDraw7, 0x15e65ec0,0x3b9c,0x11d2,0xb9,0x2f,0x00,0x60,0x97,0x97,0xea,0x5b ); +DEFINE_GUID( IID_IDirectDrawSurface, 0x6C14DB81,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 ); +DEFINE_GUID( IID_IDirectDrawSurface2, 0x57805885,0x6eec,0x11cf,0x94,0x41,0xa8,0x23,0x03,0xc1,0x0e,0x27 ); +DEFINE_GUID( IID_IDirectDrawSurface3, 0xDA044E00,0x69B2,0x11D0,0xA1,0xD5,0x00,0xAA,0x00,0xB8,0xDF,0xBB ); +DEFINE_GUID( IID_IDirectDrawSurface4, 0x0B2B8630,0xAD35,0x11D0,0x8E,0xA6,0x00,0x60,0x97,0x97,0xEA,0x5B ); +DEFINE_GUID( IID_IDirectDrawSurface7, 0x06675a80,0x3b9b,0x11d2,0xb9,0x2f,0x00,0x60,0x97,0x97,0xea,0x5b ); +DEFINE_GUID( IID_IDirectDrawPalette, 0x6C14DB84,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 ); +DEFINE_GUID( IID_IDirectDrawClipper, 0x6C14DB85,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 ); +DEFINE_GUID( IID_IDirectDrawColorControl,0x4B9F0EE0,0x0D7E,0x11D0,0x9B,0x06,0x00,0xA0 ,0xC9,0x03,0xA3,0xB8 ); +DEFINE_GUID( IID_IDirectDrawGammaControl,0x69C11C3E,0xB46B,0x11D1,0xAD,0x7A,0x00,0xC0 ,0x4F,0xC2,0x9B,0x4E ); #endif

19 years, 9 months

[greatlrd] 14150: small change to start to implement ddraw.dll

by greatlrd＠svn.reactos.com

19 years, 9 months

[gvg] 14149: Add riched20.dll, msi.dll and msiexec.exe to bootcd

by gvg＠svn.reactos.com

Add riched20.dll, msi.dll and msiexec.exe to bootcd Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-03-16 22:27:47 UTC (rev 14148) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-03-16 22:52:55 UTC (rev 14149) @@ -99,6 +99,7 @@ lib\msacm\msacm32.dll 1 lib\msafd\msafd.dll 1 lib\msgina\msgina.dll 1 +lib\msi\msi.dll 1 lib\msimg32\msimg32.dll 1 lib\msvcrt\msvcrt.dll 1 lib\msvcrt20\msvcrt20.dll 1 @@ -108,6 +109,7 @@ lib\oleaut32\oleaut32.dll 1 lib\olepro32\olepro32.dll 1 lib\psapi\psapi.dll 1 +lib\riched20\riched20.dll 1 lib\richedit\riched32.dll 1 lib\rpcrt4\rpcrt4.dll 1 lib\samlib\samlib.dll 1 @@ -146,8 +148,9 @@ subsys\system\explorer\explorer.exe 4 subsys\system\explorer\explorer-cfg-template.xml 4 subsys\system\explorer\notifyhook\notifyhook.dll 1 +subsys\system\format\format.exe 1 subsys\system\ibrowser\ibrowser.exe 1 -subsys\system\format\format.exe 1 +subsys\system\msiexec\msiexec.exe 1 subsys\system\notepad\notepad.exe 1 subsys\system\regedit\regedit.exe 4 subsys\system\regsvr32\regsvr32.exe 1

19 years, 9 months

[hpoussin] 14148: Better NtUserEnumDisplayDevices stub

by hpoussin＠svn.reactos.com

Better NtUserEnumDisplayDevices stub Modified: trunk/reactos/subsys/win32k/ntuser/stubs.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/stubs.c --- trunk/reactos/subsys/win32k/ntuser/stubs.c 2005-03-16 22:19:12 UTC (rev 14147) +++ trunk/reactos/subsys/win32k/ntuser/stubs.c 2005-03-16 22:27:47 UTC (rev 14148) @@ -237,9 +237,24 @@ PDISPLAY_DEVICE lpDisplayDevice, /* device information */ DWORD dwFlags ) /* reserved */ { - UNIMPLEMENTED + DPRINT1("NtUserEnumDisplayDevices() is UNIMPLEMENTED!\n"); + if (lpDevice->Length == 0 && iDevNum > 0) + { + /* Only one display device present */ + return FALSE; + } + if (lpDisplayDevice->cb < sizeof(DISPLAY_DEVICE)) + return FALSE; - return 0; + swprintf(lpDisplayDevice->DeviceName, L"\\\\.\\DISPLAY1"); + swprintf(lpDisplayDevice->DeviceString, L"<Unknown>"); + lpDisplayDevice->StateFlags = DISPLAY_DEVICE_ATTACHED_TO_DESKTOP + | DISPLAY_DEVICE_MODESPRUNED + | DISPLAY_DEVICE_PRIMARY_DEVICE + | DISPLAY_DEVICE_VGA_COMPATIBLE; + lpDisplayDevice->DeviceID[0] = L'0'; + lpDisplayDevice->DeviceKey[0] = L'0'; + return TRUE; } DWORD

19 years, 9 months

[hpoussin] 14147: Implement resolution and color depth selection.

by hpoussin＠svn.reactos.com

Implement resolution and color depth selection. Applying new settings doesn't work due to unimplemented NtUserChangeDisplaySettings Modified: trunk/reactos/lib/cpl/desk/en.rc Modified: trunk/reactos/lib/cpl/desk/resource.h Modified: trunk/reactos/lib/cpl/desk/settings.c _____ Modified: trunk/reactos/lib/cpl/desk/en.rc --- trunk/reactos/lib/cpl/desk/en.rc 2005-03-16 22:18:42 UTC (rev 14146) +++ trunk/reactos/lib/cpl/desk/en.rc 2005-03-16 22:19:12 UTC (rev 14147) @@ -42,8 +42,20 @@ CAPTION "Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 110,112,8 + LTEXT "&Display:",1820,3,140,30,8 + LTEXT "<none>",IDC_SETTINGS_DEVICE,9,149,224,8 + GROUPBOX "&Screen area",1818,3,160,115,43 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, + 30,170,58,17 + LTEXT "Less",1815,9,170,15,8,NOT WS_GROUP + LTEXT "More",1816,93,170,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP + GROUPBOX "&Colors",1817,125,160,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP + CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, + 131,188,103,9 + PUSHBUTTON "Ad&vanced...",IDC_SETTINGS_ADVANCED,306,205,56,14 END STRINGTABLE _____ Modified: trunk/reactos/lib/cpl/desk/resource.h --- trunk/reactos/lib/cpl/desk/resource.h 2005-03-16 22:18:42 UTC (rev 14146) +++ trunk/reactos/lib/cpl/desk/resource.h 2005-03-16 22:19:12 UTC (rev 14147) @@ -36,5 +36,11 @@ #define IDS_STRETCH 2004 #define IDS_TILE 2005 +#define IDC_SETTINGS_DEVICE 201 +#define IDC_SETTINGS_BPP 202 +#define IDC_SETTINGS_RESOLUTION 203 +#define IDC_SETTINGS_RESOLUTION_TEXT 204 +#define IDC_SETTINGS_ADVANCED 205 + #endif /* __CPL_DESK_RESOURCE_H__ */ _____ Modified: trunk/reactos/lib/cpl/desk/settings.c --- trunk/reactos/lib/cpl/desk/settings.c 2005-03-16 22:18:42 UTC (rev 14146) +++ trunk/reactos/lib/cpl/desk/settings.c 2005-03-16 22:19:12 UTC (rev 14147) @@ -6,29 +6,562 @@ * PURPOSE: Settings property page * * PROGRAMMERS: Trevor McCort (lycan359(a)gmail.com) + * HervÚ Poussineau (poussine(a)freesurf.fr) */ #include <windows.h> #include <commctrl.h> +#include <stdio.h> +#include <tchar.h> #include "resource.h" -INT_PTR CALLBACK SettingsPageProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) +/* As slider control can't contain user data, we have to keep an + * array of RESOLUTION_INFO to have our own associated data. + */ +typedef struct _RESOLUTION_INFO { - switch(uMsg) - { - case WM_INITDIALOG: - { - } break; - - case WM_COMMAND: - { - } break; - } - - return FALSE; + DWORD dmPelsWidth; + DWORD dmPelsHeight; +} RESOLUTION_INFO, *PRESOLUTION_INFO; + +typedef struct _SETTINGS_ENTRY +{ + struct _SETTINGS_ENTRY *Blink; + struct _SETTINGS_ENTRY *Flink; + DWORD dmBitsPerPel; + DWORD dmPelsWidth; + DWORD dmPelsHeight; +} SETTINGS_ENTRY, *PSETTINGS_ENTRY; + +typedef struct _DISPLAY_DEVICE_ENTRY +{ + struct _DISPLAY_DEVICE_ENTRY *Flink; + LPTSTR DeviceDescription; + LPTSTR DeviceName; + PSETTINGS_ENTRY Settings; /* sorted by increasing dmPelsHeight, BPP */ + DWORD SettingsCount; + PRESOLUTION_INFO Resolutions; + DWORD ResolutionsCount; + PSETTINGS_ENTRY CurrentSettings; /* Points into Settings list */ + SETTINGS_ENTRY InitialSettings; +} DISPLAY_DEVICE_ENTRY, *PDISPLAY_DEVICE_ENTRY; + +static PDISPLAY_DEVICE_ENTRY DisplayDeviceList = NULL; +static PDISPLAY_DEVICE_ENTRY CurrentDisplayDevice = NULL; + +static VOID +UpdateDisplay(IN HWND hwndDlg) +{ + TCHAR Buffer[64]; + DWORD index; + + _stprintf(Buffer, TEXT("%lux%lu"), CurrentDisplayDevice->CurrentSettings->dmPelsWidth, CurrentDisplayDevice->CurrentSettings->dmPelsHeight); + SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION_TEXT, WM_SETTEXT, 0, (LPARAM)Buffer); + + for (index = 0; index < CurrentDisplayDevice->ResolutionsCount; index++) + if (CurrentDisplayDevice->Resolutions[index].dmPelsWidth == CurrentDisplayDevice->CurrentSettings->dmPelsWidth && + CurrentDisplayDevice->Resolutions[index].dmPelsHeight == CurrentDisplayDevice->CurrentSettings->dmPelsHeight) + { + SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION, TBM_SETPOS, TRUE, index); + break; + } + _stprintf(Buffer, TEXT("%d bits"), CurrentDisplayDevice->CurrentSettings->dmBitsPerPel); + SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_SELECTSTRING, -1, (LPARAM)Buffer); } +static PSETTINGS_ENTRY +GetPossibleSettings(IN LPTSTR DeviceName, OUT DWORD* pSettingsCount, OUT PSETTINGS_ENTRY* CurrentSettings) +{ + DEVMODE devmode; + DWORD NbSettings = 0; + DWORD iMode = 0; + DWORD dwFlags = 0; + PSETTINGS_ENTRY Settings = NULL; + HDC hDC; + PSETTINGS_ENTRY Current; + DWORD bpp, xres, yres; + + /* Get current settings */ + *CurrentSettings = NULL; + hDC = CreateIC(NULL, DeviceName, NULL, NULL); + bpp = GetDeviceCaps(hDC, PLANES); + bpp *= GetDeviceCaps(hDC, BITSPIXEL); + xres = GetDeviceCaps(hDC, HORZRES); + yres = GetDeviceCaps(hDC, VERTRES); + DeleteDC(hDC); + + /* List all settings */ + devmode.dmSize = (WORD)sizeof(DEVMODE); + devmode.dmDriverExtra = 0; + while (EnumDisplaySettingsEx(DeviceName, NbSettings, &devmode, dwFlags)) + { + Current = HeapAlloc(GetProcessHeap(), 0, sizeof(SETTINGS_ENTRY)); + if (Current != NULL) + { + /* Sort resolutions by increasing height, and BPP */ + PSETTINGS_ENTRY Previous = NULL; + PSETTINGS_ENTRY Next = Settings; + Current->dmPelsWidth = devmode.dmPelsWidth; + Current->dmPelsHeight = devmode.dmPelsHeight; + Current->dmBitsPerPel = devmode.dmBitsPerPel; + while (Next != NULL && ( + Next->dmPelsHeight < Current->dmPelsHeight || + (Next->dmPelsHeight == Current->dmPelsHeight && Next->dmBitsPerPel < Current->dmBitsPerPel))) + { + Previous = Next; + Next = Next->Flink; + } + Current->Blink = Previous; + Current->Flink = Next; + if (Previous == NULL) + Settings = Current; + else + Previous->Flink = Current; + if (Next != NULL) + Next->Blink = Current; + if (devmode.dmPelsWidth == xres && devmode.dmPelsHeight == yres && devmode.dmBitsPerPel == bpp) + { + *CurrentSettings = Current; + } + NbSettings++; + } + iMode++; + } + + *pSettingsCount = NbSettings; + return Settings; +} + +static VOID +AddDisplayDevice(IN LPTSTR Description, IN LPTSTR DeviceName) +{ + PDISPLAY_DEVICE_ENTRY newEntry = NULL; + LPTSTR description = NULL; + LPTSTR name = NULL; + DWORD descriptionSize; + DWORD nameSize; + PSETTINGS_ENTRY Current; + DWORD ResolutionsCount = 1; + DWORD i; + + newEntry = HeapAlloc(GetProcessHeap(), 0, sizeof(DISPLAY_DEVICE_ENTRY)); + if (!newEntry) goto ByeBye; + + newEntry->Settings = GetPossibleSettings(DeviceName, &newEntry->SettingsCount, &newEntry->CurrentSettings); + if (!newEntry->Settings) goto ByeBye; + + newEntry->InitialSettings.dmPelsWidth = newEntry->CurrentSettings->dmPelsWidth; + newEntry->InitialSettings.dmPelsHeight = newEntry->CurrentSettings->dmPelsHeight; + newEntry->InitialSettings.dmBitsPerPel = newEntry->CurrentSettings->dmBitsPerPel; + + /* Count different resolutions */ + for (Current = newEntry->Settings; Current != NULL; Current = Current->Flink) + if (Current->Flink != NULL && + ((Current->dmPelsWidth != Current->Flink->dmPelsWidth) || (Current->dmPelsHeight != Current->Flink->dmPelsHeight))) + ResolutionsCount++; + newEntry->Resolutions = HeapAlloc(GetProcessHeap(), 0, ResolutionsCount * sizeof(RESOLUTION_INFO)); + if (!newEntry->Resolutions) goto ByeBye; + newEntry->ResolutionsCount = ResolutionsCount; + /* Fill resolutions infos */ + for (Current = newEntry->Settings, i = 0; Current != NULL; Current = Current->Flink) + if (Current->Flink == NULL || (Current->Flink != NULL && + ((Current->dmPelsWidth != Current->Flink->dmPelsWidth) || (Current->dmPelsHeight != Current->Flink->dmPelsHeight)))) + { + newEntry->Resolutions[i].dmPelsWidth = Current->dmPelsWidth; + newEntry->Resolutions[i].dmPelsHeight = Current->dmPelsHeight; + i++; + } + + descriptionSize = (_tcslen(Description) + 1) * sizeof(TCHAR); + description = HeapAlloc(GetProcessHeap(), 0, descriptionSize); + if (!description) goto ByeBye; + + nameSize = (_tcslen(DeviceName) + 1) * sizeof(TCHAR); + name = HeapAlloc(GetProcessHeap(), 0, nameSize); + if (!name) goto ByeBye; + + memcpy(description, Description, descriptionSize); + memcpy(name, DeviceName, nameSize); + newEntry->DeviceDescription = description; + newEntry->DeviceName = name; + newEntry->Flink = DisplayDeviceList; + DisplayDeviceList = newEntry; + return; + +ByeBye: + if (newEntry != NULL) + { + if (newEntry->Settings != NULL) + { + Current = newEntry->Settings; + while (Current != NULL) + { + PSETTINGS_ENTRY Next = Current->Flink; + HeapFree(GetProcessHeap(), 0, Current); + Current = Next; + } + } + if (newEntry->Resolutions != NULL) + HeapFree(GetProcessHeap(), 0, newEntry->Resolutions); + HeapFree(GetProcessHeap(), 0, newEntry); + } + if (description != NULL) + HeapFree(GetProcessHeap(), 0, description); + if (name != NULL) + HeapFree(GetProcessHeap(), 0, name); +} + +static VOID +OnDisplayDeviceChanged(IN HWND hwndDlg, IN PDISPLAY_DEVICE_ENTRY pDeviceEntry) +{ + PSETTINGS_ENTRY Current; + DWORD index; + + CurrentDisplayDevice = pDeviceEntry; /* Update global variable */ + + /* Fill color depths combo box */ + SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_RESETCONTENT, 0, 0); + for (Current = pDeviceEntry->Settings; Current != NULL; Current = Current->Flink) + { + TCHAR Buffer[64]; + _stprintf(Buffer, TEXT("%d bits"), Current->dmBitsPerPel); + index = SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)Buffer); + if (index == CB_ERR) + { + index = SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_ADDSTRING, 0, (LPARAM)Buffer); + SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_SETITEMDATA, index, Current->dmBitsPerPel); + } + } + + /* Fill resolutions slider */ + SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION, TBM_CLEARTICS, TRUE, 0); + SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION, TBM_SETRANGE, TRUE, MAKELONG(0, pDeviceEntry->ResolutionsCount - 1)); + + UpdateDisplay(hwndDlg); +} + +static VOID +OnInitDialog(IN HWND hwndDlg) +{ + DWORD Result = 0; + DWORD iDevNum = 0; + DISPLAY_DEVICE displayDevice; + + /* Get video cards list */ + displayDevice.cb = (DWORD)sizeof(DISPLAY_DEVICE); + while (EnumDisplayDevices(NULL, iDevNum, &displayDevice, 0)) + { + if ((displayDevice.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) != 0) + { + AddDisplayDevice(displayDevice.DeviceString, displayDevice.DeviceName); + Result++; + } + iDevNum++; + } + if (Result == 0) + { + /* No adapter found */ + EnableWindow(GetDlgItem(hwndDlg, IDC_SETTINGS_BPP), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_SETTINGS_RESOLUTION), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_SETTINGS_RESOLUTION_TEXT), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_SETTINGS_ADVANCED), FALSE); + } + else if (Result == 1) + { + /* Single video adapter */ + SendDlgItemMessage(hwndDlg, IDC_SETTINGS_DEVICE, WM_SETTEXT, 0, (LPARAM)DisplayDeviceList->DeviceDescription); + OnDisplayDeviceChanged(hwndDlg, DisplayDeviceList); + } + else + { + /* FIXME: multi video adapter */ + /* FIXME: choose selected adapter being the primary one */ + } +} + +static VOID +OnBPPChanged(IN HWND hwndDlg) +{ + /* if new BPP is not compatible with resolution: + * 1) try to find the nearest smaller matching resolution + * 2) otherwise, get the nearest bigger resolution + */ + PSETTINGS_ENTRY Current; + DWORD dmNewBitsPerPel; + DWORD index; + TCHAR Buffer[64]; + + SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, WM_GETTEXT, (WPARAM)(sizeof(Buffer) / sizeof(TCHAR)), (LPARAM)Buffer); + index = SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)Buffer); + dmNewBitsPerPel = SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_GETITEMDATA, index, 0); + + /* find if new parameters are valid */ + Current = CurrentDisplayDevice->CurrentSettings; + if (dmNewBitsPerPel == Current->dmBitsPerPel) + { + /* no change */ + return; + } + + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + + if (dmNewBitsPerPel < Current->dmBitsPerPel) + { + Current = Current->Blink; + while (Current != NULL) + { + if (Current->dmBitsPerPel == dmNewBitsPerPel + && Current->dmPelsHeight == CurrentDisplayDevice->CurrentSettings->dmPelsHeight + && Current->dmPelsWidth == CurrentDisplayDevice->CurrentSettings->dmPelsWidth) + { + CurrentDisplayDevice->CurrentSettings = Current; + UpdateDisplay(hwndDlg); + return; + } + Current = Current->Blink; + } + } + else + { + Current = Current->Flink; + while (Current != NULL) + { + if (Current->dmBitsPerPel == dmNewBitsPerPel + && Current->dmPelsHeight == CurrentDisplayDevice->CurrentSettings->dmPelsHeight + && Current->dmPelsWidth == CurrentDisplayDevice->CurrentSettings->dmPelsWidth) + { + CurrentDisplayDevice->CurrentSettings = Current; + UpdateDisplay(hwndDlg); + return; + } + Current = Current->Flink; + } + } + + /* search smaller resolution compatible with current color depth */ + Current = CurrentDisplayDevice->CurrentSettings->Blink; + while (Current != NULL) + { + if (Current->dmBitsPerPel == dmNewBitsPerPel) + { + CurrentDisplayDevice->CurrentSettings = Current; + UpdateDisplay(hwndDlg); + return; + } + Current = Current->Blink; + } + + /* search bigger resolution compatible with current color depth */ + Current = CurrentDisplayDevice->CurrentSettings->Flink; + while (Current != NULL) + { + if (Current->dmBitsPerPel == dmNewBitsPerPel) + { + CurrentDisplayDevice->CurrentSettings = Current; + UpdateDisplay(hwndDlg); + return; + } + Current = Current->Flink; + } + + /* we shouldn't go there */ +} + +static VOID +OnResolutionChanged(IN HWND hwndDlg, IN DWORD NewPosition) +{ + /* if new resolution is not compatible with color depth: + * 1) try to find the nearest bigger matching color depth + * 2) otherwise, get the nearest smaller color depth + */ + PSETTINGS_ENTRY Current; + DWORD dmNewPelsHeight = CurrentDisplayDevice->Resolutions[NewPosition].dmPelsHeight; + DWORD dmNewPelsWidth = CurrentDisplayDevice->Resolutions[NewPosition].dmPelsWidth; + + /* find if new parameters are valid */ + Current = CurrentDisplayDevice->CurrentSettings; + if (dmNewPelsHeight == Current->dmPelsHeight && dmNewPelsWidth == Current->dmPelsWidth) + { + /* no change */ + return; + } + + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + + if (dmNewPelsHeight < Current->dmPelsHeight) + { + Current = Current->Blink; + while (Current != NULL) + { + if (Current->dmPelsHeight == dmNewPelsHeight + && Current->dmPelsWidth == dmNewPelsWidth + && Current->dmBitsPerPel == CurrentDisplayDevice->CurrentSettings->dmBitsPerPel) + { + CurrentDisplayDevice->CurrentSettings = Current; + UpdateDisplay(hwndDlg); + return; + } + Current = Current->Blink; + } + } + else + { + Current = Current->Flink; + while (Current != NULL) + { + if (Current->dmPelsHeight == dmNewPelsHeight + && Current->dmPelsWidth == dmNewPelsWidth + && Current->dmBitsPerPel == CurrentDisplayDevice->CurrentSettings->dmBitsPerPel) + { + CurrentDisplayDevice->CurrentSettings = Current; + UpdateDisplay(hwndDlg); + return; + } + Current = Current->Flink; + } + } + + /* search bigger color depth compatible with current resolution */ + Current = CurrentDisplayDevice->CurrentSettings->Flink; + while (Current != NULL) + { + if (dmNewPelsHeight == Current->dmPelsHeight && dmNewPelsWidth == Current->dmPelsWidth) + { + CurrentDisplayDevice->CurrentSettings = Current; + UpdateDisplay(hwndDlg); + return; + } + Current = Current->Flink; + } + + /* search smaller color depth compatible with current resolution */ + Current = CurrentDisplayDevice->CurrentSettings->Blink; + while (Current != NULL) + { + if (dmNewPelsHeight == Current->dmPelsHeight && dmNewPelsWidth == Current->dmPelsWidth) + { + CurrentDisplayDevice->CurrentSettings = Current; + UpdateDisplay(hwndDlg); + return; + } + Current = Current->Blink; + } + + /* we shouldn't go there */ +} + +static VOID +OnAdvancedButton() +{ + MessageBox(NULL, TEXT("That button doesn't do anything yet"), TEXT("Whoops"), MB_OK); +} + +/* Property page dialog callback */ +INT_PTR CALLBACK +SettingsPageProc(IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam) +{ + switch(uMsg) + { + case WM_INITDIALOG: + OnInitDialog(hwndDlg); + break; + case WM_COMMAND: + { + DWORD controlId = LOWORD(wParam); + DWORD command = HIWORD(wParam); + + if (controlId == IDC_SETTINGS_ADVANCED && command == BN_CLICKED) + OnAdvancedButton(); + else if (controlId == IDC_SETTINGS_BPP && command == CBN_SELCHANGE) + OnBPPChanged(hwndDlg); + break; + } + case WM_HSCROLL: + { + switch (LOWORD(wParam)) + { + case TB_LINEUP: + case TB_LINEDOWN: + case TB_PAGEUP: + case TB_PAGEDOWN: + case TB_TOP: + case TB_BOTTOM: + case TB_ENDTRACK: + { + DWORD newPosition = SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION, TBM_GETPOS, 0, 0); + OnResolutionChanged(hwndDlg, newPosition); + } + } + break; + } + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + if (lpnm->code == PSN_APPLY) + { + if (CurrentDisplayDevice->CurrentSettings->dmPelsWidth != CurrentDisplayDevice->InitialSettings.dmPelsWidth + || CurrentDisplayDevice->CurrentSettings->dmPelsHeight != CurrentDisplayDevice->InitialSettings.dmPelsHeight + || CurrentDisplayDevice->CurrentSettings->dmBitsPerPel != CurrentDisplayDevice->InitialSettings.dmBitsPerPel) + { +#if 1 + MessageBox(NULL, TEXT("Sorry... Applying changes is not implemented in ReactOS..."), TEXT("Display settings"), MB_OK | MB_ICONSTOP); +#else + /* FIXME: Need to test changes */ + /* Apply new settings */ + LONG rc; + DEVMODE devmode; + RtlZeroMemory(&devmode, sizeof(DEVMODE)); + devmode.dmSize = (WORD)sizeof(DEVMODE); + devmode.dmPelsWidth = CurrentDisplayDevice->CurrentSettings->dmPelsWidth; + devmode.dmPelsHeight = CurrentDisplayDevice->CurrentSettings->dmPelsHeight; + devmode.dmBitsPerPel = CurrentDisplayDevice->CurrentSettings->dmBitsPerPel; + devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL; + rc = ChangeDisplaySettingsEx( + CurrentDisplayDevice->DeviceName, + &devmode, + NULL, + CDS_UPDATEREGISTRY, + NULL); + switch (rc) + { + case DISP_CHANGE_SUCCESSFUL: + CurrentDisplayDevice->InitialSettings.dmPelsWidth = CurrentDisplayDevice->CurrentSettings->dmPelsWidth; + CurrentDisplayDevice->InitialSettings.dmPelsHeight = CurrentDisplayDevice->CurrentSettings->dmPelsHeight; + CurrentDisplayDevice->InitialSettings.dmBitsPerPel = CurrentDisplayDevice->CurrentSettings->dmBitsPerPel; + break; + case DISP_CHANGE_FAILED: + MessageBox(NULL, TEXT("Failed to apply new settings..."), TEXT("Display settings"), MB_OK | MB_ICONSTOP); + break; + case DISP_CHANGE_RESTART: + MessageBox(NULL, TEXT("You need to restart your computer to apply changes."), TEXT("Display settings"), MB_OK | MB_ICONINFORMATION); + break; + default: + MessageBox(NULL, TEXT("Unknown error when applying new settings..."), TEXT("Display settings"), MB_OK | MB_ICONSTOP); + break; + } +#endif + } + } + break; + } + case WM_DESTROY: + { + PDISPLAY_DEVICE_ENTRY Current = DisplayDeviceList; + while (Current != NULL) + { + PDISPLAY_DEVICE_ENTRY Next = Current->Flink; + PSETTINGS_ENTRY CurrentSettings = Current->Settings; + while (CurrentSettings != NULL) + { + PSETTINGS_ENTRY NextSettings = CurrentSettings->Flink; + HeapFree(GetProcessHeap(), 0, CurrentSettings); + CurrentSettings = NextSettings; + } + HeapFree(GetProcessHeap(), 0, Current); + Current = Next; + } + } + } + return FALSE; +}

19 years, 9 months

[gvg] 14146: Fix eol-style

by gvg＠svn.reactos.com

Fix eol-style Property changes on: trunk/reactos/ntoskrnl/ex/sem.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

19 years, 9 months

← Newer
1
...
22
23
24
25
26
27
28
...
61
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 March 2005