Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 39693: - Fix property sets for sysaudio

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Feb 20 08:50:26 2009 New Revision: 39693 URL: http://svn.reactos.org/svn/reactos?rev=39693&view=rev Log: - Fix property sets for sysaudio Modified: trunk/reactos/include/psdk/ks.h trunk/reactos/include/psdk/ksmedia.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=3969… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Fri Feb 20 08:50:26 2009 @@ -378,8 +378,11 @@ Properties/Methods/Events */ -#define KSPROPSETID_General \ - 0x1464EDA5L, 0x6A8F, 0x11D1, 0x9A, 0xA7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 +#define STATIC_KSPROPSETID_General\ + 0x1464EDA5L, 0x6A8F, 0x11D1, {0x9A, 0xA7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} +DEFINE_GUIDSTRUCT("1464EDA5-6A8F-11D1-9AA7-00A0C9223196", KSPROPSETID_General); +#define KSPROPSETID_General DEFINE_GUIDNAMED(KSPROPSETID_General) + typedef enum { @@ -728,23 +731,6 @@ KSPROPERTY_SYNTH_DLS_WAVEFORMAT */ -/* #define KSPROPSETID_Sysaudio */ -/* - KSPROPERTY_SYSAUDIO_COMPONENT_ID - KSPROPERTY_SYSAUDIO_CREATE_VIRTUAL_SOURCE - KSPROPERTY_SYSAUDIO_DEVICE_COUNT - KSPROPERTY_SYSAUDIO_DEVICE_FRIENDLY_NAME - KSPROPERTY_SYSAUDIO_DEVICE_INSTANCE - KSPROPERTY_SYSAUDIO_DEVICE_INTERFACE_NAME - KSPROPERTY_SYSAUDIO_INSTANCE_INFO - KSPROPERTY_SYSAUDIO_SELECT_GRAPH -*/ - -#define KSPROPSETID_Sysaudio_Pin -/* - KSPROPERTY_SYSAUDIO_ATTACH_VIRTUAL_SOURCE -*/ - #define KSPROPSETID_TopologyNode /* KSPROPERTY_TOPOLOGYNODE_ENABLE Modified: trunk/reactos/include/psdk/ksmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksmedia.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] Fri Feb 20 08:50:26 2009 @@ -213,4 +213,14 @@ #define SYSAUDIO_FLAGS_DONT_COMBINE_PINS 0x00000001 +#define STATIC_KSPROPSETID_Sysaudio_Pin \ + 0xA3A53220L, 0xC6E4, 0x11D0, {0xB4, 0x65, 0x00, 0x00, 0x1A, 0x18, 0x18, 0xE6} +DEFINE_GUIDSTRUCT("A3A53220-C6E4-11D0-B465-00001A1818E6", KSPROPSETID_Sysaudio_Pin); +#define KSPROPSETID_Sysaudio_Pin DEFINE_GUIDNAMED(KSPROPSETID_Sysaudio_Pin) + +typedef enum { + KSPROPERTY_SYSAUDIO_ATTACH_VIRTUAL_SOURCE = 1, +} KSPROPERTY_SYSAUDIO_PIN; + + #endif

16 years, 4 months

[mkupfer] 39692: disable useless or wrong message handling (WM_PAINT + WM_NCPAINT)

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Fri Feb 20 08:22:15 2009 New Revision: 39692 URL: http://svn.reactos.org/svn/reactos?rev=39692&view=rev Log: disable useless or wrong message handling (WM_PAINT + WM_NCPAINT) Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] Fri Feb 20 08:22:15 2009 @@ -103,10 +103,12 @@ INT_PTR CALLBACK TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { +#if 0 HDC hdc; PAINTSTRUCT ps; + RECT rc; +#endif LPRECT pRC; - RECT rc; int idctrl; LPNMHDR pnmh; WINDOWPLACEMENT wp; @@ -289,7 +291,7 @@ TaskManager_OnTabWndSelChange(); } break; - +#if 0 case WM_NCPAINT: hdc = GetDC(hDlg); GetClientRect(hDlg, &rc); @@ -303,7 +305,7 @@ Draw3dRect(hdc, rc.left, rc.top, rc.right, rc.top + 2, GetSysColor(COLOR_3DSHADOW), GetSysColor(COLOR_3DHILIGHT)); EndPaint(hDlg, &ps); break; - +#endif case WM_SIZING: /* Make sure the user is sizing the dialog */ /* in an acceptable range */

16 years, 4 months

[mkupfer] 39691: parent window hight doesn't affect status window hight

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Fri Feb 20 05:12:47 2009 New Revision: 39691 URL: http://svn.reactos.org/svn/reactos?rev=39691&view=rev Log: parent window hight doesn't affect status window hight Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] Fri Feb 20 05:12:47 2009 @@ -630,7 +630,7 @@ /* Update the status bar size */ GetWindowRect(hStatusWnd, &rc); - SendMessageW(hStatusWnd, WM_SIZE, nType, MAKELPARAM(cx, cy + (rc.bottom - rc.top))); + SendMessageW(hStatusWnd, WM_SIZE, nType, MAKELPARAM(cx,rc.bottom - rc.top)); /* Update the status bar pane sizes */ nParts[0] = bInMenuLoop ? -1 : 100;

16 years, 4 months

[hyperion] 39690: "ReactOS Crew" logo

by hyperion＠svn.reactos.org

Author: hyperion Date: Fri Feb 20 04:01:08 2009 New Revision: 39690 URL: http://svn.reactos.org/svn/reactos?rev=39690&view=rev Log: "ReactOS Crew" logo Added: trunk/press-media/art/ReactOS Crew.svg Added: trunk/press-media/art/ReactOS Crew.svg URL: http://svn.reactos.org/svn/reactos/trunk/press-media/art/ReactOS%20Crew.svg… ============================================================================== --- trunk/press-media/art/ReactOS Crew.svg (added) +++ trunk/press-media/art/ReactOS Crew.svg [iso-8859-1] Fri Feb 20 04:01:08 2009 @@ -1,0 +1,198 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.0" + width="1052.3622" + height="744.09448" + id="svg18380" + sodipodi:version="0.32" + inkscape:version="0.46" + sodipodi:docname="ReactOS Crew-.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + <metadata + id="metadata44"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + inkscape:window-height="718" + inkscape:window-width="1024" + inkscape:pageshadow="2" + inkscape:pageopacity="0.0" + guidetolerance="10.0" + gridtolerance="10.0" + objecttolerance="10.0" + borderopacity="1.0" + bordercolor="#666666" + pagecolor="#ffffff" + id="base" + showgrid="false" + inkscape:zoom="1.4621053" + inkscape:cx="465.01255" + inkscape:cy="501.705" + inkscape:window-x="-8" + inkscape:window-y="-8" + inkscape:current-layer="svg18380" /> + <defs + id="defs18382" /> + <g + transform="translate(-23.996735,-375.51914)" + id="layer1"> + <g + transform="translate(260.43304,141.11991)" + id="g18716"> + <polygon + points="43.8,491.5 299.8,48.2 555.8,491.5 43.8,491.5 " + transform="matrix(-0.8920388,0,0,-0.8920388,557.17799,839.05934)" + id="polygon7230" + style="fill:#000000;fill-opacity:1" /> + <polygon + points="43.8,491.5 299.8,48.2 555.8,491.5 43.8,491.5 " + transform="matrix(-1.0137038,0,0,-1.0137038,593.65319,879.99444)" + id="polygon7232" + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:12.31101322;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <polygon + points="43.8,491.5 299.8,48.2 555.8,491.5 43.8,491.5 " + transform="matrix(0.8920388,0,0,-0.8920388,22.311526,839.05934)" + id="polygon7234" + style="fill:#000000;fill-opacity:1" /> + <path + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;" + d="M 219.01973,457.61931 L 210.71352,436.81912 L 212.98432,436.81912 C 214.09933,436.81914 215.07514,436.40085 215.91174,435.56425 C 216.70939,434.76782 217.10822,433.79202 217.10825,432.63683 L 217.10825,411.83664 C 217.10822,410.68153 216.70939,409.70572 215.91174,408.90922 C 215.07514,408.07148 214.09933,407.65258 212.98432,407.65253 L 192.18596,407.65253 L 192.18596,457.61931 L 200.49217,457.61931 L 200.49217,436.81912 L 202.88335,436.81912 L 210.71352,457.61931 L 219.01973,457.61931 z M 208.80021,428.51291 L 200.49217,428.51291 L 200.49217,416.02076 L 208.80021,416.02076 L 208.80021,428.51291 z M 245.47413,453.4352 L 245.47413,440.94305 L 237.16609,440.94305 L 237.16609,449.25108 L 228.85805,449.25108 L 228.85805,436.28106 L 242.66526,436.28106 L 242.66526,428.99078 L 228.85805,428.99078 L 228.85805,416.02076 L 237.16609,416.02076 L 237.16609,424.3288 L 245.47413,424.3288 L 245.47413,411.77645 C 245.4741,410.70159 245.07527,409.72579 244.27763,408.84903 C 243.40211,408.05141 242.42631,407.65258 241.35021,407.65253 L 224.73413,407.65253 C 223.57897,407.65258 222.60316,408.05141 221.80671,408.84903 C 220.97013,409.68566 220.55184,410.66147 220.55184,411.77645 L 220.55184,453.4352 C 220.55184,454.59036 220.97013,455.58623 221.80671,456.42281 C 222.60316,457.22048 223.57897,457.61931 224.73413,457.61931 L 241.35021,457.61931 C 242.42631,457.61931 243.40211,457.22048 244.27763,456.42281 C 245.07527,455.5461 245.4741,454.55024 245.47413,453.4352 L 245.47413,453.4352 z M 273.9002,457.67768 L 273.9002,407.59416 L 265.47178,407.59416 L 256.208,407.59416 L 248.85753,444.11123 L 248.85753,457.67768 L 257.16375,457.67768 L 257.16375,452.41926 L 266.00985,452.41926 L 266.00985,457.67768 L 273.9002,457.67768 z M 265.47178,444.11123 L 257.16375,444.11123 L 262.72311,413.9287 L 265.47178,413.9287 L 265.47178,444.11123 z M 302.2059,453.4352 L 302.2059,440.94305 L 293.89786,440.94305 L 293.89786,449.25108 L 285.58982,449.25108 L 285.58982,416.02076 L 293.89786,416.02076 L 293.89786,424.3288 L 302.2059,424.3288 L 30 2.2059,411.77645 C 302.20587,410.70159 301.80703,409.72579 301.00939,408.84903 C 300.13388,408.05141 299.15807,407.65258 298.08197,407.65253 L 281.4659,407.65253 C 280.31073,407.65258 279.33493,408.05141 278.53848,408.84903 C 277.70189,409.68566 277.2836,410.66147 277.28361,411.77645 L 277.28361,453.4352 C 277.2836,454.59036 277.70189,455.58623 278.53848,456.42281 C 279.33493,457.22048 280.31073,457.61931 281.4659,457.61931 L 298.08197,457.61931 C 299.15807,457.61931 300.13388,457.22048 301.00939,456.42281 C 301.80703,455.5461 302.20587,454.55024 302.2059,453.4352 L 302.2059,453.4352 z M 326.20892,457.49893 L 326.26728,415.90038 L 332.18414,415.78182 L 332.18414,407.53397 L 305.64949,407.53397 L 305.64949,423.19248 L 313.9557,423.19248 L 313.9557,415.90038 L 317.90088,415.90038 L 317.90088,457.49893 L 326.20892,457.49893 z M 358.93765,452.59801 L 358.93765,412.55345 C 358.93763,411.16001 358.45915,409.98479 357.50221,409.02778 C 356.54645,408.03196 355.37122,407.53402 353.97654,407.53397 L 339.03484,407.53397 C 337.64013,407.53402 336.46491,408.03196 335.50917,409.02778 C 334.5133,410.0237 334.01536,411.19892 334.01536,412.55345 L 334.01536,452.59801 C 334.01536,453.95259 334.5133,455.12781 335.50917,456.12368 C 336.02716,456.68181 336.57495,457.06058 337.15254,457.26 C 337.73011,457.45941 338.35755,457.55912 339.03484,457.55912 L 346.50569,457.55912 L 346.50569,457.79806 L 354.81373,457.79806 L 354.81373,457.49893 C 355.96887,457.33964 356.96474,456.78152 357.80134,455.82456 C 358.55886,454.90894 358.93763,453.83343 358.93765,452.59801 L 358.93765,452.59801 z M 350.62962,449.25108 L 342.32158,449.25108 L 342.32158,415.90038 L 350.62962,415.90038 L 350.62962,449.25108 z M 387.30354,457.49893 L 387.30354,449.1307 L 372.30165,415.90038 L 378.99551,415.90038 L 378.99551,424.20842 L 387.30354,424.20842 L 387.30354,407.53397 L 362.38126,407.53397 L 362.38126,415.90038 L 377.74064,449.1307 L 370.68747,449.1307 L 370.68747,440.82449 L 362.38126,440.82449 L 362.38126,457.49893 L 387.30354,457.49893 z" + id="text7248" /> + <path + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;" + d="M 390.22888,412.96864 C 390.22888,411.46887 390.76106,410.18815 391.82542,409.12648 C 392.88977,408.06482 394.17184,407.53398 395.67162,407.53397 C 397.17138,407.53398 398.45211,408.06482 399.51378,409.12648 C 400.57544,410.18815 401.10628,411.46887 401.10629,412.96864 C 401.10628,414.46842 400.57544,415.75049 399.51378,416.81484 C 398.45211,417.8792 397.17138,418.41138 395.67162,418.41138 C 394.17184,418.41138 392.88977,417.8792 391.82542,416.81484 C 390.76106,415.75049 390.22888,414.46842 390.22888,412.96864 L 390.22888,412.96864 z M 400.21932,412.96864 C 400.21931,411.71077 399.77583,410.63835 398.88888,409.75138 C 398.0019,408.86443 396.92948,408.42095 395.67162,408.42094 C 394.41373,408.42095 393.33997,408.86443 392.45032,409.75138 C 391.56067,410.63835 391.11584,411.71077 391.11584,412.96864 C 391.11584,414.22652 391.56067,415.30029 392.45032,416.18994 C 393.33997,417.07959 394.41373,417.52442 395.67162,417.52441 C 396.92948,417.52442 398.0019,417.07959 398.88888,416.18994 C 399.77583,415.30029 400.21931,414.22652 400.21932,412.96864 L 400.21932,412.96864 z M 397.36491,416.25041 L 395.66355,413.37181 L 394.69596,413.37181 L 394.69596,416.25041 L 393.73642,416.25041 L 393.73642,409.5498 L 395.45391,409.5498 C 397.06656,409.54981 397.87289,410.16799 397.8729,411.40436 C 397.87289,412.26445 397.44016,412.87189 396.57471,413.22667 L 398.40508,416.25041 L 397.36491,416.25041 z M 394.69596,410.37226 L 394.69596,412.59773 C 394.77658,412.60849 394.98623,412.61386 395.32489,412.61386 C 395.94845,412.61386 396.36774,412.53457 396.58277,412.37599 C 396.79778,412.21742 396.90529,411.91504 396.9053,411.46887 C 396.90529,410.73243 396.4215,410.3642 395.45391,410.36419 L 395.07493,410.36419 L 394.69596,410.37226 z" + id="text7252" /> + <g + transform="matrix(0.7754435,0,0,-0.7754435,1.7401893,652.35608)" + id="g7262"> + <path + d="M 397.65625,89.03125 C 395.21048,90.311738 384.13969,97.093712 381.61115,98.593261 C 389.13676,104.65207 399.81437,113.40296 407.12549,120.71408 C 420.04088,133.62947 437.04469,156.68645 445.91551,169.97584 C 445.85849,169.13722 445.21568,151.2641 445.1308,150.4334 C 442.24243,122.16429 423.35534,98.621249 397.65625,89.03125 z M 345.59375,89.28125 C 319.99541,99.111866 300.18532,124.68 298.35481,150.88606 C 298.27538,152.02317 297.89496,153.88226 297.94796,158.27914 C 298.00254,162.80669 298.37036,168.97204 299.1395,167.91847 C 306.92567,157.25303 329.01775,126.93488 339.35558,116.59705 C 346.66779,109.28483 353.83763,104.39783 361.36664,98.343162 C 358.99261,96.93597 347.89514,90.496093 345.59375,89.28125 z M 371.375,105.875 C 362.72847,112.40926 353.99704,120.00296 345.5,128.5 C 326.41629,147.5837 311.9709,167.97738 303.65625,185.46875 C 314.5504,212.49554 341.02523,231.59375 371.9375,231.59375 C 402.38061,231.59375 428.5265,213.06435 439.71875,186.6875 C 431.50435,168.93054 416.84022,148.02771 397.3125,128.5 C 388.80379,119.99129 380.03499,112.41163 371.375,105.875 z" + id="path7264" + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + d="M 309.71875,64.21875 C 301.09,64.161971 293.80512,66.50738 288.65625,71.65625 C 278.3585,81.953987 279.3572,100.72019 288.09375,121.9375 C 289.86192,126.23162 291.97822,130.65777 294.375,135.15625 C 295.11077,132.65676 295.97295,130.20517 296.9375,127.8125 C 295.74506,125.3517 294.6326,122.90238 293.65625,120.53125 C 285.41447,100.51547 285.14891,84.507341 293.34375,76.3125 C 301.53859,68.117659 317.54672,68.414459 337.5625,76.65625 C 344.48697,79.507501 360.26594,89.356166 367.81521,93.99747 C 369.43681,92.779922 371.06933,91.589523 372.69021,90.43497 C 363.99355,84.924225 347.02909,74.42558 338.9375,71.09375 C 328.32884,66.725479 318.3475,64.275529 309.71875,64.21875 z M 383,97.71875 C 381.39526,98.770988 379.7786,99.837632 378.15625,100.96875 C 386.47495,107.39098 394.8391,114.7141 402.96875,122.84375 C 424.84442,144.71941 440.91445,168.23422 449.15625,188.25 C 457.39803,208.26579 457.66359,224.27391 449.46875,232.46875 C 441.27392,240.66358 425.29704,240.39804 405.28125,232.15625 C 405.10838,232.08507 404.9234,232.00985 404.75,231.9375 C 402.33819,233.00982 399.84154,233.94506 397.3125,234.78125 C 399.5246,235.82957 401.71956,236.83122 403.875,237.71875 C 425.09232,246.45531 443.85851,247.42274 454.15625,237.125 C 464.45398,226.82726 463.45529,208.09232 454.71875,186.875 C 445.9822,165.65769 429.35028,141.44404 406.84375,118.9375 C 399.02819,111.12194 391.0254,104.02796 383,97.71875 z" + id="path7266" + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:7.6803484;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + d="M 433.09375,64.21875 C 424.46975,64.270785 414.48366,66.725478 403.875,71.09375 C 382.65769,79.830294 358.47528,96.430962 335.96875,118.9375 C 313.46223,141.44403 296.8303,165.62643 288.09375,186.84375 C 279.35721,208.06107 278.35851,226.82726 288.65625,237.125 C 298.95399,247.42274 317.72018,246.42405 338.9375,237.6875 C 341.2343,236.74176 343.57712,235.69026 345.9375,234.5625 C 343.45071,233.71693 340.99654,232.76203 338.625,231.6875 C 338.27367,231.83605 337.91172,231.9812 337.5625,232.125 C 317.54673,240.36679 301.50734,240.66359 293.3125,232.46875 C 285.11765,224.2739 285.41446,208.26578 293.65625,188.25 C 301.89804,168.23421 317.96809,144.71941 339.84375,122.84375 C 361.71942,100.96808 385.26547,84.898044 405.28125,76.65625 C 425.29704,68.414461 441.27391,68.11766 449.46875,76.3125 C 457.66358,84.507339 457.39805,100.51546 449.15625,120.53125 C 448.34246,122.50761 447.43338,124.52253 446.46875,126.5625 C 447.47539,128.94387 448.34657,131.38381 449.125,133.875 C 451.24518,129.8129 453.11683,125.82786 454.71875,121.9375 C 463.45528,100.72018 464.42274,81.95399 454.125,71.65625 C 448.97613,66.507379 441.71775,64.166715 433.09375,64.21875 z" + id="path7268" + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:7.6803484;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + </g> + <path + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 265.35925,654.48389 L 265.35925,644.35607 L 258.62364,644.35607 L 258.62364,651.09169 L 251.88802,651.09169 L 251.88802,624.1507 L 258.62364,624.1507 L 258.62364,630.88632 L 265.35925,630.88632 L 265.35925,620.70969 C 265.35923,619.83827 265.03588,619.04715 264.3892,618.33633 C 263.67939,617.68967 262.88827,617.36633 262.01584,617.36628 L 248.54461,617.36628 C 247.60808,617.36633 246.81696,617.68967 246.17125,618.33633 C 245.493,619.01461 245.15388,619.80573 245.15388,620.70969 L 245.15388,654.48389 C 245.15388,655.42042 245.493,656.22781 246.17125,656.90605 C 246.81696,657.55275 247.60808,657.8761 248.54461,657.8761 L 262.01584,657.8761 C 262.88827,657.8761 263.67939,657.55275 264.3892,656.90605 C 265.03588,656.19528 265.35923,655.38789 265.35925,654.48389 L 265.35925,654.48389 z M 289.90617,657.8761 L 283.17204,641.01266 L 285.01306,641.01266 C 285.91703,641.01268 286.70815,640.67355 287.38642,639.99529 C 288.03309,639.3496 288.35644,638.55848 288.35646,637.62193 L 288.35646,620.75849 C 288.35644,619.822 288.03309,619.03088 287.38642,618.38513 C 286.70815,617.70594 285.91703,617.36633 285.01306,617.36628 L 268.1511,617.36628 L 268.1511,657.8761 L 274.88523,657.8761 L 274.88523,641.01266 L 276.82385,641.01266 L 283.17204,657.8761 L 289.90617,657.8761 z M 281.62085,634.27852 L 274.88523,634.27852 L 274.88523,624.1507 L 281.62085,624.1507 L 281.62085,634.27852 z M 311.35368,654.48389 L 311.35368,644.35607 L 304.61806,644.35607 L 304.61806,651.09169 L 297.88245,651.09169 L 297.88245,640.57643 L 309.07643,640.57643 L 309.07643,634.66595 L 297.88245,634.66595 L 297.88245,624.1507 L 304.61806,624.1507 L 304.61806,630.88632 L 311.35368,630.88632 L 311.35368,620.70969 C 311.35366,619.83827 311.03031,619.04715 310.38363,618.33633 C 309.67382,617.68967 308.8827,617.36633 308.01027,617.36628 L 294.53904,617.36628 C 293.6025,617.36633 292.81138,617.68967 292.16567,618.33633 C 291.48743,619.01461 291.14831,619.80573 291.14831,620.70969 L 291.14831,654.48389 C 291.14831,655.42042 291.48743,656.22781 292.16567, 656.90605 C 292.81138,657.55275 293.6025,657.8761 294.53904,657.8761 L 308.01027,657.8761 C 308.8827,657.8761 309.67382,657.55275 310.38363,656.90605 C 311.03031,656.19528 311.35366,655.38789 311.35368,654.48389 L 311.35368,654.48389 z M 334.35089,657.7785 L 334.35089,617.27017 L 327.61527,617.27017 L 327.61527,640.04409 L 324.27186,634.13213 L 320.87966,640.04409 L 320.87966,617.27017 L 314.14552,617.27017 L 314.14552,657.7785 L 320.87966,657.7785 L 324.27186,644.25995 L 327.61527,657.7785 L 334.35089,657.7785 z" + id="text7306" /> + <g + transform="matrix(0.530102,0.1356524,-0.1356524,0.530102,96.192385,390.90039)" + id="g3319"> + <path + d="M 188.05263,212.91973 L 252.41556,189.72431 L 221.11778,182.48579 L 291.76649,165.84747 L 196.05322,180.14579 L 232.49769,190.73178 L 179.12153,209.53763" + id="path3321" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + d="M 215.1221,211.65068 L 183.9593,210.90852 L 187.05939,200.23712 L 152.11807,225.99066" + id="path3323" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </g> + <g + transform="matrix(0.5409104,-7.0342377e-2,7.0342377e-2,0.5409104,72.111064,462.51288)" + id="g3325"> + <path + d="M 186.56515,214.59938 L 254.38802,190.51856 L 217.40239,181.38759 L 272.1051,170.35745 L 194.49217,179.80796 L 232.49769,190.73178 L 179.12153,209.53763" + id="path3327" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + d="M 215.1221,211.65068 L 183.9593,210.90852 L 187.05939,200.23712 L 152.11807,225.99066" + id="path3329" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </g> + <g + transform="matrix(0.6021714,0,0,0.6021714,55.320594,409.44172)" + id="g14658"> + <path + d="M 154.36939,148.94777 L 239.22771,147.06573 L 216.06626,135.24784 L 273.62447,138.27063 L 182.33033,125.54164 L 217.72858,142.92025 L 148.59602,144.00572" + id="path14660" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + d="M 180.37995,153.4026 L 154.5912,145.49601 L 164.92533,140.1158 L 121.19351,146.99087" + id="path14662" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </g> + <g + transform="matrix(0.648809,0.1570557,-0.1570557,0.648809,37.170428,304.74978)" + id="g18527"> + <path + d="M 154.36939,148.94777 L 239.22771,147.06573 L 216.06626,135.24784 L 273.62447,138.27063 L 182.33033,125.54164 L 217.72858,142.92025 L 148.59602,144.00572" + id="path18529" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + d="M 180.37995,153.4026 L 154.5912,145.49601 L 164.92533,140.1158 L 121.19351,146.99087" + id="path18531" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </g> + <g + transform="matrix(-0.530102,0.1356524,0.1356524,0.530102,483.29714,390.90039)" + id="g18533"> + <path + d="M 188.05263,212.91973 L 252.41556,189.72431 L 221.11778,182.48579 L 291.76649,165.84747 L 196.05322,180.14579 L 232.49769,190.73178 L 179.12153,209.53763" + id="path18535" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + d="M 215.1221,211.65068 L 183.9593,210.90852 L 187.05939,200.23712 L 152.11807,225.99066" + id="path18537" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </g> + <g + transform="matrix(-0.5409104,-7.0342377e-2,-7.0342377e-2,0.5409104,507.37846,462.51288)" + id="g18539"> + <path + d="M 186.56515,214.59938 L 254.38802,190.51856 L 217.40239,181.38759 L 272.1051,170.35745 L 194.49217,179.80796 L 232.49769,190.73178 L 179.12153,209.53763" + id="path18541" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + d="M 215.1221,211.65068 L 183.9593,210.90852 L 187.05939,200.23712 L 152.11807,225.99066" + id="path18543" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </g> + <g + transform="matrix(-0.6021714,0,0,0.6021714,524.16893,409.44172)" + id="g18545"> + <path + d="M 154.36939,148.94777 L 239.22771,147.06573 L 216.06626,135.24784 L 273.62447,138.27063 L 182.33033,125.54164 L 217.72858,142.92025 L 148.59602,144.00572" + id="path18547" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + d="M 180.37995,153.4026 L 154.5912,145.49601 L 164.92533,140.1158 L 121.19351,146.99087" + id="path18549" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </g> + <g + transform="matrix(-0.648809,0.1570557,0.1570557,0.648809,542.31909,304.74978)" + id="g18670"> + <path + d="M 154.36939,148.94777 L 239.22771,147.06573 L 216.06626,135.24784 L 273.62447,138.27063 L 182.33033,125.54164 L 217.72858,142.92025 L 148.59602,144.00572" + id="path18672" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + d="M 180.37995,153.4026 L 154.5912,145.49601 L 164.92533,140.1158 L 121.19351,146.99087" + id="path18674" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </g> + </g> + </g> +</svg>

16 years, 4 months

[hyperion] 39689: MOCA 2008 talk slideshow (held by KJK::Hyperion and Stefan100). Original was lost OpenDay 2008 talk slideshow (held by KJK::Hyperion)

by hyperion＠svn.reactos.org

Author: hyperion Date: Fri Feb 20 03:50:42 2009 New Revision: 39689 URL: http://svn.reactos.org/svn/reactos?rev=39689&view=rev Log: MOCA 2008 talk slideshow (held by KJK::Hyperion and Stefan100). Original was lost OpenDay 2008 talk slideshow (held by KJK::Hyperion) Added: trunk/press-media/presentations/MOCA 2008/ trunk/press-media/presentations/MOCA 2008/ReactOS @ MOCA 2008.pdf (with props) trunk/press-media/presentations/OpenDay 2008/ trunk/press-media/presentations/OpenDay 2008/ReactOS - il clone Open Source di Windows.odp (with props) trunk/press-media/presentations/OpenDay 2008/ReactOS - il clone Open Source di Windows.pptx (with props) Added: trunk/press-media/presentations/MOCA 2008/ReactOS @ MOCA 2008.pdf URL: http://svn.reactos.org/svn/reactos/trunk/press-media/presentations/MOCA%202… ============================================================================== Binary file - no diff available. Propchange: trunk/press-media/presentations/MOCA 2008/ReactOS @ MOCA 2008.pdf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/press-media/presentations/OpenDay 2008/ReactOS - il clone Open Source di Windows.odp URL: http://svn.reactos.org/svn/reactos/trunk/press-media/presentations/OpenDay%… ============================================================================== Binary file - no diff available. Propchange: trunk/press-media/presentations/OpenDay 2008/ReactOS - il clone Open Source di Windows.odp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/press-media/presentations/OpenDay 2008/ReactOS - il clone Open Source di Windows.pptx URL: http://svn.reactos.org/svn/reactos/trunk/press-media/presentations/OpenDay%… ============================================================================== Binary file - no diff available. Propchange: trunk/press-media/presentations/OpenDay 2008/ReactOS - il clone Open Source di Windows.pptx ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

16 years, 4 months

[jimtabor] 39688: Patch by Rein Klazes: Do not handle WM_ENDSESSION in DefWinProc().

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Feb 19 16:51:47 2009 New Revision: 39688 URL: http://svn.reactos.org/svn/reactos?rev=39688&view=rev Log: Patch by Rein Klazes: Do not handle WM_ENDSESSION in DefWinProc(). Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Thu Feb 19 16:51:47 2009 @@ -1613,10 +1613,6 @@ break; } - case WM_ENDSESSION: - if (wParam) PostQuitMessage(0); - return 0; - case WM_QUERYUISTATE: { LRESULT Ret = 0;

16 years, 4 months

[arty] 39687: - Our code was a bit confused about close vs cleanup irps in tcpip. We now interpret and implement them both properly, preparing for close in cleanup then actually deallocating in close. - AFD should have been keeping extra references to TCP resources, because the handles will be closed by the handle sweeper at process shutdown. - Fix failure cases for pendable TCP requests and add SEL_FIN when a socket is closed at oskit, but closing up at tcpip.sys. - Fix some breakage from my pr

by arty＠svn.reactos.org

Author: arty Date: Thu Feb 19 14:14:39 2009 New Revision: 39687 URL: http://svn.reactos.org/svn/reactos?rev=39687&view=rev Log: - Our code was a bit confused about close vs cleanup irps in tcpip. We now interpret and implement them both properly, preparing for close in cleanup then actually deallocating in close. - AFD should have been keeping extra references to TCP resources, because the handles will be closed by the handle sweeper at process shutdown. - Fix failure cases for pendable TCP requests and add SEL_FIN when a socket is closed at oskit, but closing up at tcpip.sys. - Fix some breakage from my previous commit re: bind the zero address. We now ask the connection for the right address if we are one, and plumb the request all the way to tcp, which is deciding what adapter to send to anyway. - Fix one error code in udp, properly reporting network unreachable. Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/drivers/network/afd/afd/bind.c trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/info.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/tcpip/include/fileobjs.h trunk/reactos/drivers/network/tcpip/include/tcp.h trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c trunk/reactos/drivers/network/tcpip/tcpip/main.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c trunk/reactos/lib/drivers/ip/transport/udp/udp.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Thu Feb 19 14:14:39 2009 @@ -351,6 +351,10 @@ DbgPrint("MSAFD: STATUS_INVALID_PARAMETER\n"); *Errno = WSAEINVAL; break; + case STATUS_CANCELLED: + DbgPrint("MSAFD: STATUS_CANCELLED\n"); + *Errno = WSAENOTSOCK; + break; default: DbgPrint("MSAFD: Error %x is unknown\n", Status); *Errno = WSAEINVAL; Modified: trunk/reactos/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/bi… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] Thu Feb 19 14:14:39 2009 @@ -32,6 +32,11 @@ FCB->LocalAddress, &FCB->AddressFile.Handle, &FCB->AddressFile.Object ); + + if (NT_SUCCESS(Status)) + { + ObReferenceObject(FCB->AddressFile.Object); + } AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Thu Feb 19 14:14:39 2009 @@ -29,6 +29,11 @@ FCB->Connection.Object ); } + if (NT_SUCCESS(Status)) + { + ObReferenceObject(FCB->Connection.Object); + } + return Status; } Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Thu Feb 19 14:14:39 2009 @@ -110,7 +110,8 @@ } Status = TdiQueryInformation - ( FCB->AddressFile.Object, + ( FCB->Connection.Object ? + FCB->Connection.Object : FCB->AddressFile.Object, TDI_QUERY_ADDRESS_INFO, Mdl ); } else { Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Thu Feb 19 14:14:39 2009 @@ -224,11 +224,16 @@ if( FCB->TdiDeviceName.Buffer ) ExFreePool(FCB->TdiDeviceName.Buffer); - /* HACK HACK HACK */ - TdiCloseDevice( FCB->Connection.Handle, - FCB->Connection.Object ); - TdiCloseDevice( FCB->AddressFile.Handle, - FCB->AddressFile.Object ); + if (FCB->Connection.Object) + { + NtClose(FCB->Connection.Handle); + ObDereferenceObject(FCB->Connection.Object); + } + if (FCB->AddressFile.Object) + { + NtClose(FCB->AddressFile.Handle); + ObDereferenceObject(FCB->AddressFile.Object); + } ExFreePool(FCB); AFD_DbgPrint(MIN_TRACE,("Deleted (%x)\n", FCB)); Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Thu Feb 19 14:14:39 2009 @@ -34,7 +34,8 @@ } static VOID HandleEOFOnIrp( PAFD_FCB FCB, NTSTATUS Status, UINT Information ) { - if( Status == STATUS_SUCCESS && Information == 0 ) { + if( !NT_SUCCESS(Status) || + (Status == STATUS_SUCCESS && Information == 0) ) { AFD_DbgPrint(MID_TRACE,("Looks like an EOF\n")); FCB->PollState |= AFD_EVENT_DISCONNECT; PollReeval( FCB->DeviceExt, FCB->FileObject ); @@ -259,10 +260,10 @@ HandleEOFOnIrp( FCB, Irp->IoStatus.Status, Irp->IoStatus.Information ); - ReceiveActivity( FCB, NULL ); - - PollReeval( FCB->DeviceExt, FCB->FileObject ); - + ReceiveActivity( FCB, NULL ); + + PollReeval( FCB->DeviceExt, FCB->FileObject ); + SocketStateUnlock( FCB ); AFD_DbgPrint(MID_TRACE,("Returned %x\n", Status)); Modified: trunk/reactos/drivers/network/tcpip/include/fileobjs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/fileobjs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/fileobjs.h [iso-8859-1] Thu Feb 19 14:14:39 2009 @@ -23,6 +23,9 @@ NTSTATUS FileCloseAddress( PTDI_REQUEST Request); +NTSTATUS FileFreeAddress( + PTDI_REQUEST Request); + NTSTATUS FileOpenConnection( PTDI_REQUEST Request, PVOID ClientContext); @@ -32,10 +35,13 @@ NTSTATUS FileCloseConnection( PTDI_REQUEST Request); +NTSTATUS FileFreeConnection( + PTDI_REQUEST Request); + NTSTATUS FileOpenControlChannel( PTDI_REQUEST Request); -NTSTATUS FileCloseControlChannel( +NTSTATUS FileFreeControlChannel( PTDI_REQUEST Request); #endif /* __FILEOBJS_H */ Modified: trunk/reactos/drivers/network/tcpip/include/tcp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/tcp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/tcp.h [iso-8859-1] Thu Feb 19 14:14:39 2009 @@ -170,9 +170,10 @@ VOID TCPFreePort( UINT Port ); -NTSTATUS TCPGetPeerAddress +NTSTATUS TCPGetSockAddress ( PCONNECTION_ENDPOINT Connection, - PTRANSPORT_ADDRESS TransportAddress ); + PTRANSPORT_ADDRESS TransportAddress, + BOOLEAN RemoteAddress ); NTSTATUS TCPStartup( VOID); Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Thu Feb 19 14:14:39 2009 @@ -671,19 +671,34 @@ PTDI_ADDRESS_INFO AddressInfo; PADDRESS_FILE AddrFile; PTA_IP_ADDRESS Address; + PCONNECTION_ENDPOINT Endpoint = NULL; AddressInfo = (PTDI_ADDRESS_INFO)MmGetSystemAddressForMdl(Irp->MdlAddress); + Address = (PTA_IP_ADDRESS)&AddressInfo->Address; switch ((ULONG)IrpSp->FileObject->FsContext2) { case TDI_TRANSPORT_ADDRESS_FILE: AddrFile = (PADDRESS_FILE)TranContext->Handle.AddressHandle; - break; + + Address->TAAddressCount = 1; + Address->Address[0].AddressLength = TDI_ADDRESS_LENGTH_IP; + Address->Address[0].AddressType = TDI_ADDRESS_TYPE_IP; + Address->Address[0].Address[0].sin_port = AddrFile->Port; + Address->Address[0].Address[0].in_addr = AddrFile->Address.Address.IPv4Address; + RtlZeroMemory( + &Address->Address[0].Address[0].sin_zero, + sizeof(Address->Address[0].Address[0].sin_zero)); + return STATUS_SUCCESS; case TDI_CONNECTION_FILE: - AddrFile = - ((PCONNECTION_ENDPOINT)TranContext->Handle.ConnectionContext)-> - AddressFile; - break; + Endpoint = + (PCONNECTION_ENDPOINT)TranContext->Handle.ConnectionContext; + TCPGetSockAddress( Endpoint, (PTRANSPORT_ADDRESS)Address, FALSE ); + DbgPrint("Returning socket address %x\n", Address->Address[0].Address[0].in_addr); + RtlZeroMemory( + &Address->Address[0].Address[0].sin_zero, + sizeof(Address->Address[0].Address[0].sin_zero)); + return STATUS_SUCCESS; default: TI_DbgPrint(MIN_TRACE, ("Invalid transport context\n")); @@ -702,17 +717,6 @@ return STATUS_BUFFER_OVERFLOW; } - Address = (PTA_IP_ADDRESS)&AddressInfo->Address; - Address->TAAddressCount = 1; - Address->Address[0].AddressLength = TDI_ADDRESS_LENGTH_IP; - Address->Address[0].AddressType = TDI_ADDRESS_TYPE_IP; - Address->Address[0].Address[0].sin_port = AddrFile->Port; - Address->Address[0].Address[0].in_addr = - AddrFile->Address.Address.IPv4Address; - RtlZeroMemory( - &Address->Address[0].Address[0].sin_zero, - sizeof(Address->Address[0].Address[0].sin_zero)); - return STATUS_SUCCESS; } @@ -752,7 +756,7 @@ return STATUS_BUFFER_OVERFLOW; } - return TCPGetPeerAddress( Endpoint, AddressInfo->RemoteAddress ); + return TCPGetSockAddress( Endpoint, AddressInfo->RemoteAddress, TRUE ); } } Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Thu Feb 19 14:14:39 2009 @@ -204,28 +204,6 @@ /* - * FUNCTION: Deletes a connection endpoint file object - * ARGUMENTS: - * Connection = Pointer to connection endpoint to delete - */ -VOID DeleteConnectionEndpoint( - PCONNECTION_ENDPOINT Connection) -{ - KIRQL OldIrql; - - TI_DbgPrint(MID_TRACE, ("Called.\n")); - - /* Remove connection endpoint from the global list */ - TcpipAcquireSpinLock(&ConnectionEndpointListLock, &OldIrql); - RemoveEntryList(&Connection->ListEntry); - TcpipReleaseSpinLock(&ConnectionEndpointListLock, OldIrql); - - TCPFreeConnectionEndpoint(Connection); - - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); -} - -/* * FUNCTION: Open an address file object * ARGUMENTS: * Request = Pointer to TDI request structure for this request @@ -395,6 +373,29 @@ break; } + TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); + + return Status; +} + + +/* + * FUNCTION: Closes an address file object + * ARGUMENTS: + * Request = Pointer to TDI request structure for this request + * RETURNS: + * Status of operation + */ +NTSTATUS FileFreeAddress( + PTDI_REQUEST Request) +{ + PADDRESS_FILE AddrFile; + NTSTATUS Status = STATUS_SUCCESS; + + AddrFile = Request->Handle.AddressHandle; + + TI_DbgPrint(MID_TRACE, ("Called.\n")); + DeleteAddress(AddrFile); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); @@ -493,8 +494,37 @@ Connection = Request->Handle.ConnectionContext; TcpipRecursiveMutexEnter( &TCPLock, TRUE ); - DeleteConnectionEndpoint(Connection); + TCPClose( Connection ); TcpipRecursiveMutexLeave( &TCPLock ); + + TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); + + return STATUS_SUCCESS; +} + + +/* + * FUNCTION: Frees an connection file object + * ARGUMENTS: + * Request = Pointer to TDI request structure for this request + * RETURNS: + * Status of operation + */ +NTSTATUS FileFreeConnection( + PTDI_REQUEST Request) +{ + KIRQL OldIrql; + PCONNECTION_ENDPOINT Connection; + + TI_DbgPrint(MID_TRACE, ("Called.\n")); + + Connection = Request->Handle.ConnectionContext; + + TcpipAcquireSpinLock(&ConnectionEndpointListLock, &OldIrql); + RemoveEntryList(&Connection->ListEntry); + TcpipReleaseSpinLock(&ConnectionEndpointListLock, OldIrql); + + TCPFreeConnectionEndpoint(Connection); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); @@ -549,7 +579,7 @@ * RETURNS: * Status of operation */ -NTSTATUS FileCloseControlChannel( +NTSTATUS FileFreeControlChannel( PTDI_REQUEST Request) { PCONTROL_CHANNEL ControlChannel = Request->Handle.ControlChannel; Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Thu Feb 19 14:14:39 2009 @@ -253,7 +253,7 @@ } /* - * FUNCTION: Releases resources used by a file object + * FUNCTION: Prepares a file object for close * ARGUMENTS: * DeviceObject = Pointer to a device object for this driver * Irp = Pointer to a I/O request packet @@ -298,7 +298,76 @@ case TDI_CONTROL_CHANNEL_FILE: Request.Handle.ControlChannel = Context->Handle.ControlChannel; - Status = FileCloseControlChannel(&Request); + /* Nothing to do to close */ + Status = STATUS_SUCCESS; + break; + + default: + /* This should never happen */ + + TI_DbgPrint(MIN_TRACE, ("Unknown transport context.\n")); + + IoAcquireCancelSpinLock(&OldIrql); + Context->CancelIrps = FALSE; + IoReleaseCancelSpinLock(OldIrql); + + Status = STATUS_INVALID_PARAMETER; + + } + + Irp->IoStatus.Status = Status; + + return Irp->IoStatus.Status; +} + + +/* + * FUNCTION: Releases resources used by a file object + * ARGUMENTS: + * DeviceObject = Pointer to a device object for this driver + * Irp = Pointer to a I/O request packet + * RETURNS: + * Status of the operation + * NOTES: + * This function does not pend + */ +NTSTATUS TiCloseFileObject( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp; + PTRANSPORT_CONTEXT Context; + TDI_REQUEST Request; + NTSTATUS Status; + KIRQL OldIrql; + + IrpSp = IoGetCurrentIrpStackLocation(Irp); + Context = IrpSp->FileObject->FsContext; + if (!Context) { + TI_DbgPrint(MIN_TRACE, ("Parameters are invalid.\n")); + return STATUS_INVALID_PARAMETER; + } + + IoAcquireCancelSpinLock(&OldIrql); + + Context->CancelIrps = TRUE; + + IoReleaseCancelSpinLock(OldIrql); + + switch ((ULONG_PTR)IrpSp->FileObject->FsContext2) { + case TDI_TRANSPORT_ADDRESS_FILE: + Request.Handle.AddressHandle = Context->Handle.AddressHandle; + Status = FileFreeAddress(&Request); + break; + + case TDI_CONNECTION_FILE: + Request.Handle.ConnectionContext = Context->Handle.ConnectionContext; + Status = FileFreeConnection(&Request); + break; + + case TDI_CONTROL_CHANNEL_FILE: + Request.Handle.ControlChannel = Context->Handle.ControlChannel; + Status = FileFreeControlChannel(&Request); break; default: @@ -352,9 +421,7 @@ /* Close an address file, connection endpoint, or control connection */ case IRP_MJ_CLOSE: Context = (PTRANSPORT_CONTEXT)IrpSp->FileObject->FsContext; - if (Context) - exFreePool(Context); - Status = STATUS_SUCCESS; + Status = TiCloseFileObject(DeviceObject, Irp); break; /* Release resources bound to an address file, connection endpoint, Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Thu Feb 19 14:14:39 2009 @@ -42,7 +42,7 @@ Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Complete = Bucket->Request.RequestNotifyObject; TI_DbgPrint(DEBUG_TCP, - ("Completing Request %x\n", Bucket->Request)); + ("Completing Request %x\n", Bucket->Request.RequestContext)); if( (NewState & (SEL_CONNECT | SEL_FIN)) == (SEL_CONNECT | SEL_FIN) ) @@ -158,7 +158,7 @@ } if( NewState & SEL_WRITE ) { TI_DbgPrint(DEBUG_TCP,("Writeable: irp list %s\n", - IsListEmpty(&Connection->ReceiveRequest) ? + IsListEmpty(&Connection->SendRequest) ? "empty" : "nonempty")); while( !IsListEmpty( &Connection->SendRequest ) ) { @@ -282,7 +282,7 @@ } VOID TCPFreeConnectionEndpoint( PCONNECTION_ENDPOINT Connection ) { - TCPClose( Connection ); + TI_DbgPrint(DEBUG_TCP, ("Freeing TCP Endpoint\n")); exFreePool( Connection ); } @@ -542,25 +542,29 @@ IP_ADDRESS RemoteAddress; USHORT RemotePort; PTDI_BUCKET Bucket; + PNEIGHBOR_CACHE_ENTRY NCE; TI_DbgPrint(DEBUG_TCP,("TCPConnect: Called\n")); - - Bucket = exAllocatePool( NonPagedPool, sizeof(*Bucket) ); - if( !Bucket ) return STATUS_NO_MEMORY; - - TcpipRecursiveMutexEnter( &TCPLock, TRUE ); - - /* Freed in TCPSocketState */ - Bucket->Request.RequestNotifyObject = (PVOID)Complete; - Bucket->Request.RequestContext = Context; - - InsertHeadList( &Connection->ConnectRequest, &Bucket->Entry ); Status = AddrBuildAddress ((PTRANSPORT_ADDRESS)ConnInfo->RemoteAddress, &RemoteAddress, &RemotePort); + if (!(NCE = RouteGetRouteToDestination(&RemoteAddress))) + { + return STATUS_NETWORK_UNREACHABLE; + } + + TcpipRecursiveMutexEnter( &TCPLock, TRUE ); + + if (Connection->State & SEL_FIN) + { + TcpipRecursiveMutexLeave( &TCPLock ); + return STATUS_REMOTE_DISCONNECT; + } + + /* Freed in TCPSocketState */ TI_DbgPrint(DEBUG_TCP, ("Connecting to address %x:%x\n", RemoteAddress.Address.IPv4Address, @@ -574,6 +578,7 @@ AddressToConnect.sin_family = AF_INET; AddressToBind = AddressToConnect; + AddressToBind.sin_addr.s_addr = NCE->Interface->Unicast.Address.IPv4Address; Status = TCPTranslateError ( OskitTCPBind( Connection->SocketContext, @@ -592,6 +597,17 @@ Connection, &AddressToConnect, sizeof(AddressToConnect) ) ); + + if (Status == STATUS_PENDING) + { + Bucket = exAllocatePool( NonPagedPool, sizeof(*Bucket) ); + if( !Bucket ) return STATUS_NO_MEMORY; + + Bucket->Request.RequestNotifyObject = (PVOID)Complete; + Bucket->Request.RequestContext = Context; + + InsertHeadList( &Connection->ConnectRequest, &Bucket->Entry ); + } } TcpipRecursiveMutexLeave( &TCPLock ); @@ -678,6 +694,14 @@ TcpipRecursiveMutexEnter( &TCPLock, TRUE ); + /* Closing */ + if (Connection->State & SEL_FIN) + { + TcpipRecursiveMutexLeave( &TCPLock ); + *BytesReceived = 0; + return STATUS_REMOTE_DISCONNECT; + } + NdisQueryBuffer( Buffer, &DataBuffer, &DataLen ); TI_DbgPrint(DEBUG_TCP,("TCP>|< Got an MDL %x (%x:%d)\n", Buffer, DataBuffer, DataLen)); @@ -706,7 +730,7 @@ Bucket->Request.RequestContext = Context; *BytesReceived = 0; - InsertHeadList( &Connection->ReceiveRequest, &Bucket->Entry ); + InsertTailList( &Connection->ReceiveRequest, &Bucket->Entry ); Status = STATUS_PENDING; TI_DbgPrint(DEBUG_TCP,("Queued read irp\n")); } else { @@ -744,6 +768,14 @@ TI_DbgPrint(DEBUG_TCP,("Connection->SocketContext = %x\n", Connection->SocketContext)); + /* Closing */ + if (Connection->State & SEL_FIN) + { + TcpipRecursiveMutexLeave( &TCPLock ); + *BytesSent = 0; + return STATUS_REMOTE_DISCONNECT; + } + Status = TCPTranslateError ( OskitTCPSend( Connection->SocketContext, (OSK_PCHAR)BufferData, SendLength, @@ -760,20 +792,20 @@ TcpipRecursiveMutexLeave( &TCPLock ); return STATUS_NO_MEMORY; } - + Bucket->Request.RequestNotifyObject = Complete; Bucket->Request.RequestContext = Context; *BytesSent = 0; - - InsertHeadList( &Connection->SendRequest, &Bucket->Entry ); + + InsertTailList( &Connection->SendRequest, &Bucket->Entry ); TI_DbgPrint(DEBUG_TCP,("Queued write irp\n")); } else { TI_DbgPrint(DEBUG_TCP,("Got status %x, bytes %d\n", Status, Sent)); *BytesSent = Sent; } - + TcpipRecursiveMutexLeave( &TCPLock ); - + TI_DbgPrint(DEBUG_TCP,("Status %x\n", Status)); return Status; @@ -798,9 +830,10 @@ DeallocatePort( &TCPPorts, Port ); } -NTSTATUS TCPGetPeerAddress +NTSTATUS TCPGetSockAddress ( PCONNECTION_ENDPOINT Connection, - PTRANSPORT_ADDRESS Address ) { + PTRANSPORT_ADDRESS Address, + BOOLEAN GetRemote ) { OSK_UINT LocalAddress, RemoteAddress; OSK_UI16 LocalPort, RemotePort; PTA_IP_ADDRESS AddressIP = (PTA_IP_ADDRESS)Address; @@ -815,8 +848,9 @@ AddressIP->TAAddressCount = 1; AddressIP->Address[0].AddressLength = TDI_ADDRESS_LENGTH_IP; AddressIP->Address[0].AddressType = TDI_ADDRESS_TYPE_IP; - AddressIP->Address[0].Address[0].sin_port = RemotePort; - AddressIP->Address[0].Address[0].in_addr = RemoteAddress; + AddressIP->Address[0].Address[0].sin_port = GetRemote ? RemotePort : LocalPort; + AddressIP->Address[0].Address[0].in_addr = GetRemote ? RemoteAddress : LocalAddress; + AddressIP->Address[1].AddressLength = TDI_ADDRESS_LENGTH_IP; TcpipRecursiveMutexLeave( &TCPLock ); @@ -837,13 +871,15 @@ TcpipAcquireSpinLock( &Endpoint->Lock, &OldIrql ); - for( i = 0; i < 4; i++ ) { + for( i = 0; i < 4; i++ ) + { for( Entry = ListHead[i]->Flink; Entry != ListHead[i]; - Entry = Entry->Flink ) { + Entry = Entry->Flink ) + { Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - - if( Bucket->Request.RequestContext == Irp ) { + if( Bucket->Request.RequestContext == Irp ) + { RemoveEntryList( &Bucket->Entry ); exFreePool( Bucket ); break; Modified: trunk/reactos/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/u… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] Thu Feb 19 14:14:39 2009 @@ -185,7 +185,7 @@ } if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) { - return STATUS_UNSUCCESSFUL; + return STATUS_NETWORK_UNREACHABLE; } LocalAddress = AddrFile->Address;

16 years, 4 months

[arty] 39686: Reformat. No changes (yet). Preemptive strike.

by arty＠svn.reactos.org

Author: arty Date: Thu Feb 19 13:41:06 2009 New Revision: 39686 URL: http://svn.reactos.org/svn/reactos?rev=39686&view=rev Log: Reformat. No changes (yet). Preemptive strike. Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Thu Feb 19 13:41:06 2009 @@ -22,7 +22,7 @@ PORT_SET TCPPorts; static VOID HandleSignalledConnection( PCONNECTION_ENDPOINT Connection, - ULONG NewState ) { + ULONG NewState ) { NTSTATUS Status = STATUS_SUCCESS; PTCP_COMPLETION_ROUTINE Complete; PTDI_BUCKET Bucket; @@ -35,7 +35,7 @@ /* Things that can happen when we try the initial connection */ if( NewState & SEL_CONNECT ) { - while( !IsListEmpty( &Connection->ConnectRequest ) ) { + while( !IsListEmpty( &Connection->ConnectRequest ) ) { Entry = RemoveHeadList( &Connection->ConnectRequest ); TI_DbgPrint(DEBUG_TCP, ("Connect Event\n")); @@ -58,162 +58,162 @@ } if( NewState & SEL_ACCEPT ) { - /* Handle readable on a listening socket -- - * TODO: Implement filtering - */ - - TI_DbgPrint(DEBUG_TCP,("Accepting new connection on %x (Queue: %s)\n", - Connection, - IsListEmpty(&Connection->ListenRequest) ? - "empty" : "nonempty")); - - while( !IsListEmpty( &Connection->ListenRequest ) ) { - PIO_STACK_LOCATION IrpSp; - - Entry = RemoveHeadList( &Connection->ListenRequest ); - Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - Complete = Bucket->Request.RequestNotifyObject; - - Irp = Bucket->Request.RequestContext; - IrpSp = IoGetCurrentIrpStackLocation( Irp ); - - TI_DbgPrint(DEBUG_TCP,("Getting the socket\n")); - Status = TCPServiceListeningSocket - ( Connection->AddressFile->Listener, - Bucket->AssociatedEndpoint, - (PTDI_REQUEST_KERNEL)&IrpSp->Parameters ); - - TI_DbgPrint(DEBUG_TCP,("Socket: Status: %x\n")); - - if( Status == STATUS_PENDING ) { - InsertHeadList( &Connection->ListenRequest, &Bucket->Entry ); - break; - } else { - Complete( Bucket->Request.RequestContext, Status, 0 ); - exFreePool( Bucket ); - } - } + /* Handle readable on a listening socket -- + * TODO: Implement filtering + */ + + TI_DbgPrint(DEBUG_TCP,("Accepting new connection on %x (Queue: %s)\n", + Connection, + IsListEmpty(&Connection->ListenRequest) ? + "empty" : "nonempty")); + + while( !IsListEmpty( &Connection->ListenRequest ) ) { + PIO_STACK_LOCATION IrpSp; + + Entry = RemoveHeadList( &Connection->ListenRequest ); + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + Complete = Bucket->Request.RequestNotifyObject; + + Irp = Bucket->Request.RequestContext; + IrpSp = IoGetCurrentIrpStackLocation( Irp ); + + TI_DbgPrint(DEBUG_TCP,("Getting the socket\n")); + Status = TCPServiceListeningSocket + ( Connection->AddressFile->Listener, + Bucket->AssociatedEndpoint, + (PTDI_REQUEST_KERNEL)&IrpSp->Parameters ); + + TI_DbgPrint(DEBUG_TCP,("Socket: Status: %x\n")); + + if( Status == STATUS_PENDING ) { + InsertHeadList( &Connection->ListenRequest, &Bucket->Entry ); + break; + } else { + Complete( Bucket->Request.RequestContext, Status, 0 ); + exFreePool( Bucket ); + } + } } /* Things that happen after we're connected */ if( NewState & SEL_READ ) { - TI_DbgPrint(DEBUG_TCP,("Readable: irp list %s\n", - IsListEmpty(&Connection->ReceiveRequest) ? - "empty" : "nonempty")); - - while( !IsListEmpty( &Connection->ReceiveRequest ) ) { - OSK_UINT RecvLen = 0, Received = 0; - OSK_PCHAR RecvBuffer = 0; - - Entry = RemoveHeadList( &Connection->ReceiveRequest ); - Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - Complete = Bucket->Request.RequestNotifyObject; - - Irp = Bucket->Request.RequestContext; - Mdl = Irp->MdlAddress; - - TI_DbgPrint(DEBUG_TCP, - ("Getting the user buffer from %x\n", Mdl)); - - NdisQueryBuffer( Mdl, &RecvBuffer, &RecvLen ); - - TI_DbgPrint(DEBUG_TCP, - ("Reading %d bytes to %x\n", RecvLen, RecvBuffer)); - - TI_DbgPrint(DEBUG_TCP, ("Connection: %x\n", Connection)); - TI_DbgPrint - (DEBUG_TCP, - ("Connection->SocketContext: %x\n", - Connection->SocketContext)); - TI_DbgPrint(DEBUG_TCP, ("RecvBuffer: %x\n", RecvBuffer)); - - Status = TCPTranslateError - ( OskitTCPRecv( Connection->SocketContext, - RecvBuffer, - RecvLen, - &Received, - 0 ) ); - - TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Received)); - - if( Status == STATUS_SUCCESS ) { - TI_DbgPrint(DEBUG_TCP,("Received %d bytes with status %x\n", - Received, Status)); - - Complete( Bucket->Request.RequestContext, - STATUS_SUCCESS, Received ); - exFreePool( Bucket ); - } else if( Status == STATUS_PENDING ) { - InsertHeadList - ( &Connection->ReceiveRequest, &Bucket->Entry ); - break; - } else { - TI_DbgPrint(DEBUG_TCP, - ("Completing Receive request: %x %x\n", - Bucket->Request, Status)); - Complete( Bucket->Request.RequestContext, Status, 0 ); - exFreePool( Bucket ); - } - } + TI_DbgPrint(DEBUG_TCP,("Readable: irp list %s\n", + IsListEmpty(&Connection->ReceiveRequest) ? + "empty" : "nonempty")); + + while( !IsListEmpty( &Connection->ReceiveRequest ) ) { + OSK_UINT RecvLen = 0, Received = 0; + OSK_PCHAR RecvBuffer = 0; + + Entry = RemoveHeadList( &Connection->ReceiveRequest ); + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + Complete = Bucket->Request.RequestNotifyObject; + + Irp = Bucket->Request.RequestContext; + Mdl = Irp->MdlAddress; + + TI_DbgPrint(DEBUG_TCP, + ("Getting the user buffer from %x\n", Mdl)); + + NdisQueryBuffer( Mdl, &RecvBuffer, &RecvLen ); + + TI_DbgPrint(DEBUG_TCP, + ("Reading %d bytes to %x\n", RecvLen, RecvBuffer)); + + TI_DbgPrint(DEBUG_TCP, ("Connection: %x\n", Connection)); + TI_DbgPrint + (DEBUG_TCP, + ("Connection->SocketContext: %x\n", + Connection->SocketContext)); + TI_DbgPrint(DEBUG_TCP, ("RecvBuffer: %x\n", RecvBuffer)); + + Status = TCPTranslateError + ( OskitTCPRecv( Connection->SocketContext, + RecvBuffer, + RecvLen, + &Received, + 0 ) ); + + TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Received)); + + if( Status == STATUS_SUCCESS ) { + TI_DbgPrint(DEBUG_TCP,("Received %d bytes with status %x\n", + Received, Status)); + + Complete( Bucket->Request.RequestContext, + STATUS_SUCCESS, Received ); + exFreePool( Bucket ); + } else if( Status == STATUS_PENDING ) { + InsertHeadList + ( &Connection->ReceiveRequest, &Bucket->Entry ); + break; + } else { + TI_DbgPrint(DEBUG_TCP, + ("Completing Receive request: %x %x\n", + Bucket->Request, Status)); + Complete( Bucket->Request.RequestContext, Status, 0 ); + exFreePool( Bucket ); + } + } } if( NewState & SEL_WRITE ) { - TI_DbgPrint(DEBUG_TCP,("Writeable: irp list %s\n", - IsListEmpty(&Connection->ReceiveRequest) ? - "empty" : "nonempty")); - - while( !IsListEmpty( &Connection->SendRequest ) ) { - OSK_UINT SendLen = 0, Sent = 0; - OSK_PCHAR SendBuffer = 0; - - Entry = RemoveHeadList( &Connection->SendRequest ); - Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - Complete = Bucket->Request.RequestNotifyObject; - - Irp = Bucket->Request.RequestContext; - Mdl = Irp->MdlAddress; - - TI_DbgPrint(DEBUG_TCP, - ("Getting the user buffer from %x\n", Mdl)); - - NdisQueryBuffer( Mdl, &SendBuffer, &SendLen ); - - TI_DbgPrint(DEBUG_TCP, - ("Writing %d bytes to %x\n", SendLen, SendBuffer)); - - TI_DbgPrint(DEBUG_TCP, ("Connection: %x\n", Connection)); - TI_DbgPrint - (DEBUG_TCP, - ("Connection->SocketContext: %x\n", - Connection->SocketContext)); - - Status = TCPTranslateError - ( OskitTCPSend( Connection->SocketContext, - SendBuffer, - SendLen, - &Sent, - 0 ) ); - - TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Sent)); - - if( Status == STATUS_SUCCESS ) { - TI_DbgPrint(DEBUG_TCP,("Sent %d bytes with status %x\n", - Sent, Status)); - - Complete( Bucket->Request.RequestContext, - STATUS_SUCCESS, Sent ); - exFreePool( Bucket ); - } else if( Status == STATUS_PENDING ) { - InsertHeadList - ( &Connection->SendRequest, &Bucket->Entry ); - break; - } else { - TI_DbgPrint(DEBUG_TCP, - ("Completing Send request: %x %x\n", - Bucket->Request, Status)); - Complete( Bucket->Request.RequestContext, Status, 0 ); - exFreePool( Bucket ); - } - } + TI_DbgPrint(DEBUG_TCP,("Writeable: irp list %s\n", + IsListEmpty(&Connection->ReceiveRequest) ? + "empty" : "nonempty")); + + while( !IsListEmpty( &Connection->SendRequest ) ) { + OSK_UINT SendLen = 0, Sent = 0; + OSK_PCHAR SendBuffer = 0; + + Entry = RemoveHeadList( &Connection->SendRequest ); + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + Complete = Bucket->Request.RequestNotifyObject; + + Irp = Bucket->Request.RequestContext; + Mdl = Irp->MdlAddress; + + TI_DbgPrint(DEBUG_TCP, + ("Getting the user buffer from %x\n", Mdl)); + + NdisQueryBuffer( Mdl, &SendBuffer, &SendLen ); + + TI_DbgPrint(DEBUG_TCP, + ("Writing %d bytes to %x\n", SendLen, SendBuffer)); + + TI_DbgPrint(DEBUG_TCP, ("Connection: %x\n", Connection)); + TI_DbgPrint + (DEBUG_TCP, + ("Connection->SocketContext: %x\n", + Connection->SocketContext)); + + Status = TCPTranslateError + ( OskitTCPSend( Connection->SocketContext, + SendBuffer, + SendLen, + &Sent, + 0 ) ); + + TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Sent)); + + if( Status == STATUS_SUCCESS ) { + TI_DbgPrint(DEBUG_TCP,("Sent %d bytes with status %x\n", + Sent, Status)); + + Complete( Bucket->Request.RequestContext, + STATUS_SUCCESS, Sent ); + exFreePool( Bucket ); + } else if( Status == STATUS_PENDING ) { + InsertHeadList + ( &Connection->SendRequest, &Bucket->Entry ); + break; + } else { + TI_DbgPrint(DEBUG_TCP, + ("Completing Send request: %x %x\n", + Bucket->Request, Status)); + Complete( Bucket->Request.RequestContext, Status, 0 ); + exFreePool( Bucket ); + } + } } if( NewState & SEL_FIN ) { @@ -221,7 +221,7 @@ NTSTATUS IrpStatus[4]; UINT i; - TI_DbgPrint(DEBUG_TCP, ("EOF From socket\n")); + TI_DbgPrint(DEBUG_TCP, ("EOF From socket\n")); ListsToErase[0] = &Connection->ReceiveRequest; IrpStatus [0] = STATUS_SUCCESS; @@ -230,7 +230,7 @@ ListsToErase[2] = &Connection->ConnectRequest; IrpStatus [2] = STATUS_UNSUCCESSFUL; ListsToErase[3] = 0; - IrpStatus [3] = 0; + IrpStatus [3] = 0; for( i = 0; ListsToErase[i]; i++ ) { while( !IsListEmpty( ListsToErase[i] ) ) { @@ -238,7 +238,7 @@ Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Complete = Bucket->Request.RequestNotifyObject; Complete( Bucket->Request.RequestContext, IrpStatus[i], 0 ); - exFreePool( Bucket ); + exFreePool( Bucket ); } } } @@ -251,18 +251,18 @@ PLIST_ENTRY ListEntry; while( !IsListEmpty( &SignalledConnections ) ) { - ListEntry = RemoveHeadList( &SignalledConnections ); - Connection = CONTAINING_RECORD( ListEntry, CONNECTION_ENDPOINT, - SignalList ); - HandleSignalledConnection( Connection, Connection->SignalState ); + ListEntry = RemoveHeadList( &SignalledConnections ); + Connection = CONTAINING_RECORD( ListEntry, CONNECTION_ENDPOINT, + SignalList ); + HandleSignalledConnection( Connection, Connection->SignalState ); } } PCONNECTION_ENDPOINT TCPAllocateConnectionEndpoint( PVOID ClientContext ) { PCONNECTION_ENDPOINT Connection = - exAllocatePool(NonPagedPool, sizeof(CONNECTION_ENDPOINT)); + exAllocatePool(NonPagedPool, sizeof(CONNECTION_ENDPOINT)); if (!Connection) - return Connection; + return Connection; TI_DbgPrint(DEBUG_CPOINT, ("Connection point file object allocated at (0x%X).\n", Connection)); @@ -287,24 +287,24 @@ } NTSTATUS TCPSocket( PCONNECTION_ENDPOINT Connection, - UINT Family, UINT Type, UINT Proto ) { + UINT Family, UINT Type, UINT Proto ) { NTSTATUS Status; TI_DbgPrint(DEBUG_TCP,("Called: Connection %x, Family %d, Type %d, " - "Proto %d\n", - Connection, Family, Type, Proto)); + "Proto %d\n", + Connection, Family, Type, Proto)); TcpipRecursiveMutexEnter( &TCPLock, TRUE ); Status = TCPTranslateError( OskitTCPSocket( Connection, - &Connection->SocketContext, - Family, - Type, - Proto ) ); + &Connection->SocketContext, + Family, + Type, + Proto ) ); ASSERT_KM_POINTER(Connection->SocketContext); TI_DbgPrint(DEBUG_TCP,("Connection->SocketContext %x\n", - Connection->SocketContext)); + Connection->SocketContext)); TcpipRecursiveMutexLeave( &TCPLock ); @@ -321,14 +321,14 @@ */ { TI_DbgPrint(DEBUG_TCP,("Sending packet %d (%d) to oskit\n", - IPPacket->TotalSize, - IPPacket->HeaderSize)); + IPPacket->TotalSize, + IPPacket->HeaderSize)); TcpipRecursiveMutexEnter( &TCPLock, TRUE ); OskitTCPReceiveDatagram( IPPacket->Header, - IPPacket->TotalSize, - IPPacket->HeaderSize ); + IPPacket->TotalSize, + IPPacket->HeaderSize ); DrainSignals(); @@ -337,28 +337,28 @@ /* event.c */ int TCPSocketState( void *ClientData, - void *WhichSocket, - void *WhichConnection, - OSK_UINT NewState ); + void *WhichSocket, + void *WhichConnection, + OSK_UINT NewState ); int TCPPacketSend( void *ClientData, - OSK_PCHAR Data, - OSK_UINT Len ); + OSK_PCHAR Data, + OSK_UINT Len ); POSK_IFADDR TCPFindInterface( void *ClientData, - OSK_UINT AddrType, - OSK_UINT FindType, - OSK_SOCKADDR *ReqAddr ); + OSK_UINT AddrType, + OSK_UINT FindType, + OSK_SOCKADDR *ReqAddr ); NTSTATUS TCPMemStartup( void ); void *TCPMalloc( void *ClientData, - OSK_UINT bytes, OSK_PCHAR file, OSK_UINT line ); + OSK_UINT bytes, OSK_PCHAR file, OSK_UINT line ); void TCPFree( void *ClientData, - void *data, OSK_PCHAR file, OSK_UINT line ); + void *data, OSK_PCHAR file, OSK_UINT line ); void TCPMemShutdown( void ); int TCPSleep( void *ClientData, void *token, int priority, char *msg, - int tmio ); + int tmio ); void TCPWakeup( void *ClientData, void *token ); @@ -449,13 +449,13 @@ InitializeListHead( &SignalledConnections ); Status = TCPMemStartup(); if ( ! NT_SUCCESS(Status) ) { - return Status; + return Status; } Status = PortsStartup( &TCPPorts, 1, 0xfffe ); if( !NT_SUCCESS(Status) ) { - TCPMemShutdown(); - return Status; + TCPMemShutdown(); + return Status; } RegisterOskitTCPEventHandlers( &EventHandlers ); @@ -465,13 +465,13 @@ IPRegisterProtocol(IPPROTO_TCP, TCPReceive); ExInitializeNPagedLookasideList( - &TCPSegmentList, /* Lookaside list */ - NULL, /* Allocate routine */ - NULL, /* Free routine */ - 0, /* Flags */ - sizeof(TCP_SEGMENT), /* Size of each entry */ - TAG('T','C','P','S'), /* Tag */ - 0); /* Depth */ + &TCPSegmentList, /* Lookaside list */ + NULL, /* Allocate routine */ + NULL, /* Free routine */ + 0, /* Flags */ + sizeof(TCP_SEGMENT), /* Size of each entry */ + TAG('T','C','P','S'), /* Tag */ + 0); /* Depth */ StartTimer(); @@ -491,7 +491,7 @@ LARGE_INTEGER WaitForThread; if (!TCPInitialized) - return STATUS_SUCCESS; + return STATUS_SUCCESS; WaitForThread.QuadPart = -2500000; /* 250 ms */ KeSetEvent(&TimerLoopEvent, IO_NO_INCREMENT, FALSE); @@ -557,9 +557,9 @@ InsertHeadList( &Connection->ConnectRequest, &Bucket->Entry ); Status = AddrBuildAddress - ((PTRANSPORT_ADDRESS)ConnInfo->RemoteAddress, - &RemoteAddress, - &RemotePort); + ((PTRANSPORT_ADDRESS)ConnInfo->RemoteAddress, + &RemoteAddress, + &RemotePort); TI_DbgPrint(DEBUG_TCP, ("Connecting to address %x:%x\n", @@ -567,9 +567,9 @@ RemotePort)); if (!NT_SUCCESS(Status)) { - TI_DbgPrint(DEBUG_TCP, ("Could not AddrBuildAddress in TCPConnect\n")); - TcpipRecursiveMutexLeave( &TCPLock ); - return Status; + TI_DbgPrint(DEBUG_TCP, ("Could not AddrBuildAddress in TCPConnect\n")); + TcpipRecursiveMutexLeave( &TCPLock ); + return Status; } AddressToConnect.sin_family = AF_INET; @@ -577,21 +577,21 @@ Status = TCPTranslateError ( OskitTCPBind( Connection->SocketContext, - Connection, - &AddressToBind, - sizeof(AddressToBind) ) ); + Connection, + &AddressToBind, + sizeof(AddressToBind) ) ); if (NT_SUCCESS(Status)) { memcpy( &AddressToConnect.sin_addr, - &RemoteAddress.Address.IPv4Address, - sizeof(AddressToConnect.sin_addr) ); + &RemoteAddress.Address.IPv4Address, + sizeof(AddressToConnect.sin_addr) ); AddressToConnect.sin_port = RemotePort; Status = TCPTranslateError - ( OskitTCPConnect( Connection->SocketContext, - Connection, - &AddressToConnect, - sizeof(AddressToConnect) ) ); + ( OskitTCPConnect( Connection->SocketContext, + Connection, + &AddressToConnect, + sizeof(AddressToConnect) ) ); } TcpipRecursiveMutexLeave( &TCPLock ); @@ -615,20 +615,20 @@ switch( Flags & (TDI_DISCONNECT_ABORT | TDI_DISCONNECT_RELEASE) ) { case 0: case TDI_DISCONNECT_ABORT: - Flags = 0; - break; + Flags = 0; + break; case TDI_DISCONNECT_ABORT | TDI_DISCONNECT_RELEASE: - Flags = 2; - break; + Flags = 2; + break; case TDI_DISCONNECT_RELEASE: - Flags = 1; - break; + Flags = 1; + break; } Status = TCPTranslateError - ( OskitTCPShutdown( Connection->SocketContext, Flags ) ); + ( OskitTCPShutdown( Connection->SocketContext, Flags ) ); TcpipRecursiveMutexLeave( &TCPLock ); @@ -683,35 +683,35 @@ TI_DbgPrint(DEBUG_TCP,("TCP>|< Got an MDL %x (%x:%d)\n", Buffer, DataBuffer, DataLen)); Status = TCPTranslateError - ( OskitTCPRecv - ( Connection->SocketContext, - DataBuffer, - DataLen, - &Received, - ReceiveFlags ) ); + ( OskitTCPRecv + ( Connection->SocketContext, + DataBuffer, + DataLen, + &Received, + ReceiveFlags ) ); TI_DbgPrint(DEBUG_TCP,("OskitTCPReceive: %x, %d\n", Status, Received)); /* Keep this request around ... there was no data yet */ if( Status == STATUS_PENDING ) { - /* Freed in TCPSocketState */ - Bucket = exAllocatePool( NonPagedPool, sizeof(*Bucket) ); - if( !Bucket ) { - TI_DbgPrint(DEBUG_TCP,("Failed to allocate bucket\n")); - TcpipRecursiveMutexLeave( &TCPLock ); - return STATUS_NO_MEMORY; - } - - Bucket->Request.RequestNotifyObject = Complete; - Bucket->Request.RequestContext = Context; - *BytesReceived = 0; - - InsertHeadList( &Connection->ReceiveRequest, &Bucket->Entry ); - Status = STATUS_PENDING; - TI_DbgPrint(DEBUG_TCP,("Queued read irp\n")); + /* Freed in TCPSocketState */ + Bucket = exAllocatePool( NonPagedPool, sizeof(*Bucket) ); + if( !Bucket ) { + TI_DbgPrint(DEBUG_TCP,("Failed to allocate bucket\n")); + TcpipRecursiveMutexLeave( &TCPLock ); + return STATUS_NO_MEMORY; + } + + Bucket->Request.RequestNotifyObject = Complete; + Bucket->Request.RequestContext = Context; + *BytesReceived = 0; + + InsertHeadList( &Connection->ReceiveRequest, &Bucket->Entry ); + Status = STATUS_PENDING; + TI_DbgPrint(DEBUG_TCP,("Queued read irp\n")); } else { - TI_DbgPrint(DEBUG_TCP,("Got status %x, bytes %d\n", Status, Received)); - *BytesReceived = Received; + TI_DbgPrint(DEBUG_TCP,("Got status %x, bytes %d\n", Status, Received)); + *BytesReceived = Received; } TcpipRecursiveMutexLeave( &TCPLock ); @@ -742,34 +742,34 @@ TI_DbgPrint(DEBUG_TCP,("Connection = %x\n", Connection)); TI_DbgPrint(DEBUG_TCP,("Connection->SocketContext = %x\n", - Connection->SocketContext)); + Connection->SocketContext)); Status = TCPTranslateError - ( OskitTCPSend( Connection->SocketContext, - (OSK_PCHAR)BufferData, SendLength, - &Sent, 0 ) ); + ( OskitTCPSend( Connection->SocketContext, + (OSK_PCHAR)BufferData, SendLength, + &Sent, 0 ) ); TI_DbgPrint(DEBUG_TCP,("OskitTCPSend: %x, %d\n", Status, Sent)); /* Keep this request around ... there was no data yet */ if( Status == STATUS_PENDING ) { - /* Freed in TCPSocketState */ - Bucket = exAllocatePool( NonPagedPool, sizeof(*Bucket) ); - if( !Bucket ) { - TI_DbgPrint(DEBUG_TCP,("Failed to allocate bucket\n")); - TcpipRecursiveMutexLeave( &TCPLock ); - return STATUS_NO_MEMORY; - } - - Bucket->Request.RequestNotifyObject = Complete; - Bucket->Request.RequestContext = Context; - *BytesSent = 0; - - InsertHeadList( &Connection->SendRequest, &Bucket->Entry ); - TI_DbgPrint(DEBUG_TCP,("Queued write irp\n")); + /* Freed in TCPSocketState */ + Bucket = exAllocatePool( NonPagedPool, sizeof(*Bucket) ); + if( !Bucket ) { + TI_DbgPrint(DEBUG_TCP,("Failed to allocate bucket\n")); + TcpipRecursiveMutexLeave( &TCPLock ); + return STATUS_NO_MEMORY; + } + + Bucket->Request.RequestNotifyObject = Complete; + Bucket->Request.RequestContext = Context; + *BytesSent = 0; + + InsertHeadList( &Connection->SendRequest, &Bucket->Entry ); + TI_DbgPrint(DEBUG_TCP,("Queued write irp\n")); } else { - TI_DbgPrint(DEBUG_TCP,("Got status %x, bytes %d\n", Status, Sent)); - *BytesSent = Sent; + TI_DbgPrint(DEBUG_TCP,("Got status %x, bytes %d\n", Status, Sent)); + *BytesSent = Sent; } TcpipRecursiveMutexLeave( &TCPLock ); @@ -785,8 +785,8 @@ UINT TCPAllocatePort( UINT HintPort ) { if( HintPort ) { - if( AllocatePort( &TCPPorts, HintPort ) ) return HintPort; - else { + if( AllocatePort( &TCPPorts, HintPort ) ) return HintPort; + else { TI_DbgPrint (MID_TRACE,("We got a hint port but couldn't allocate it\n")); return (UINT)-1; @@ -838,17 +838,17 @@ TcpipAcquireSpinLock( &Endpoint->Lock, &OldIrql ); for( i = 0; i < 4; i++ ) { - for( Entry = ListHead[i]->Flink; - Entry != ListHead[i]; - Entry = Entry->Flink ) { - Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - - if( Bucket->Request.RequestContext == Irp ) { - RemoveEntryList( &Bucket->Entry ); - exFreePool( Bucket ); - break; - } - } + for( Entry = ListHead[i]->Flink; + Entry != ListHead[i]; + Entry = Entry->Flink ) { + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + + if( Bucket->Request.RequestContext == Irp ) { + RemoveEntryList( &Bucket->Entry ); + exFreePool( Bucket ); + break; + } + } } TcpipReleaseSpinLock( &Endpoint->Lock, OldIrql );

16 years, 4 months

[dgoette] 39685: * make it possible to run roscms in single language mode * rewrote general index.php to use current roscms libs

by dgoette＠svn.reactos.org

Author: dgoette Date: Thu Feb 19 10:10:56 2009 New Revision: 39685 URL: http://svn.reactos.org/svn/reactos?rev=39685&view=rev Log: * make it possible to run roscms in single language mode * rewrote general index.php to use current roscms libs Modified: branches/danny-web/reactos.org/htdocs/index.php branches/danny-web/reactos.org/htdocs/roscms/config.php branches/danny-web/reactos.org/htdocs/roscms/lib/RosCMS.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewUserDe… branches/danny-web/reactos.org/htdocs/roscms/lib/om/Language.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/om/ThisUser.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Maintain.cla… branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Website.clas… Modified: branches/danny-web/reactos.org/htdocs/index.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/in… ============================================================================== --- branches/danny-web/reactos.org/htdocs/index.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/index.php [iso-8859-1] Thu Feb 19 10:10:56 2009 @@ -1,138 +1,49 @@ <?php - // RosCMS Config File: - include("roscms/roscms_config.php"); - - // Browser Detection: - $userAgent = strtolower($_SERVER['HTTP_USER_AGENT']); - if ($is_opera = strchr($userAgent,"opera")) $is_opera = 1; - if ($is_saf = strchr($userAgent,"applewebkit") || $is_saf = strchr($userAgent,"apple computer, inc.")) $is_saf = 1; - if ($is_webtv = strchr($userAgent,"webtv")) $is_webtv = 1; - if ($is_ie = strchr($userAgent,"msie") && (!$is_opera) && (!$is_webtv)) $is_ie = 1; - if (($is_ie) && $is_ie4 = strchr($userAgent,"msie 4.")) $is_ie4 = 1; - if ($is_moz = strchr($userAgent,"gecko") && (!$is_saf)) $is_moz = 1; - if (($is_moz) && $is_mozff = strchr($userAgent,"firefox")) $is_mozff = 1; - if ($is_kon = strchr($userAgent,"konqueror")) $is_kon = 1; - if ($is_ns = strchr($userAgent,"compatible") && $is_ns = strchr($userAgent,"mozilla") && (!$is_ie) && (!$is_opera) && (!$is_webtv) && (!$is_saf)) $is_ns = 1; - - session_start(); - - $roscms_page_format = ".html"; - - // Language detection - require_once("roscms/inc/language_detection.php"); - - if (array_key_exists("page", $_GET)) $rpm_page=htmlspecialchars($_GET["page"]); - $rpm_lang = check_lang($_REQUEST['lang']); - if (array_key_exists("forma", $_GET)) $rpm_forma=htmlspecialchars($_GET["forma"]); - if (array_key_exists("format", $_GET)) $rpm_forma=htmlspecialchars($_GET["format"]); - if (array_key_exists("skin", $_GET)) $rpm_skin=htmlspecialchars($_GET["skin"]); - - - if ($rpm_lang == '' && isset($_COOKIE['roscms_usrset_lang'])) { - $rpm_lang = $_COOKIE['roscms_usrset_lang']; - if (substr($rpm_lang, -1) == '/') { - $rpm_lang = substr($rpm_lang, strlen($rpm_lang) - 1); - } - $rpm_lang = check_lang($rpm_lang); - } - - if ($rpm_lang == '') { - /* After parameter and cookie processing, we still don't have a valid - language. So check whether the HTTP Accept-language header can - help us. */ - $accept_language = $_SERVER['HTTP_ACCEPT_LANGUAGE']; - $best_q = 0; - while (preg_match('/^\s*([^,]+)((,(.*))|$)/', - $accept_language, $matches)) { - $lang_range = $matches[1]; - $accept_language = $matches[4]; - if (preg_match('/^(([a-zA-Z]+)(-[a-zA-Z]+)?)(;q=([0-1](\.[0-9]{1,3})?))?/', - $lang_range, $matches)) { - $lang = check_lang($matches[1]); - if ($lang != '') { - $q = $matches[5]; - if ($q == "") { - $q = 1; - } - else { - settype($q, 'float'); - } - if ($best_q < $q) { - $rpm_lang = $lang; - $best_q = $q; - } - } - } - } - } - if ($rpm_lang == '') { - /* If all else fails, use the default language */ - $rpm_lang = check_lang('*'); - } - - $roscms_page_lang = $rpm_lang . '/'; - +// RosCMS Config File: +define('ROSCMS_PATH','roscms/'); +require_once(ROSCMS_PATH.'/config.php'); +require_once(ROSCMS_PATH.'/lib/RosCMS_Autoloader.class.php'); - $rpm_pic = ""; - if (array_key_exists("pic", $_GET)) $rpm_pic=htmlspecialchars($_GET["pic"]); +// Language detection +$page_lang = null; +if (RosCMS::getInstance()->multiLanguage()) { - - switch ($rpm_page) { - case "home": - case "index": - default: // Frontpage - if ($rpm_pic == "/reactos.gif") { - require("stats/stats.php"); // stats - exit; - } - else { - $roscms_page_content = "index"; - } - break; - case "cms": // CMS Interface - case "roscms": - $roscms_page_content = "roscms/?page=home"; - $roscms_page_format = ""; - $roscms_page_lang = ""; - break; - case "admin": - $roscms_page_content = "roscms/?page=admin"; - $roscms_page_format = ""; - $roscms_page_lang = ""; - break; - case "support": - $roscms_page_content = "support/"; - $roscms_page_format = ""; - $roscms_page_lang = ""; - break; - case "development": - $roscms_page_content = "development"; - break; - case "community": - $roscms_page_content = "community"; - break; - case "info": - $roscms_page_content = "info"; - break; - case "download": - $roscms_page_content = "download"; - break; - } - - if ($rpm_page && $roscms_page_content == "index") { - $roscms_page_content = $rpm_page; - } - - - if (isset($_COOKIE['roscms_usrset_lang']) || isset($_REQUEST['lang'])) { - /* Delete an existing cookie (if any) which uses the full hostname */ - setcookie('roscms_usrset_lang', '', -3600); - /* Add cookie using just the domain name */ - require_once('roscms/inc/utils.php'); - setcookie('roscms_usrset_lang', $rpm_lang, time() + 5 * 30 * 24 * 3600, - '/', cookie_domain()); - } - - header("Location: " . $roscms_page_lang . $roscms_page_content . $roscms_page_format); + // check for aquired language + if (isset($_REQUEST['lang'])) { + $page_lang = Language::validate($_REQUEST['lang']); + } + + // check for saved language + elseif (isset($_COOKIE[RosCMS::getInstance()->cookieLanguage()])) { + $page_lang = Language::validate($_COOKIE[RosCMS::getInstance()->cookieLanguage()]); + } + + // check for client language + elseif (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { + $page_lang = Language::validate($_SERVER['HTTP_ACCEPT_LANGUAGE']); + } + + // set cookie to remember selected language + if ($page_lang !== null) { + Cookie::write(RosCMS::getInstance()->cookieLanguage(), $page_lang, time() + 5 * 30 * 24 * 3600); + } +} + +// no language found, try to get standard language +if ($page_lang === null) { + $page_lang = Language::validate('invalid language code'); +} + +// { (replace later with check, if that page exists, and what type of extension it has set) + // standard extension + $page_extension = 'html'; + + // standard extension + $page_name = ((isset($_GET['page']) && preg_match('/^[a-z_\-0-9]+$/i',$_GET['page'])) ? $_GET['page'] : 'index'); +// } + +// redirect to selected page +header('Location: '.ROSCMS_PATH.RosCMS::getInstance()->pathGenerated().$page_lang.'/'.$page_name.'.'.$page_extension); +exit(); ?> Modified: branches/danny-web/reactos.org/htdocs/roscms/config.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/config.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/config.php [iso-8859-1] Thu Feb 19 10:10:56 2009 @@ -1,7 +1,7 @@ <?php /* RosCMS - ReactOS Content Management System - Copyright (C) 2008 Danny Götte <dangerground(a)web.de> + Copyright (C) 2008,2009 Danny Götte <dangerground(a)web.de> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -43,6 +43,8 @@ $config->setSiteLanguage('en'); // standard language $config->setSiteTimezone(-2); // time difference to utc time from server time +$config->setMultiLanguage(true); // is site multilingual + $config->setPathRoscms('/reactos/roscms/'); // path to roscms files $config->setPathInstance('/reactos/roscms/'); // path to roscms files $config->setPathGenerationCache('../roscms_cache/'); // path to generated files (relative to roscms folder) @@ -76,5 +78,4 @@ // do not change, it's needed to apply those config settings $config->apply(); - ?> Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/RosCMS.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/RosCMS.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/RosCMS.class.php [iso-8859-1] Thu Feb 19 10:10:56 2009 @@ -35,10 +35,13 @@ private $cookie_password = null; // user_password (used for keep login function) private $cookie_login_name = null; // where username is stored for 'save username' in login options private $cookie_security = null; // stores security settings + private $cookie_language = null; // stores default language private $site_name = null; // sites name private $site_language = null; // standard language private $site_timezone = null; // time difference to utc time from server time + + private $multi_language = null; // is site multilingual private $path_generated = null; // path to generated files private $path_generation_cache = null; // path to cache files while generation process @@ -117,6 +120,7 @@ public function cookiePassword() { if ($this->applied) return $this->cookie_password; } public function cookieLoginName() { if ($this->applied) return $this->cookie_login_name; } public function cookieSecure() { if ($this->applied) return $this->cookie_security; } + public function cookieLanguage() { if ($this->applied) return $this->cookie_language; } public function limitUserNameMin() { return $this->limit_username_min; } public function limitUserNameMax() { return $this->limit_username_max; } @@ -130,6 +134,8 @@ public function siteLanguage() { if ($this->applied) return $this->site_language; } public function siteTimezone(){ if ($this->applied) return $this->site_timezone; } + public function multiLanguage(){ if ($this->applied) return $this->multi_language; } + public function pathGenerated() { if ($this->applied) return $this->path_generated; } public function pathGenerationCache() { if ($this->applied) return $this->path_generation_cache; } public function pathRosCMS() { if ($this->applied) return $this->path_roscms; } @@ -173,6 +179,11 @@ else die('bad security login cookie name'); } + public function setCookieLanguage( $new_value ) { + if (preg_match('/[A-Za-z0-9_]+/', $new_value)) $this->config['cookie_language'] = $new_value; + else die('bad language login cookie name'); + } + public function setSiteName( $new_value ) { $this->config['site_name'] = $new_value; } @@ -201,6 +212,10 @@ $this->config['path_instance'] = $new_value; } + public function setMultiLanguage( $new_value ) { + $this->config['multi_language'] = $new_value; + } + } // end of RosCMS Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewUserDe… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewUserDe… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewUserDe… [iso-8859-1] Thu Feb 19 10:10:56 2009 @@ -125,21 +125,33 @@ // add membership button echo_strip('</select> - <button name="addmemb" id="addmemb" onclick="'."addMembership(".$_GET['user'].", document.getElementById('cbmmemb').value)".'">Add Membership</button> - <br /> - <br /> - <select id="cbmusrlang" name="cbmusrlang">'); + <button name="addmemb" id="addmemb" onclick="'."addMembership(".$_GET['user'].", document.getElementById('cbmmemb').value)".'">Add Membership</button>'); + + if (RosCMS::getInstance()->multiLanguage()) { + echo_strip(' + <br /> + <br /> + <select id="cbmusrlang" name="cbmusrlang">'); - // show available languages, the user can changed to - $stmt=&DBConnection::getInstance()->prepare("SELECT id, name FROM ".ROSCMST_LANGUAGES." ORDER BY name ASC"); - $stmt->execute(); - while ($lang = $stmt->fetch(PDO::FETCH_ASSOC)) { - echo '<option value="'.$lang['id'].'"'.($lang['id'] == $user['lang_id'] ? ' selected="selected"' : '').'>'.$lang['name'].'</option>'; + // show available languages, the user can changed to + if ($thisuser->hasAccess('more_lang')) { + $stmt=&DBConnection::getInstance()->prepare("SELECT id, name FROM ".ROSCMST_LANGUAGES." ORDER BY name ASC"); + } + else { + $stmt=&DBConnection::getInstance()->prepare("SELECT id, name FROM ".ROSCMST_LANGUAGES." WHERE id IN(:standard_lang, :lang_id) ORDER BY name ASC"); + $stmt->bindParam('standard_lang',Language::getStandardId(),PDO::PARAM_INT); + $stmt->bindParam('lang_id',$thisuser->language(),PDO::PARAM_INT); + + } + $stmt->execute(); + while ($lang = $stmt->fetch(PDO::FETCH_ASSOC)) { + echo '<option value="'.$lang['id'].'"'.($lang['id'] == $user['lang_id'] ? ' selected="selected"' : '').'>'.$lang['name'].'</option>'; + } + + // change language button + echo_strip('</select> + <input type="button" name="addusrlang" id="addusrlang" value="Update User language" onclick="'."updateUserLang(".$_GET['user'].", document.getElementById('cbmusrlang').value)".'" /><br />'); } - - // change language button - echo_strip('</select> - <input type="button" name="addusrlang" id="addusrlang" value="Update User language" onclick="'."updateUserLang(".$_GET['user'].", document.getElementById('cbmusrlang').value)".'" /><br />'); } // show interface to add translators Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/om/Language.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/om/Language.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/om/Language.class.php [iso-8859-1] Thu Feb 19 10:10:56 2009 @@ -17,15 +17,17 @@ */ public static function validate( $lang_code ) { - // check for valid code - $stmt=&DBConnection::getInstance()->prepare("SELECT name_short FROM ".ROSCMST_LANGUAGES." WHERE name_short=:code"); - $stmt->bindParam('code',$lang_code,PDO::PARAM_STR); - $stmt->execute(); - $valid=$stmt->fetchColumn(); - - // if we have a result, thats a valid code - if ($valid !== false) { - return $valid; + if (RosCMS::getInstance()->multiLanguage()) { + // check for valid code + $stmt=&DBConnection::getInstance()->prepare("SELECT name_short FROM ".ROSCMST_LANGUAGES." WHERE name_short=:code"); + $stmt->bindParam('code',$lang_code,PDO::PARAM_STR); + $stmt->execute(); + $valid=$stmt->fetchColumn(); + + // if we have a result, thats a valid code + if ($valid !== false) { + return $valid; + } } return RosCMS::getInstance()->siteLanguage(); } // end of member function validate Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/om/ThisUser.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/om/ThisUser.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/om/ThisUser.class.php [iso-8859-1] Thu Feb 19 10:10:56 2009 @@ -46,7 +46,9 @@ */ public function addAccess( $access_area ) { - $this->access[$access_area] = true; + if ($access_area != 'more_lang' || RosCMS::getInstance()->multiLanguage()) { + $this->access[$access_area] = true; + } } // end of member function addAccess @@ -105,7 +107,10 @@ */ public function language( ) { - return (int)$this->user['language']; + if (RosCMS::getInstance()->multiLanguage()) { + return (int)$this->user['language']; + } + return Language::getStandardId(); } // end of member function language Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Maintain.cla… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Maintain.cla… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Maintain.cla… [iso-8859-1] Thu Feb 19 10:10:56 2009 @@ -111,7 +111,7 @@ <div id="lmGroups" class="lmItemTop" onclick="loadGroups()"'.(!$thisuser->hasAccess('admin') ? ' style="display: none;"' : '').'> <div class="lmItemBottom">Groups</div> </div> - <div id="lmLanguages" class="lmItemTop" onclick="loadLanguages()"'.(!$thisuser->hasAccess('admin') ? ' style="display: none;"' : '').'> + <div id="lmLanguages" class="lmItemTop" onclick="loadLanguages()"'.(!$thisuser->hasAccess('admin') || !RosCMS::getInstance()->multiLanguage() ? ' style="display: none;"' : '').'> <div class="lmItemBottom">Languages</div> </div> @@ -205,7 +205,14 @@ <select id="txtaddentrylang" name="txtaddentrylang">'); // display languages - $stmt=&DBConnection::getInstance()->prepare("SELECT id, name FROM ".ROSCMST_LANGUAGES." WHERE level > 0 ORDER BY name ASC"); + if ($thisuser->hasAccess('more_lang')) { + $stmt=&DBConnection::getInstance()->prepare("SELECT id, name FROM ".ROSCMST_LANGUAGES." ORDER BY name ASC"); + } + else { + $stmt=&DBConnection::getInstance()->prepare("SELECT id, name FROM ".ROSCMST_LANGUAGES." WHERE id IN(:standard_lang,:lang_id) ORDER BY name ASC"); + $stmt->bindParam('standard_lang',Language::getStandardId(),PDO::PARAM_INT); + $stmt->bindParam('lang_id',$thisuser->language(),PDO::PARAM_INT); + } $stmt->execute(); while ($language=$stmt->fetch(PDO::FETCH_ASSOC)) { echo '<option value="'.$language['id'].'"'.($language['id']==Language::getStandardId() ? ' selected="selected"' : '').'>'.$language['name'].'</option>'; Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Website.clas… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Website.clas… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Website.clas… [iso-8859-1] Thu Feb 19 10:10:56 2009 @@ -105,22 +105,11 @@ roscms_access['dont_hide_filter'] = ".($thisuser->hasAccess('dont_hide_filter') ? 'true' : 'false')."; roscms_access['make_stable'] = ".($thisuser->hasAccess('make_stable') ? 'true' : 'false')."; roscms_access['del_entry'] = ".($thisuser->hasAccess('del_entry') ? 'true' : 'false')."; + roscms_access['del_entry'] = ".($thisuser->hasAccess('del_entry') ? 'true' : 'false')."; // favorite user language - "; - - // set user language for js - $user_lang = $thisuser->language(); - if (!empty($user_lang)) { - echo "var userlang = '".$user_lang."';"; - } - else { - echo "var userlang = roscms_standard_language;"; - } - - echo " - - + var userlang = ".$thisuser->language()."; + var exitmsg = ".'"Click Cancel to continue with RosCMS, click OK to leave RosCMS.\n\nThanks for using RosCMS!"'." --> </script>";echo_strip(' @@ -158,7 +147,7 @@ <div id="smenutab2" class="lmItemTop" onclick="loadMenu(this.id)"> <div id="smenutabc2" class="lmItemBottom">Pending</div> </div> - <div id="smenutab7" class="lmItemTop" onclick="loadMenu(this.id)"> + <div id="smenutab7" class="lmItemTop" onclick="loadMenu(this.id)"'.($thisuser->language() == Language::getStandardId() ? ' style="display:none;"' : '').'> <div id="smenutabc7" class="lmItemBottom">Translate</div> </div> <div id="smenutab8" class="lmItemTopSelected" onclick="loadMenu(this.id)"> @@ -229,34 +218,40 @@    <span class="virtualButton" onclick="'."addUserFilter(filtstring2)".'"><img src="'.RosCMS::getInstance()->pathRosCMS().'images/save.gif" alt="" style="width:14px; height:14px;" /> Save</span> </div> </div> - </div> + </div>'); + + if (RosCMS::getInstance()->multiLanguage()) { + echo_strip(' <div style="position: absolute; top: 9px; right: 13px; text-align:right; white-space: nowrap;"> <label for="favlangopt" style="float:left;color: #666;">Working language:</label><br /> <select name="favlangopt" id="favlangopt" style="vertical-align: top; width: 22ex;" onchange="setLang(this.value)">'); - // preselect current user language - if ($thisuser->hasAccess('more_lang')) { - $stmt=&DBConnection::getInstance()->prepare("SELECT id, name FROM ".ROSCMST_LANGUAGES." WHERE level > 0 ORDER BY name ASC"); + // preselect current user language + if ($thisuser->hasAccess('more_lang') ) { + $stmt=&DBConnection::getInstance()->prepare("SELECT id, name FROM ".ROSCMST_LANGUAGES." WHERE level > 0 ORDER BY name ASC"); + } + else { + $stmt=&DBConnection::getInstance()->prepare("SELECT id, name FROM ".ROSCMST_LANGUAGES." WHERE id IN(:lang_id,:standard_lang)"); + $stmt->bindParam('lang_id',$thisuser->language(),PDO::PARAM_INT); + $stmt->bindParam('standard_lang',Language::getStandardId(),PDO::PARAM_INT); + } + $stmt->execute(); + while($language=$stmt->fetch()) { + echo '<option value="'.$language['id'].'"'; + + if ($language['id'] == $thisuser->language()) { + echo ' selected="selected"'; + } + + echo '>'.$language['name'].'</option>'; + } + + echo_strip(' + </select> + </div>'); } - else { - $stmt=&DBConnection::getInstance()->prepare("SELECT id, name FROM ".ROSCMST_LANGUAGES." WHERE id IN(:lang_id,:standard_lang)"); - $stmt->bindParam('lang_id',$thisuser->language(),PDO::PARAM_INT); - $stmt->bindParam('standard_lang',Language::getStandardId(),PDO::PARAM_INT); - } - $stmt->execute(); - while($language=$stmt->fetch()) { - echo '<option value="'.$language['id'].'"'; - - if ($language['id'] == $user_lang) { - echo ' selected="selected"'; - } - - echo '>'.$language['name'].'</option>'; - } echo_strip(' - </select> - </div> <div style="float: right; white-space: nowrap;padding-top: 1em;"> <span id="mtblnav"> </span> </div>

16 years, 4 months

[fireball] 39684: - Properly free a buffer allocated during "copy" command. Fixes cmd.exe crash when copy operation experiences a write error or is being interrupted with a Ctrl+C keypress.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Feb 19 06:51:57 2009 New Revision: 39684 URL: http://svn.reactos.org/svn/reactos?rev=39684&view=rev Log: - Properly free a buffer allocated during "copy" command. Fixes cmd.exe crash when copy operation experiences a write error or is being interrupted with a Ctrl+C keypress. Modified: trunk/reactos/base/shell/cmd/copy.c Modified: trunk/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/copy.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] Thu Feb 19 06:51:57 2009 @@ -232,7 +232,7 @@ { ConOutResPuts(STRING_COPY_ERROR3); - cmd_free (buffer); + VirtualFree (buffer, 0, MEM_RELEASE); CloseHandle (hFileDest); CloseHandle (hFileSrc); nErrorLevel = 1;

16 years, 4 months

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