Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

[cfinck] 31359: Change some more text in the german translation of usetup See issue #2904 for more details.
by cfinck＠svn.reactos.org 20 Dec '07

20 Dec '07

Author: cfinck Date: Thu Dec 20 21:19:29 2007 New Revision: 31359 URL: http://svn.reactos.org/svn/reactos?rev=31359&view=rev Log: Change some more text in the german translation of usetup See issue #2904 for more details. Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Thu Dec 20 21:19:29 2007 @@ -637,13 +637,13 @@ { 6, 8, - "Das Setup kann den Bootloader nicht auf der Festplatte Ihres Computers", + "Das Setup kann das Betriebssystem-Ladeprogramm nicht auf der", TEXT_NORMAL }, { 6, 9, - "installieren", + "Festplatte Ihres Computers installieren", TEXT_NORMAL }, { @@ -838,25 +838,25 @@ { 6, 8, - "Setup installiert nun den Betriebssystemlader.", + "Setup installiert nun das Betriebssystem-Ladeprogramm.", TEXT_NORMAL }, { 8, 12, - "Installiere den Betriebssystemlader im MBR", + "Betriebssystem-Ladeprogramm im MBR installieren", TEXT_NORMAL }, { 8, 13, - "Installiere den Betriebssystemlader auf einer Diskette", + "Betriebssystem-Ladeprogramm auf einer Diskette installieren", TEXT_NORMAL }, { 8, 14, - "Auslassen der Installation des Betriebssystemladers", + "Betriebssystem-Ladeprogramm nicht installieren", TEXT_NORMAL }, {

1 0

[frik85] 31358: RosCMS update: * fix bug related to non UTF-8 chars (especially in title/description)
by frik85＠svn.reactos.org 20 Dec '07

20 Dec '07

Author: frik85 Date: Thu Dec 20 20:21:34 2007 New Revision: 31358 URL: http://svn.reactos.org/svn/reactos?rev=31358&view=rev Log: RosCMS update: * fix bug related to non UTF-8 chars (especially in title/description) Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_export_xml.php trunk/web/reactos.org/htdocs/roscms/inc/data_list.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_export_xml.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_export_xml.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_export_xml.php Thu Dec 20 20:21:34 2007 @@ -840,7 +840,7 @@ $tdata .= " status=\"". $temp_status ."\""; /* status (odd/even (=stable), new, draft, etc.) */ $tdata .= " security=\"". $temp_security ."\""; /* security (read, write, add, pub, trans) */ $tdata .= " xtrcol=\"".$roscms_mtbl_cols2."\""; - $tdata .= "><![CDATA[".substr($result_xml_ptm_stext['content'], 0, 30)."]]></row>"; + $tdata .= "><![CDATA[".urlencode(substr($result_xml_ptm_stext['content'], 0, 30))."]]></row>"; $temp_counter++; } Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_list.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_list.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_list.php Thu Dec 20 20:21:34 2007 @@ -3247,6 +3247,7 @@ function page_table_body( bnr, bclass, bid, bdname, btype, brid, brver, brlang, brdate, bstar, bstarid, brusrid, security, xtrtblcol, bdesc) { var xtrtblcols2 = ''; var lstBody = ''; + var tmpdesc = ''; if (bstar == 1) { bstar = 'cStarOn'; @@ -3269,7 +3270,15 @@ if (security.indexOf("write") < 0 ) { // not found -> readonly lstBody += '<img src="images/locked.gif" alt="read-only" style="width:11px; height:12px; border:0px;" /> '; } - lstBody += '<span class="tcp">'+bdesc+'</span></div></td>'; + try { + tmpdesc = unescape(decodeURI(bdesc)); + tmpdesc = tmpdesc.replace(/\+/g, ' '); + } catch (e) { + tmpdesc = '<i>check the title or description field, it contains non UTF-8 chars</i>'; + } + + lstBody += '<span class="tcp">'+tmpdesc+'</span></div></td>'; + /*lstBody += '<span class="tcp">!!</span></div></td>';*/ /* if (xtrtblcol != '') {

1 0

[gedmurphy] 31357: missed this, apologies for spamming
by gedmurphy＠svn.reactos.org 20 Dec '07

20 Dec '07

Author: gedmurphy Date: Thu Dec 20 18:43:27 2007 New Revision: 31357 URL: http://svn.reactos.org/svn/reactos?rev=31357&view=rev Log: missed this, apologies for spamming Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/b… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/bitmap.c (original) +++ trunk/reactos/dll/win32/user32/windows/bitmap.c Thu Dec 20 18:43:27 2007 @@ -799,7 +799,7 @@ if (flags & LR_COPYFROMRESOURCE) { - FIXME("FIXME: LR_COPYFROMRESOURCE is yet not implemented for icons\n"); + TRACE("FIXME: LR_COPYFROMRESOURCE is yet not implemented for icons\n"); } if (NtUserGetIconSize(hIconCur, 0, &origSize.cx, &origSize.cy))

1 0

[fireball] 31356: - Top level exception handler can't be UnhandledExceptionFilter by default, this leads to an infinite recursion if top level was not overriden. - Add HardError raising to UnhandledExceptionFilter, by Dmitry Philippov.
by fireball＠svn.reactos.org 20 Dec '07

20 Dec '07

Author: fireball Date: Thu Dec 20 18:41:24 2007 New Revision: 31356 URL: http://svn.reactos.org/svn/reactos?rev=31356&view=rev Log: - Top level exception handler can't be UnhandledExceptionFilter by default, this leads to an infinite recursion if top level was not overriden. - Add HardError raising to UnhandledExceptionFilter, by Dmitry Philippov. Modified: trunk/reactos/dll/win32/kernel32/except/except.c Modified: trunk/reactos/dll/win32/kernel32/except/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/except/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/except/except.c (original) +++ trunk/reactos/dll/win32/kernel32/except/except.c Thu Dec 20 18:41:24 2007 @@ -15,7 +15,7 @@ #define NDEBUG #include <debug.h> -LPTOP_LEVEL_EXCEPTION_FILTER GlobalTopLevelExceptionFilter = UnhandledExceptionFilter; +LPTOP_LEVEL_EXCEPTION_FILTER GlobalTopLevelExceptionFilter = NULL; UINT WINAPI @@ -213,6 +213,8 @@ LONG RetValue; HANDLE DebugPort = NULL; NTSTATUS ErrCode; + ULONG ErrorParameters[4]; + ULONG ErrorResponse; if (ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION && ExceptionInfo->ExceptionRecord->NumberParameters >= 2) @@ -227,7 +229,7 @@ if (RetValue == EXCEPTION_CONTINUE_EXECUTION) return EXCEPTION_CONTINUE_EXECUTION; break; - case EXCEPTION_EXECUTE_FAULT: + case EXCEPTION_EXECUTE_FAULT: /* FIXME */ break; } @@ -255,7 +257,7 @@ if (ret != EXCEPTION_CONTINUE_SEARCH) return ret; } - + if ((GetErrorMode() & SEM_NOGPFAULTERRORBOX) == 0) { #ifdef _X86_ @@ -306,6 +308,34 @@ #endif } + /* Save exception code and address */ + ErrorParameters[0] = (ULONG)ExceptionInfo->ExceptionRecord->ExceptionCode; + ErrorParameters[1] = (ULONG)ExceptionInfo->ExceptionRecord->ExceptionAddress; + + if (ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION) + { + /* get the type of operation that caused the access violation */ + ErrorParameters[2] = ExceptionInfo->ExceptionRecord->ExceptionInformation[0]; + } + else + { + ErrorParameters[2] = ExceptionInfo->ExceptionRecord->ExceptionInformation[2]; + } + + /* Save faulting address */ + ErrorParameters[3] = ExceptionInfo->ExceptionRecord->ExceptionInformation[1]; + + /* Raise the harderror */ + ErrCode = NtRaiseHardError(STATUS_UNHANDLED_EXCEPTION | 0x10000000, + 4, 0, ErrorParameters, OptionOkCancel, &ErrorResponse); + + if (NT_SUCCESS(ErrCode) && (ErrorResponse == ResponseCancel)) + { + /* FIXME: Check the result, if the "Cancel" button was + clicked run a debugger */ + DPRINT1("Debugging is not implemented yet\n"); + } + /* * Returning EXCEPTION_EXECUTE_HANDLER means that the code in * the __except block will be executed. Normally this will end up in a

1 0

[fireball] 31355: - Turn back messagetables inlining support for now.
by fireball＠svn.reactos.org 20 Dec '07

20 Dec '07

Author: fireball Date: Thu Dec 20 18:30:12 2007 New Revision: 31355 URL: http://svn.reactos.org/svn/reactos?rev=31355&view=rev Log: - Turn back messagetables inlining support for now. Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=31355&r1=3135… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Thu Dec 20 18:30:12 2007 @@ -470,13 +470,13 @@ ${mkdir} $(INTERMEDIATE_)include$(SEP)reactos 2>$(NUL) ${mkdir} $(INTERMEDIATE_)ntoskrnl 2>$(NUL) $(ECHO_WMC) - $(Q)$(WMC_TARGET) -H $(BUGCODES_H) -o $(BUGCODES_RC) $(NTOSKRNL_MC) + $(Q)$(WMC_TARGET) -i -H $(BUGCODES_H) -o $(BUGCODES_RC) $(NTOSKRNL_MC) $(ERRCODES_H) $(ERRCODES_RC): $(WMC_TARGET) $(KERNEL32_MC) ${mkdir} $(INTERMEDIATE_)include$(SEP)reactos 2>$(NUL) ${mkdir} $(INTERMEDIATE_)dll$(SEP)win32$(SEP)kernel32 2>$(NUL) $(ECHO_WMC) - $(Q)$(WMC_TARGET) -U -H $(ERRCODES_H) -o $(ERRCODES_RC) $(KERNEL32_MC) + $(Q)$(WMC_TARGET) -i -U -H $(ERRCODES_H) -o $(ERRCODES_RC) $(KERNEL32_MC) .PHONY: msvc6 msvc6: $(RBUILD_TARGET)

1 0

[fireball] 31354: - Substitute MAX_PATH by 256 for now, since Linux hosts have no idea of a MAX_PATH.
by fireball＠svn.reactos.org 20 Dec '07

20 Dec '07

Author: fireball Date: Thu Dec 20 18:22:01 2007 New Revision: 31354 URL: http://svn.reactos.org/svn/reactos?rev=31354&view=rev Log: - Substitute MAX_PATH by 256 for now, since Linux hosts have no idea of a MAX_PATH. Modified: trunk/reactos/tools/wmc/wmc.c trunk/reactos/tools/wmc/write.c Modified: trunk/reactos/tools/wmc/wmc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmc.c?rev=31354&… ============================================================================== --- trunk/reactos/tools/wmc/wmc.c (original) +++ trunk/reactos/tools/wmc/wmc.c Thu Dec 20 18:22:01 2007 @@ -138,7 +138,7 @@ int ret; int i; int cmdlen; - char rcbasedir[MAX_PATH]; + char rcbasedir[256]; atexit( cleanup_files ); signal(SIGSEGV, segvhandler); Modified: trunk/reactos/tools/wmc/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/write.c?rev=3135… ============================================================================== --- trunk/reactos/tools/wmc/write.c (original) +++ trunk/reactos/tools/wmc/write.c Thu Dec 20 18:22:01 2007 @@ -589,7 +589,7 @@ { lan_blk_t *lbp; token_t *ttab; - char fname[MAX_PATH]; + char fname[256]; int ntab; int i;

1 0

[fireball] 31353: - Remove inlining messagetables option from wmc invocations.
by fireball＠svn.reactos.org 20 Dec '07

20 Dec '07

Author: fireball Date: Thu Dec 20 16:17:12 2007 New Revision: 31353 URL: http://svn.reactos.org/svn/reactos?rev=31353&view=rev Log: - Remove inlining messagetables option from wmc invocations. Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=31353&r1=3135… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Thu Dec 20 16:17:12 2007 @@ -470,13 +470,13 @@ ${mkdir} $(INTERMEDIATE_)include$(SEP)reactos 2>$(NUL) ${mkdir} $(INTERMEDIATE_)ntoskrnl 2>$(NUL) $(ECHO_WMC) - $(Q)$(WMC_TARGET) -i -H $(BUGCODES_H) -o $(BUGCODES_RC) $(NTOSKRNL_MC) + $(Q)$(WMC_TARGET) -H $(BUGCODES_H) -o $(BUGCODES_RC) $(NTOSKRNL_MC) $(ERRCODES_H) $(ERRCODES_RC): $(WMC_TARGET) $(KERNEL32_MC) ${mkdir} $(INTERMEDIATE_)include$(SEP)reactos 2>$(NUL) ${mkdir} $(INTERMEDIATE_)dll$(SEP)win32$(SEP)kernel32 2>$(NUL) $(ECHO_WMC) - $(Q)$(WMC_TARGET) -i -U -H $(ERRCODES_H) -o $(ERRCODES_RC) $(KERNEL32_MC) + $(Q)$(WMC_TARGET) -U -H $(ERRCODES_H) -o $(ERRCODES_RC) $(KERNEL32_MC) .PHONY: msvc6 msvc6: $(RBUILD_TARGET)

1 0

[fireball] 31352: - Implement bin-files creation (as opposed to inlining resource data, which is incompatible with MSVC). Result matches 1:1 with mc.exe output on the same input file. - This patch was submitted to Wine, but it needs to be reworked.
by fireball＠svn.reactos.org 20 Dec '07

20 Dec '07

Author: fireball Date: Thu Dec 20 16:11:30 2007 New Revision: 31352 URL: http://svn.reactos.org/svn/reactos?rev=31352&view=rev Log: - Implement bin-files creation (as opposed to inlining resource data, which is incompatible with MSVC). Result matches 1:1 with mc.exe output on the same input file. - This patch was submitted to Wine, but it needs to be reworked. Modified: trunk/reactos/tools/wmc/utils.c trunk/reactos/tools/wmc/utils.h trunk/reactos/tools/wmc/wmc.c trunk/reactos/tools/wmc/write.c trunk/reactos/tools/wmc/write.h Modified: trunk/reactos/tools/wmc/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/utils.c?rev=3135… ============================================================================== --- trunk/reactos/tools/wmc/utils.c (original) +++ trunk/reactos/tools/wmc/utils.c Thu Dec 20 16:11:30 2007 @@ -131,6 +131,20 @@ base[namelen - extlen] = '\0'; } return base; +} + +void get_rcbasedir(char *basedir, const char *name) +{ + char *slash; + slash = strrchr(name, '/'); + + if (!slash) + slash = strrchr(name, '\\'); + + basedir[0] = 0; + + strncpy(basedir, name, slash - name + 1); + basedir[slash-name + 1] = '\0'; } void *xmalloc(size_t size) Modified: trunk/reactos/tools/wmc/utils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/utils.h?rev=3135… ============================================================================== --- trunk/reactos/tools/wmc/utils.h (original) +++ trunk/reactos/tools/wmc/utils.h Thu Dec 20 16:11:30 2007 @@ -41,6 +41,7 @@ void warning(const char *s, ...) __attribute__((format (printf, 1, 2))); char *dup_basename(const char *name, const char *ext); +void get_rcbasedir(char *basedir, const char *name); WCHAR *xunistrdup(const WCHAR * str); WCHAR *unistrcpy(WCHAR *dst, const WCHAR *src); Modified: trunk/reactos/tools/wmc/wmc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmc.c?rev=31352&… ============================================================================== --- trunk/reactos/tools/wmc/wmc.c (original) +++ trunk/reactos/tools/wmc/wmc.c Thu Dec 20 16:11:30 2007 @@ -138,6 +138,7 @@ int ret; int i; int cmdlen; + char rcbasedir[MAX_PATH]; atexit( cleanup_files ); signal(SIGSEGV, segvhandler); @@ -265,6 +266,8 @@ strcat(header_name, ".h"); } + get_rcbasedir(rcbasedir, output_name); + if(input_name) { if(!(yyin = fopen(input_name, "rb"))) @@ -287,7 +290,7 @@ write_h_file(header_name); write_rc_file(output_name); if(!rcinline) - write_bin_files(); + write_bin_files(rcbasedir); output_name = NULL; header_name = NULL; return 0; Modified: trunk/reactos/tools/wmc/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/write.c?rev=3135… ============================================================================== --- trunk/reactos/tools/wmc/write.c (original) +++ trunk/reactos/tools/wmc/write.c Thu Dec 20 16:11:30 2007 @@ -509,7 +509,110 @@ fclose(fp); } -void write_bin_files(void) -{ - assert(rcinline == 0); -} +static void write_bin_file(const char *fname, lan_blk_t *lbp) +{ + FILE *fp; + unsigned int offs; + unsigned short buf; + int i, j, k; + + fp = fopen(fname, "wb"); + + fwrite(&lbp->nblk, sizeof(int), 1, fp); + + offs = 4 * (lbp->nblk * 3 + 1); + for(i = 0; i < lbp->nblk; i++) + { + fwrite(&lbp->blks[i].idlo, sizeof(unsigned), 2, fp); + fwrite(&offs, sizeof(int), 1, fp); + + offs += lbp->blks[i].size; + } + + for(i = 0; i < lbp->nblk; i++) + { + block_t *blk = &lbp->blks[i]; + for(j = 0; j < blk->nmsg; j++) + { + char *cptr; + int len = blk->msgs[j]->len; + short aligned_size = (unicodeout ? (len*2+3)&~3 : (len+3)&~3) + 4; + + fwrite(&aligned_size, sizeof(short), 1, fp); + + buf = unicodeout ? 1 : 0; + fwrite(&buf, sizeof(buf), 1, fp); + + // no need to count these 4 bytes when calculating alignment + aligned_size -= 4; + + if (unicodeout) + { + fwrite(blk->msgs[j]->msg, sizeof(WCHAR), len, fp); + + // fill with nulls so it matches aligned_len + for (k=0; k<(aligned_size-(len*sizeof(WCHAR))); k++) + fputc(0, fp); + } + else + { + WCHAR *uc; + char *tmp; + int mlen, len; + const union cptable *cpdef = find_codepage(blk->msgs[j]->cp); + uc = blk->msgs[j]->msg; + + assert(cpdef != NULL); + mlen = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, NULL, 0, NULL, NULL); + tmp = xmalloc(mlen); + if((i = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, tmp, mlen, NULL, NULL)) < 0) + internal_error(__FILE__, __LINE__, "Buffer overflow? code %d\n", i); + + len = strlen(tmp); + fwrite(tmp, sizeof(char), len, fp); + + // fill with nulls so it matches aligned_len + for (k=0; k<(aligned_size-len); k++) + fputc(0, fp); + + free(tmp); + } + + free(cptr); + } + } + + fclose(fp); +} + +void write_bin_files(const char *basedir) +{ + lan_blk_t *lbp; + token_t *ttab; + char fname[MAX_PATH]; + int ntab; + int i; + + get_tokentable(&ttab, &ntab); + + for(lbp = lanblockhead; lbp; lbp = lbp->next) + { + char *cptr = NULL; + for(i = 0; i < ntab; i++) + { + if(ttab[i].type == tok_language && ttab[i].token == lbp->lan) + { + if(ttab[i].alias) + cptr = dup_u2c(WMC_DEFAULT_CODEPAGE, ttab[i].alias); + break; + } + } + if(!cptr) + internal_error(__FILE__, __LINE__, "Filename vanished for language 0x%0x\n", lbp->lan); + + sprintf(fname, "%s%s.bin", basedir, cptr); + write_bin_file(fname, lbp); + + free(cptr); + } +} Modified: trunk/reactos/tools/wmc/write.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/write.h?rev=3135… ============================================================================== --- trunk/reactos/tools/wmc/write.h (original) +++ trunk/reactos/tools/wmc/write.h Thu Dec 20 16:11:30 2007 @@ -22,6 +22,6 @@ void write_h_file(const char *fname); void write_rc_file(const char *fname); -void write_bin_files(void); +void write_bin_files(const char *basedir); #endif

1 0

[fireball] 31351: - Provide ntcfgx.dll a preferred baseaddress.
by fireball＠svn.reactos.org 20 Dec '07

20 Dec '07

Author: fireball Date: Thu Dec 20 16:07:06 2007 New Revision: 31351 URL: http://svn.reactos.org/svn/reactos?rev=31351&view=rev Log: - Provide ntcfgx.dll a preferred baseaddress. Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=313… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Thu Dec 20 16:07:06 2007 @@ -95,6 +95,7 @@ <property name="BASEADDRESS_SAMSRV" value="0x74f30000" /> <property name="BASEADDRESS_SAMLIB" value="0x750C0000" /> <property name="BASEADDRESS_CABINET" value="0x75120000" /> + <property name="BASEADDRESS_NETCFGX" value="0x755F0000" /> <property name="BASEADDRESS_IPHLPAPI" value="0x75700000" /> <property name="BASEADDRESS_MSGINA" value="0x75970000" /> <property name="BASEADDRESS_CRYPTNET" value="0x75e60000" /> Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild (original) +++ trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild Thu Dec 20 16:07:06 2007 @@ -1,4 +1,4 @@ -<module name="netcfgx" type="win32dll" entrypoint="0" installbase="system32" installname="netcfgx.dll"> +<module name="netcfgx" type="win32dll" baseaddress="${BASEADDRESS_NETCFGX}" entrypoint="0" installbase="system32" installname="netcfgx.dll"> <importlibrary definition="netcfgx.def" /> <file>netcfgx.c</file> <library>ntdll</library>

1 0

[fireball] 31350: - Make VBEMP look like a legacy driver. - Reorganize VideoPortInitialize (firstly do all checks, then do Driver Object Extension related operations). - Fix the hack Magnus Olsen added for the "No PNP videocard" problem, by adding a real check Windows 2003 SP1 videoport driver is performing (information got by building "stub" miniports and trying to load them with a checked build of W2K3SP1's videoprt.sys). - Add stubbed handler for IRP_MJ_SYSTEM_CONTROL (for PnP miniports) and
by fireball＠svn.reactos.org 20 Dec '07

20 Dec '07

Author: fireball Date: Thu Dec 20 15:31:39 2007 New Revision: 31350 URL: http://svn.reactos.org/svn/reactos?rev=31350&view=rev Log: - Make VBEMP look like a legacy driver. - Reorganize VideoPortInitialize (firstly do all checks, then do Driver Object Extension related operations). - Fix the hack Magnus Olsen added for the "No PNP videocard" problem, by adding a real check Windows 2003 SP1 videoport driver is performing (information got by building "stub" miniports and trying to load them with a checked build of W2K3SP1's videoprt.sys). - Add stubbed handler for IRP_MJ_SYSTEM_CONTROL (for PnP miniports) and IRP_MJ_INTERNAL_DEVICE_CONTROL. Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c trunk/reactos/drivers/video/videoprt/dispatch.c trunk/reactos/drivers/video/videoprt/videoprt.c trunk/reactos/drivers/video/videoprt/videoprt.h Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c (original) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c Thu Dec 20 15:31:39 2007 @@ -42,9 +42,9 @@ InitData.HwInitialize = VBEInitialize; InitData.HwStartIO = VBEStartIO; InitData.HwResetHw = VBEResetHw; - InitData.HwGetPowerState = VBEGetPowerState; - InitData.HwSetPowerState = VBESetPowerState; - InitData.HwGetVideoChildDescriptor = VBEGetVideoChildDescriptor; + //InitData.HwGetPowerState = VBEGetPowerState; + //InitData.HwSetPowerState = VBESetPowerState; + //InitData.HwGetVideoChildDescriptor = VBEGetVideoChildDescriptor; InitData.HwDeviceExtensionSize = sizeof(VBE_DEVICE_EXTENSION); return VideoPortInitialize(Context1, Context2, &InitData, NULL); Modified: trunk/reactos/drivers/video/videoprt/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/dis… ============================================================================== --- trunk/reactos/drivers/video/videoprt/dispatch.c (original) +++ trunk/reactos/drivers/video/videoprt/dispatch.c Thu Dec 20 15:31:39 2007 @@ -509,6 +509,14 @@ return STATUS_NOT_IMPLEMENTED; } +NTSTATUS NTAPI +IntVideoPortDispatchSystemControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return STATUS_NOT_IMPLEMENTED; +} + VOID NTAPI IntVideoPortUnload(PDRIVER_OBJECT DriverObject) { Modified: trunk/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.c (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.c Thu Dec 20 15:31:39 2007 @@ -1,7 +1,7 @@ /* * VideoPort driver * - * Copyright (C) ReactOS Team + * Copyright (C) 2002-2004, 2007 ReactOS Team * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -553,7 +553,7 @@ PUNICODE_STRING RegistryPath = Context2; NTSTATUS Status; PVIDEO_PORT_DRIVER_EXTENSION DriverExtension; - BOOL LegacyDetection = FALSE; + BOOLEAN PnpDriver = FALSE, LegacyDetection = FALSE; DPRINT("VideoPortInitialize\n"); @@ -571,6 +571,63 @@ HwInitializationData->HwStartIO == NULL) { return STATUS_INVALID_PARAMETER; + } + + switch (HwInitializationData->HwInitDataSize) + { + /* + * NT4 drivers are special case, because we must use legacy method + * of detection instead of the Plug & Play one. + */ + + case SIZE_OF_NT4_VIDEO_HW_INITIALIZATION_DATA: + DPRINT("We were loaded by a Windows NT miniport driver.\n"); + break; + + case SIZE_OF_W2K_VIDEO_HW_INITIALIZATION_DATA: + DPRINT("We were loaded by a Windows 2000 miniport driver.\n"); + break; + + case sizeof(VIDEO_HW_INITIALIZATION_DATA): + DPRINT("We were loaded by a Windows XP or later miniport driver.\n"); + break; + + default: + DPRINT("Invalid HwInitializationData size.\n"); + return STATUS_UNSUCCESSFUL; + } + + /* Set dispatching routines */ + DriverObject->MajorFunction[IRP_MJ_CREATE] = IntVideoPortDispatchOpen; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = IntVideoPortDispatchClose; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = + IntVideoPortDispatchDeviceControl; + DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = + IntVideoPortDispatchDeviceControl; + DriverObject->MajorFunction[IRP_MJ_WRITE] = + IntVideoPortDispatchWrite; // ReactOS-specific hack + DriverObject->DriverUnload = IntVideoPortUnload; + + /* Determine type of the miniport driver */ + if ((HwInitializationData->HwInitDataSize >= + FIELD_OFFSET(VIDEO_HW_INITIALIZATION_DATA, HwQueryInterface)) + && HwInitializationData->HwSetPowerState + && HwInitializationData->HwGetPowerState + && HwInitializationData->HwGetVideoChildDescriptor) + { + DPRINT("The miniport is a PnP miniport driver\n"); + PnpDriver = TRUE; + } + + /* Check if legacy detection should be applied */ + if (!PnpDriver || HwContext) + { + DPRINT("Legacy detection for adapter interface %d\n", + HwInitializationData->AdapterInterfaceType); + + /* FIXME: Move the code for legacy detection + to another function and call it here */ + LegacyDetection = TRUE; } /* @@ -643,45 +700,6 @@ } DriverExtension->HwContext = HwContext; - switch (HwInitializationData->HwInitDataSize) - { - /* - * NT4 drivers are special case, because we must use legacy method - * of detection instead of the Plug & Play one. - */ - - case SIZE_OF_NT4_VIDEO_HW_INITIALIZATION_DATA: - DPRINT("We were loaded by a Windows NT miniport driver.\n"); - LegacyDetection = TRUE; - break; - - case SIZE_OF_W2K_VIDEO_HW_INITIALIZATION_DATA: - DPRINT("We were loaded by a Windows 2000 miniport driver.\n"); - break; - - case sizeof(VIDEO_HW_INITIALIZATION_DATA): - DPRINT("We were loaded by a Windows XP or later miniport driver.\n"); - break; - - default: - DPRINT("Invalid HwInitializationData size.\n"); - return STATUS_UNSUCCESSFUL; - } - - /* We can't check HwInitializationData->AdapterInterfaceType to know if - * we have to use legacy detection, as MSDN states that this member is - * ignored by videoprt and should remain zero-initialized. - * Force legacy detection, so NT4 drivers will still work on ReactOS. - * WARNING: this will cause all Plug-and-Play IRPs to fail. - */ - LegacyDetection = TRUE; - - DriverObject->MajorFunction[IRP_MJ_CREATE] = IntVideoPortDispatchOpen; - DriverObject->MajorFunction[IRP_MJ_CLOSE] = IntVideoPortDispatchClose; - DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = IntVideoPortDispatchDeviceControl; - DriverObject->MajorFunction[IRP_MJ_WRITE] = IntVideoPortDispatchWrite; - DriverObject->DriverUnload = IntVideoPortUnload; - /* * Plug & Play drivers registers the device in AddDevice routine. For * legacy drivers we must do it now. @@ -710,6 +728,7 @@ DriverObject->DriverExtension->AddDevice = IntVideoPortAddDevice; DriverObject->MajorFunction[IRP_MJ_PNP] = IntVideoPortDispatchPnp; DriverObject->MajorFunction[IRP_MJ_POWER] = IntVideoPortDispatchPower; + DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = IntVideoPortDispatchSystemControl; return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/video/videoprt/videoprt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.h (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.h Thu Dec 20 15:31:39 2007 @@ -165,6 +165,11 @@ IN PIRP Irp); NTSTATUS NTAPI +IntVideoPortDispatchSystemControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS NTAPI IntVideoPortDispatchWrite( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp);

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2007