Ros-diffs February 2009

ros-diffs@reactos.org

29 participants
559 discussions

[gschneider] 39510: - Remove coordinate checks from NtGdiStretchBlt, since they're done at a later stage differently now - Fixes a div/0 crash that happened in XnView and Acrobat Reader 9 Setup
by gschneider＠svn.reactos.org 09 Feb '09

09 Feb '09

Author: gschneider Date: Mon Feb 9 07:10:39 2009 New Revision: 39510 URL: http://svn.reactos.org/svn/reactos?rev=39510&view=rev Log: - Remove coordinate checks from NtGdiStretchBlt, since they're done at a later stage differently now - Fixes a div/0 crash that happened in XnView and Acrobat Reader 9 Setup Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Mon Feb 9 07:10:39 2009 @@ -857,56 +857,6 @@ goto failed; } - int sw = BitmapSrc->SurfObj.sizlBitmap.cx; - int sh = BitmapSrc->SurfObj.sizlBitmap.cy; - if ( SourceRect.left < 0 ) - { - DestRect.left = DestRect.right - (DestRect.right-DestRect.left) * (SourceRect.right)/abs(SourceRect.right-SourceRect.left); - SourceRect.left = 0; - } - if ( SourceRect.top < 0 ) - { - DestRect.top = DestRect.bottom - (DestRect.bottom-DestRect.top) * (SourceRect.bottom)/abs(SourceRect.bottom-SourceRect.top); - SourceRect.top = 0; - } - if ( SourceRect.right < -1 ) - { - DestRect.right = DestRect.left + (DestRect.right-DestRect.left) * (-1-SourceRect.left)/abs(SourceRect.right-SourceRect.left); - SourceRect.right = -1; - } - if ( SourceRect.bottom < -1 ) - { - DestRect.bottom = DestRect.top + (DestRect.bottom-DestRect.top) * (-1-SourceRect.top)/abs(SourceRect.bottom-SourceRect.top); - SourceRect.bottom = -1; - } - if ( SourceRect.right > sw ) - { - DestRect.right = DestRect.left + (DestRect.right-DestRect.left) * abs(sw-SourceRect.left) / abs(SourceRect.right-SourceRect.left); - SourceRect.right = sw; - } - if ( SourceRect.bottom > sh ) - { - DestRect.bottom = DestRect.top + (DestRect.bottom-DestRect.top) * abs(sh-SourceRect.top) / abs(SourceRect.bottom-SourceRect.top); - SourceRect.bottom = sh; - } - sw--; - sh--; - if ( SourceRect.left > sw ) - { - DestRect.left = DestRect.right - (DestRect.right-DestRect.left) * (SourceRect.right-sw) / abs(SourceRect.right-SourceRect.left); - SourceRect.left = 0; - } - if ( SourceRect.top > sh ) - { - DestRect.top = DestRect.bottom - (DestRect.bottom-DestRect.top) * (SourceRect.bottom-sh) / abs(SourceRect.bottom-SourceRect.top); - SourceRect.top = 0; - } - if (0 == (DestRect.right-DestRect.left) || 0 == (DestRect.bottom-DestRect.top) || 0 == (SourceRect.right-SourceRect.left) || 0 == (SourceRect.bottom-SourceRect.top)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - goto failed; - } - /* Create the XLATEOBJ. */ XlateObj = IntCreateXlateForBlt(DCDest, DCSrc, BitmapDest, BitmapSrc); if (XlateObj == (XLATEOBJ*)-1)

1 0

[gschneider] 39509: Fix comments
by gschneider＠svn.reactos.org 09 Feb '09

09 Feb '09

Author: gschneider Date: Mon Feb 9 05:57:37 2009 New Revision: 39509 URL: http://svn.reactos.org/svn/reactos?rev=39509&view=rev Log: Fix comments Modified: trunk/reactos/dll/cpl/desk/background.c Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] Mon Feb 9 05:57:37 2009 @@ -350,13 +350,13 @@ /* Save selected color to var */ pGlobalData->backgroundDesktopColor = cc.rgbResult; - /* Allpy buuton will be activated */ + /* Apply button will be activated */ PropSheet_Changed(GetParent(hwndDlg), hwndDlg); /* Window will be updated :) */ InvalidateRect(GetDlgItem(hwndDlg, IDC_BACKGROUND_PREVIEW), NULL, TRUE); - /* Save custom colors to reg. To this moment key must be ceated already. See above */ + /* Save custom colors to reg. To this moment key must be created already. See above */ res = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Appearance"), 0, KEY_WRITE, &hKey); if (res == ERROR_SUCCESS)

1 0

[cwittich] 39508: -don't rely on wingdi.h in winuser.h -remove NOGDI hacks from wine directx dlls
by cwittich＠svn.reactos.org 09 Feb '09

09 Feb '09

Author: cwittich Date: Mon Feb 9 02:55:19 2009 New Revision: 39508 URL: http://svn.reactos.org/svn/reactos?rev=39508&view=rev Log: -don't rely on wingdi.h in winuser.h -remove NOGDI hacks from wine directx dlls Modified: trunk/reactos/dll/directx/dinput/dinput.rbuild trunk/reactos/dll/directx/dplayx/dplayx.rbuild trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/dll/directx/dinput/dinput.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/dinput.… ============================================================================== --- trunk/reactos/dll/directx/dinput/dinput.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dinput/dinput.rbuild [iso-8859-1] Mon Feb 9 02:55:19 2009 @@ -4,7 +4,6 @@ <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="dinput.spec" /> <define name="_WIN32_WINNT">0x600</define> - <define name="NOGDI" /> <include base="dinput">.</include> <include base="ReactOS">include/reactos/wine</include> <library>wine</library> Modified: trunk/reactos/dll/directx/dplayx/dplayx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/dplayx.… ============================================================================== --- trunk/reactos/dll/directx/dplayx/dplayx.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dplayx/dplayx.rbuild [iso-8859-1] Mon Feb 9 02:55:19 2009 @@ -3,7 +3,6 @@ <module name="dplayx" type="win32dll" baseaddress="${BASEADDRESS_DPLAYX}" installbase="system32" installname="dplayx.dll" unicode="yes">  <importlibrary definition="dplayx.spec" /> - <define name="NOGDI" /> <include base="dplayx">.</include> <include base="ReactOS">include/reactos/wine</include> <library>wine</library> Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild [iso-8859-1] Mon Feb 9 02:55:19 2009 @@ -6,7 +6,7 @@ <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> <define name="USE_WIN32_OPENGL" /> - <define name="NOGDI" /> + <library>uuid</library> <library>wine</library> <library>user32</library> Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Mon Feb 9 02:55:19 2009 @@ -3115,6 +3115,11 @@ int iTitleWrap; LOGFONTW lfFont; } ICONMETRICSW,*LPICONMETRICSW; +#ifdef UNICODE +typedef ICONMETRICSW ICONMETRICS,*LPICONMETRICS; +#else /* UNICODE */ +typedef ICONMETRICSA ICONMETRICS,*LPICONMETRICS; +#endif /* UNICODE */ #endif /* NOGDI */ typedef struct tagMINIMIZEDMETRICS { UINT cbSize; @@ -3167,6 +3172,11 @@ LOGFONTW lfStatusFont; LOGFONTW lfMessageFont; } NONCLIENTMETRICSW,*LPNONCLIENTMETRICSW; +#ifdef UNICODE +typedef NONCLIENTMETRICSW NONCLIENTMETRICS,*LPNONCLIENTMETRICS; +#else /* UNICODE */ +typedef NONCLIENTMETRICSA NONCLIENTMETRICS,*LPNONCLIENTMETRICS; +#endif /* UNICODE */ #endif typedef struct tagSERIALKEYSA { UINT cbSize; @@ -4485,8 +4495,6 @@ #define wvsprintf wvsprintfW #ifndef NOGDI -typedef ICONMETRICSW ICONMETRICS,*LPICONMETRICS; -typedef NONCLIENTMETRICSW NONCLIENTMETRICS,*LPNONCLIENTMETRICS; #define ChangeDisplaySettings ChangeDisplaySettingsW #define ChangeDisplaySettingsEx ChangeDisplaySettingsExW #define CreateDesktop CreateDesktopW @@ -4653,8 +4661,6 @@ #define wsprintf wsprintfA #define wvsprintf wvsprintfA #if defined(_WINGDI_) && !defined(NOGDI) -typedef ICONMETRICSA ICONMETRICS,*LPICONMETRICS; -typedef NONCLIENTMETRICSA NONCLIENTMETRICS,*LPNONCLIENTMETRICS; #define ChangeDisplaySettings ChangeDisplaySettingsA #define ChangeDisplaySettingsEx ChangeDisplaySettingsExA #define CreateDesktop CreateDesktopA

1 0

[dgoette] 39507: * implement APLs in js * add new APLs * modify standard filter visibility settings * remove some stuff that makes no sense
by dgoette＠svn.reactos.org 09 Feb '09

09 Feb '09

Author: dgoette Date: Sun Feb 8 18:08:48 2009 New Revision: 39507 URL: http://svn.reactos.org/svn/reactos?rev=39507&view=rev Log: * implement APLs in js * add new APLs * modify standard filter visibility settings * remove some stuff that makes no sense Modified: branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js.php branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_EntryTable… branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Website.clas… Modified: branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql [iso-8859-1] Sun Feb 8 18:08:48 2009 @@ -227,7 +227,7 @@ CREATE TABLE roscms_area ( id bigint(20) NOT NULL auto_increment, `name` varchar(30) NOT NULL, - name_short varchar(15) NOT NULL, + name_short varchar(18) NOT NULL, description varchar(255) NOT NULL, PRIMARY KEY (id), UNIQUE KEY `name` (`name`), @@ -267,7 +267,11 @@ (30, 'add level 3 groups', 'addlvl3group', 'Add memberships with group security level 3'), (31, 'Mix private & public entries', 'mix_priv_pub', 'show private and public type entries together'), (32, 'Entry Details Security', 'entry_security', 'change security settings & name + type of entry'), -(33, 'show system entries', 'show_sys_entry', 'show entries of type ''system'''); +(33, 'show more filter', 'more_filter', 'show more than standard filter'), +(34, 'show admin filter', 'admin_filter', 'special admin filters'), +(35, 'Show all filter', 'dont_hide_filter', 'don''t hide filter from users'), +(36, 'Make Entries Stable', 'make_stable', 'Make Entries Stable'), +(37, 'show system entries', 'show_sys_entry', 'show entries of type ''system'''); @@ -283,10 +287,10 @@ INSERT INTO roscms_rel_groups_area SELECT DISTINCT g.id, a.id FROM roscms_area a JOIN roscms_groups g -WHERE ((a.name_short = 'system_tags' OR a.name_short = 'entry_details' OR a.name_short = 'new_entry' OR a.name_short = 'deltag' OR a.name_short = 'del_entry' OR a.name_short = 'mix_priv_pub' OR a.name_short = 'show_sys_entry' OR a.name_short = 'addlvl1group') +WHERE ((a.name_short = 'system_tags' OR a.name_short = 'entry_details' OR a.name_short = 'new_entry' OR a.name_short = 'deltag' OR a.name_short = 'del_entry' OR a.name_short = 'mix_priv_pub' OR a.name_short = 'show_sys_entry' OR a.name_short = 'addlvl1group' OR a.name_short = 'more_filter' OR a.name_short = 'make_stable' OR a.name_short = 'dont_hide_filter') AND g.security_level > 1) -OR ((a.name_short = 'delete_file' OR a.name_short = 'delmembership' OR a.name_short = 'disableaccount' OR a.name_short = 'user_details' OR a.name_short = 'other_drafts' OR a.name_short = 'stats' OR a.name_short = 'dynamic_pages' OR a.name_short = 'updatetag' OR a.name_short = 'del_wo_archiv' OR a.name_short = 'addlvl2group' OR a.name_short = 'user' OR a.name_short = 'addmembership' OR a.name_short = 'maintain') +OR ((a.name_short = 'delete_file' OR a.name_short = 'delmembership' OR a.name_short = 'disableaccount' OR a.name_short = 'user_details' OR a.name_short = 'other_drafts' OR a.name_short = 'stats' OR a.name_short = 'dynamic_pages' OR a.name_short = 'updatetag' OR a.name_short = 'del_wo_archiv' OR a.name_short = 'addlvl2group' OR a.name_short = 'user' OR a.name_short = 'addmembership' OR a.name_short = 'maintain' OR a.name_short = 'admin_filter') AND g.security_level = 3) OR ((a.name_short = 'admin' OR a.name_short = 'logs' OR a.name_short = 'addlvl3group') Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js [iso-8859-1] Sun Feb 8 18:08:48 2009 @@ -2174,32 +2174,32 @@ break; case '2': - filtstring2 = 'k_is_new_0|c_is_type_0|l_is_'+userlang+'_0|i_is_read_0|o_desc_datetime_0'; + filtstring2 = 'k_is_new_0|c_is_type_0|l_is_'+userlang+'_1|i_is_read_0|o_desc_datetime_1'; loadEntryTable('new'); break; case '3': - filtstring2 = 'y_is_page_0|k_is_stable_0|c_is_language_0|i_is_read_0|o_asc_name_0'; + filtstring2 = 'y_is_page_0|k_is_stable_0|c_is_language_1|i_is_read_0|o_asc_name_1'; loadEntryTable('page'); break; case '13': - filtstring2 = 'y_is_dynamic_0|k_is_stable_0|c_is_language_0|i_is_read_0|o_asc_name_0'; + filtstring2 = 'y_is_dynamic_0|k_is_stable_0|c_is_language_1|i_is_read_0|o_asc_name_1'; loadEntryTable('dynamic'); break; case '4': - filtstring2 = 'y_is_content_0|k_is_stable_0|l_is_'+userlang+'_0|i_is_read_0|o_asc_name_0'; + filtstring2 = 'y_is_content_0|k_is_stable_0|l_is_'+userlang+'_1|i_is_read_0|o_asc_name_1'; loadEntryTable('content'); break; case '5': - filtstring2 = 'y_is_template_0|k_is_stable_0|c_is_language_0|i_is_read_0|o_asc_name_0'; + filtstring2 = 'y_is_template_0|k_is_stable_0|c_is_language_1|i_is_read_0|o_asc_name_1'; loadEntryTable('template'); break; case '6': - filtstring2 = 'y_is_script_0|k_is_stable_0|c_is_language_0|i_is_read_0|o_asc_name_0'; + filtstring2 = 'y_is_script_0|k_is_stable_0|c_is_language_1|i_is_read_0|o_asc_name_1'; loadEntryTable('script'); break; @@ -2211,33 +2211,33 @@ else { translang = userlang; } - filtstring2 = 'y_is_content_0|k_is_stable_0|i_is_translate_0|c_is_user_0|l_is_'+roscms_standard_language+'_0|r_is_'+translang+'_0|o_desc_datetime_0'; + filtstring2 = 'y_is_content_1|k_is_stable_0|i_is_translate_0|c_is_user_1|l_is_'+roscms_standard_language+'_0|r_is_'+translang+'_1|o_desc_datetime_1'; loadEntryTable('translate'); break; case '8': default: - filtstring2 = 'c_is_type_0|l_is_'+userlang+'_0|i_is_read_0|o_desc_datetime_0'; + filtstring2 = 'c_is_type_1|l_is_'+userlang+'_1|i_is_read_0|o_desc_datetime_1'; loadEntryTable('all'); break; case '9': - filtstring2 = 's_is_true_0|c_is_type_0|l_is_'+userlang+'_0|i_is_read_0|o_desc_datetime_0'; + filtstring2 = 's_is_true_0|c_is_type_1|l_is_'+userlang+'_1|i_is_read_0|o_desc_datetime_1'; loadEntryTable('starred'); break; case '10': - filtstring2 = 'k_is_draft_0|u_is_'+roscms_intern_login_check_username+'_0|c_is_type_0|i_is_read_0|o_desc_datetime_0'; + filtstring2 = 'k_is_draft_0|u_is_'+roscms_intern_login_check_username+'_0|c_is_type_1|i_is_read_0|o_desc_datetime_1'; loadEntryTable('draft'); break; case '11': - filtstring2 = 'u_is_'+roscms_intern_login_check_username+'_0|c_is_type_0|i_is_read_0|o_desc_datetime_0'; + filtstring2 = 'u_is_'+roscms_intern_login_check_username+'_0|c_is_type_1|i_is_read_0|o_desc_datetime_1'; loadEntryTable('my'); break; case '12': - filtstring2 = 'k_is_archive_0|c_is_version_0|c_is_type_0|l_is_'+userlang+'_0|o_asc_name_0|i_is_read_0|o_desc_ver_0'; + filtstring2 = 'k_is_archive_0|c_is_version_1|c_is_type_1|l_is_'+userlang+'_1|o_asc_name_1|i_is_read_0|o_desc_ver_1'; roscms_archive = true; /* activate archive mode*/ loadEntryTable('archive'); break; @@ -2548,16 +2548,18 @@ var cmdhtml_select_va = ''; var cmdhtml_select_xe = ''; - // special commands for access levels - if (roscms_access_level >= 2) { + // mark stable / generate + if (roscms_access['make_stable']) { cmdhtml_stable = '<button type="button" id="cmdstable" onclick="changeSelectedTags(\'ms\')">Stable</button>'+cmdhtml_space; cmdhtml_select_ms = '<option value="ms">   Mark as stable</option>'; cmdhtml_select_ge = '<option value="va">   Generate page</option>'; - if (roscms_access_level === 3) { - cmdhtml_select_va = '<option value="va">   Move to archive</option>'; - cmdhtml_select_xe = '<option value="xe">   Delete</option>'; - } + } + + // delete entries + if (roscms_access['del_entry']) { + cmdhtml_select_va = '<option value="va">   Move to archive</option>'; + cmdhtml_select_xe = '<option value="xe">   Delete</option>'; } var cmdhtml_select_full = cmdhtml_select_start @@ -2649,20 +2651,16 @@ */ function addFilter( ) { + var new_filter = 'a_is_'; + + // fill filtstring2 with content, if available getActiveFilters(); - if (roscms_access_level > 1) { - tmp_security_new_filter = "k_is_stable"; + if (filtstring2 === '') { + htmlFilterChoices(new_filter); } else { - tmp_security_new_filter = "a_is_"; - } - - if (filtstring2 === '') { - htmlFilterChoices(tmp_security_new_filter); - } - else { - htmlFilterChoices(filtstring2+'|'+tmp_security_new_filter); + htmlFilterChoices(filtstring2+'|'+new_filter); } } // end of function addFilter @@ -2691,15 +2689,9 @@ for (i=0; i < filtpopstr2.length; i++) { lstfilterstr2 = filtpopstr2[i].split('_'); - if (lstfilterstr2[3] == 0) { + if (lstfilterstr2[3] == 0 && !roscms_access['dont_hide_filter']) { filtvisibility = false; - - if (roscms_access_level > 1) { - lstfilterstr += '<span style="font-style: italic;">'; - } - else { - lstfilterstr += '<span style="display: none">'; - } + lstfilterstr += '<span style="display: none;">'; } else { filtvisibility = true; @@ -2710,15 +2702,15 @@ lstfilterstr += '<div id="filt'+indexid+'" class="filterbar2">and '; // hidden filter entries don't need a combobox (only for SecLev = 1 user) - if (lstfilterstr2[3] == 0 && roscms_access_level === 1) { + if (lstfilterstr2[3] == 0 && !roscms_access['dont_hide_filter']) { lstfilterstr += '<input type="hidden" name="sfa'+indexid+'" id="sfa'+indexid+'" value="" />'; } else { lstfilterstr += '<select id="sfa'+indexid+'" onchange="isFilterChanged(this.id)">'; - if (roscms_access_level > 1) { - lstfilterstr += '<option value="k"+roscms_cbm_hide+>Status</option>' - + '<option value="y"+roscms_cbm_hide+>Type</option>'; + if (roscms_access['more_filter']) { + lstfilterstr += '<option value="k">Status</option>' + + '<option value="y">Type</option>'; } lstfilterstr += '<option value="n">Name</option>' @@ -2727,14 +2719,14 @@ + '<option value="a">Tag</option>' + '<option value="l">Language</option>'; - if (roscms_access_level > 1) { - lstfilterstr += '<option value="r"+roscms_cbm_hide+>Translate</option>' - + '<option value="i"+roscms_cbm_hide+>Security</option>' - + '<option value="m"+roscms_cbm_hide+>Metadata</option>' - + '<option value="u"+roscms_cbm_hide+>User</option>'; - - if (roscms_access_level === 3) { - lstfilterstr += '<option value="e"+roscms_cbm_hide+>System</option>'; + if (roscms_access['more_filter']) { + lstfilterstr += '<option value="r">Translate</option>' + + '<option value="i">Security</option>' + + '<option value="m">Metadata</option>' + + '<option value="u">User</option>'; + + if (roscms_access['admin_filter']) { + lstfilterstr += '<option value="e">System</option>'; } } Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js.php [iso-8859-1] Sun Feb 8 18:08:48 2009 @@ -42,7 +42,7 @@ var filtentryselstrs2 = ''; // hidden filter entries don't need a combobox (only for SecLev = 1 user) - if (objidval2 == 0 && roscms_access_level == 1) { + if (objidval2 == 0 && !roscms_access['dont_hide_filter']) { filtentryselstrs1 = '<input type="hidden" name="sfb'+filterid+'" id="sfb'+filterid+'" value="" />'; filtentryselstrs2 = '<input type="hidden" name="sfc'+filterid+'" id="sfc'+filterid+'" value="" />'; } @@ -53,14 +53,14 @@ // kind case 'k': filtentryselstrs1 = '<select id="sfb'+filterid+'"><option value="is">is</option>'; - if (roscms_access_level > 1) { - filtentryselstrs1 += '<option value="no"'+roscms_cbm_hide+'>is not</option>'; + if (roscms_access['more_filter']) { + filtentryselstrs1 += '<option value="no">is not</option>'; } filtentryselstrs1 += '</select>'; filtentryselstrs2 = '<select id="sfc'+filterid+'"><option value="stable">Stable</option><option value="new">New</option><option value="draft">Draft</option><option value="unknown">Unknown or no status</option>'; - if (roscms_access_level > 1) { - filtentryselstrs2 += '<option value="archive"+roscms_cbm_hide+>Archive</option>'; + if (roscms_access['more_filter']) { + filtentryselstrs2 += '<option value="archive">Archive</option>'; } filtentryselstrs2 += '</select>'; @@ -69,8 +69,8 @@ // type case 'y': filtentryselstrs1 = '<select id="sfb'+filterid+'"><option value="is">is</option>'; - if (roscms_access_level > 1) { - filtentryselstrs1 += '<option value="no"+roscms_cbm_hide+>is not</option>'; + if (roscms_access['more_filter']) { + filtentryselstrs1 += '<option value="no">is not</option>'; } filtentryselstrs1 += '</select>'; filtentryselstrs2 = '<select id="sfc'+filterid+'"><option value="page">Page</option><option value="dynamic">Dynamic Page</option><option value="content">Content</option><option value="template">Template</option><option value="script">Script</option><option value="system">System</option></select>'; @@ -140,8 +140,8 @@ // user case 'u': filtentryselstrs1 = '<select id="sfb'+filterid+'"><option value="is">is</option>'; - if (roscms_access_level > 1) { - filtentryselstrs1 += '<option value="no"+roscms_cbm_hide+>is not</option>'; + if (roscms_access['more_filter']) { + filtentryselstrs1 += '<option value="no">is not</option>'; } filtentryselstrs1 += '</select>'; filtentryselstrs2 = '<input id="sfc'+filterid+'" type="text" value="" size="20" maxlength="50" />  (e.g. John Doe)'; @@ -157,8 +157,8 @@ case 'c': filtentryselstrs1 = '<select id="sfb'+filterid+'"><option value="is">is</option></select>'; filtentryselstrs2 = '<select id="sfc'+filterid+'"><option value="language">Language</option><option value="user">User</option><option value="type">Type</option><option value="version">Version</option>'; - if (roscms_access_level > 1) { - filtentryselstrs2 += '<option value="security"+roscms_cbm_hide+>Security</option><option value="rights"+roscms_cbm_hide+>Rights</option>'; + if (roscms_access['more_filter']) { + filtentryselstrs2 += '<option value="security">Security</option><option value="rights">Rights</option>'; } filtentryselstrs2 += '</select>'; break; @@ -167,8 +167,8 @@ case 'o': filtentryselstrs1 = '<select id="sfb'+filterid+'"><option value="asc">Ascending</option><option value="desc">Descending</option></select>'; filtentryselstrs2 = '<select id="sfc'+filterid+'"><option value="datetime">Date & Time</option><option value="name">Name</option><option value="lang">Language</option><option value="usr">User</option><option value="type">Type</option><option value="ver">Version</option><option value="nbr">Number ("dynamic" entry)</option>'; - if (roscms_access_level > 1) { - filtentryselstrs2 += '<option value="security"+roscms_cbm_hide+>Security</option><option value="revid"+roscms_cbm_hide+>RevID</option><option value="ext"+roscms_cbm_hide+>Extension</option><option value="status"+roscms_cbm_hide+>Status</option><option value="kind"+roscms_cbm_hide+>Kind</option>'; + if (roscms_access['more_filter']) { + filtentryselstrs2 += '<option value="security">Security</option><option value="revid">RevID</option><option value="ext">Extension</option><option value="status">Status</option><option value="kind">Kind</option>'; } filtentryselstrs2 += '</select>'; break; @@ -197,8 +197,8 @@ // name case 'n': filtentryselstrs1 = '<select id="sfb'+filterid+'"><option value="is">is</option>'; - if (roscms_access_level > 1) { - filtentryselstrs1 += '<option value="no"+roscms_cbm_hide+>is not</option><option value="likea"+roscms_cbm_hide+>is like *...*</option>'; + if (roscms_access['more_filter']) { + filtentryselstrs1 += '<option value="no">is not</option><option value="likea">is like *...*</option>'; } filtentryselstrs1 += '<option value="likeb">is like ...*</option></select>'; filtentryselstrs2 = '<input id="sfc'+filterid+'" type="text" value="" size="20" maxlength="50" />  (e.g. about)'; @@ -207,8 +207,8 @@ // tag case 'a': filtentryselstrs1 = '<select id="sfb'+filterid+'"><option value="is">is</option>'; - if (roscms_access_level > 1) { - filtentryselstrs1 += '<option value="no"+roscms_cbm_hide+>is not</option>'; + if (roscms_access['more_filter']) { + filtentryselstrs1 += '<option value="no">is not</option>'; } filtentryselstrs1 +='</select>'; filtentryselstrs2 = '<input id="sfc'+filterid+'" type="text" value="" size="15" maxlength="30" />  (e.g. todo)'; @@ -216,7 +216,7 @@ // system case 'e': - if (roscms_access_level == 3) { + if (roscms_access['admin_filter']) { filtentryselstrs1 = '<select id="sfb'+filterid+'"><option value="dataid">Data-ID</option><option value="revid">Rev-ID</option><option value="usrid">User-ID</option><option value="langid">Lang-ID</option></select>'; filtentryselstrs2 = '<input id="sfc'+filterid+'" type="text" value="" size="15" maxlength="30" />'; } Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_EntryTable… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_EntryTable… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_EntryTable… [iso-8859-1] Sun Feb 8 18:08:48 2009 @@ -227,6 +227,14 @@ */ private function markStable( $revision ) { + $thisuser=&ThisUser::getInstance(); + + // check if entry is not already stable + if (!$thisuser->hasAccess('make_stable')) { + echo 'You\'ve no rights to publish stable entries.'; + return false; + } + // check if entry is not already stable if ($revision['status'] === 'stable') { echo 'Entry is already stable'; @@ -234,15 +242,15 @@ } // has user access to modify other languages? - if (!ThisUser::getInstance()->hasAccess('more_lang')) { + if (!$thisuser->hasAccess('more_lang')) { // check if user has set a language - if (ThisUser::getInstance()->language() == 0) { + if ($thisuser->language() == 0) { die('Set a valid language in your account settings!'); } // block actions for user with access to one language - elseif (ThisUser::getInstance()->language() != $revision['lang_id']) { + elseif ($thisuser->language() != $revision['lang_id']) { echo 'You can\'t mark entries of other languages as stable!'; return false; } 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] Sun Feb 8 18:08:48 2009 @@ -103,8 +103,14 @@ var roscms_intern_webserver_roscms = '".RosCMS::getInstance()->pathRosCMS()."'; var roscms_intern_page_link = '".RosCMS::getInstance()->pathRosCMS()."?page='; var roscms_get_edit = '".(isset($_GET['edit']) ? $_GET['edit'] : '')."'; - var roscms_access_level = 3"./*$thisuser->securityLevel().*/"; - var roscms_cbm_hide = '"./*(($thisuser->securityLevel() > 1) ? '' : ' disabled="disabled" style="color:#CCCCCC;"').*/"'; // disable combobox entries for novice user + + // access restrictions + var roscms_access = new Object(); + roscms_access['more_filter'] = ".($thisuser->hasAccess('more_filter') ? 'true' : 'false')."; + roscms_access['admin_filter'] = ".($thisuser->hasAccess('admin_filter') ? 'true' : 'false')."; + 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')."; // favorite user language ";

1 0

[gschneider] 39506: Preparation for StretchBlt pattern support (2): - Modify CallDibStretchBlt for brush support, adjust function pointers - Add BrushObj to DibFunctions, fix BrushOrigin parameter type, qualify ROP properly
by gschneider＠svn.reactos.org 08 Feb '09

08 Feb '09

Author: gschneider Date: Sun Feb 8 17:18:58 2009 New Revision: 39506 URL: http://svn.reactos.org/svn/reactos?rev=39506&view=rev Log: Preparation for StretchBlt pattern support (2): - Modify CallDibStretchBlt for brush support, adjust function pointers - Add BrushObj to DibFunctions, fix BrushOrigin parameter type, qualify ROP properly Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.c trunk/reactos/subsystems/win32/win32k/dib/dib.h trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c trunk/reactos/subsystems/win32/win32k/eng/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib.c [iso-8859-1] Sun Feb 8 17:18:58 2009 @@ -225,9 +225,9 @@ BOOLEAN Dummy_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, RECTL* DestRect, RECTL *SourceRect, - POINTL* MaskOrigin, POINTL BrushOrign, - CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation, - ULONG Mode) + POINTL* MaskOrigin, BRUSHOBJ* Brush, + POINTL* BrushOrign, CLIPOBJ *ClipRegion, + XLATEOBJ *ColorTranslation, ROP4 Rop) { return FALSE; } Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib.h [iso-8859-1] Sun Feb 8 17:18:58 2009 @@ -41,7 +41,7 @@ typedef VOID (*PFN_DIB_HLine)(SURFOBJ*,LONG,LONG,LONG,ULONG); typedef VOID (*PFN_DIB_VLine)(SURFOBJ*,LONG,LONG,LONG,ULONG); typedef BOOLEAN (*PFN_DIB_BitBlt)(PBLTINFO); -typedef BOOLEAN (*PFN_DIB_StretchBlt)(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG); +typedef BOOLEAN (*PFN_DIB_StretchBlt)(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,CLIPOBJ*,XLATEOBJ*,ROP4); typedef BOOLEAN (*PFN_DIB_TransparentBlt)(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); typedef BOOLEAN (*PFN_DIB_ColorFill)(SURFOBJ*, RECTL*, ULONG); typedef BOOLEAN (*PFN_DIB_AlphaBlend)(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -67,7 +67,7 @@ VOID Dummy_HLine(SURFOBJ*,LONG,LONG,LONG,ULONG); VOID Dummy_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG); BOOLEAN Dummy_BitBlt(PBLTINFO); -BOOLEAN Dummy_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG); +BOOLEAN Dummy_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,CLIPOBJ*,XLATEOBJ*,ROP4); BOOLEAN Dummy_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); BOOLEAN Dummy_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN Dummy_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -132,7 +132,7 @@ BOOLEAN DIB_32BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN DIB_32BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); -BOOLEAN DIB_XXBPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG); +BOOLEAN DIB_XXBPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,CLIPOBJ*,XLATEOBJ*,ROP4); extern unsigned char notmask[2]; extern unsigned char altnotmask[2]; Modified: trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c [iso-8859-1] Sun Feb 8 17:18:58 2009 @@ -23,10 +23,10 @@ #include <debug.h> BOOLEAN DIB_XXBPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, - RECTL* DestRect, RECTL *SourceRect, - POINTL* MaskOrigin, POINTL BrushOrigin, - CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation, - ULONG ROP) + RECTL *DestRect, RECTL *SourceRect, + POINTL *MaskOrigin, BRUSHOBJ *Brush, + POINTL *BrushOrigin, CLIPOBJ *ClipRegion, + XLATEOBJ *ColorTranslation, ROP4 ROP) { LONG SrcSizeY; LONG SrcSizeX; Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Sun Feb 8 17:18:58 2009 @@ -50,8 +50,9 @@ RECTL* OutputRect, RECTL* InputRect, POINTL* MaskOrigin, + BRUSHOBJ* BrushObj, POINTL* BrushOrigin, - ULONG Mode); + ROP4 Rop4); BOOL APIENTRY EngIntersectRect(RECTL* prcDst, RECTL* prcSrc1, RECTL* prcSrc2) { @@ -741,8 +742,9 @@ RECTL* OutputRect, RECTL* InputRect, POINTL* MaskOrigin, + BRUSHOBJ* Brush, POINTL* BrushOrigin, - ULONG Mode) + ROP4 Rop4) { POINTL RealBrushOrigin; if (BrushOrigin == NULL) @@ -754,7 +756,7 @@ RealBrushOrigin = *BrushOrigin; } return DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_StretchBlt( - psoDest, psoSource, OutputRect, InputRect, MaskOrigin, RealBrushOrigin, ClipRegion, ColorTranslation, Mode); + psoDest, psoSource, OutputRect, InputRect, MaskOrigin, Brush, &RealBrushOrigin, ClipRegion, ColorTranslation, Rop4); } @@ -965,7 +967,7 @@ Ret = (*BltRectFunc)(psoOutput, psoInput, Mask, ClipRegion, ColorTranslation, &OutputRect, &InputRect, MaskOrigin, - &AdjustedBrushOrigin, ROP4); + Brush, &AdjustedBrushOrigin, ROP4); IntEngLeave(&EnterLeaveDest); if (UsesSource)

1 0

[tkreuzer] 39505: Fix definition of IoSetCancelRoutine.
by tkreuzer＠svn.reactos.org 08 Feb '09

08 Feb '09

Author: tkreuzer Date: Sun Feb 8 16:56:31 2009 New Revision: 39505 URL: http://svn.reactos.org/svn/reactos?rev=39505&view=rev Log: Fix definition of IoSetCancelRoutine. Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Sun Feb 8 16:56:31 2009 @@ -9429,11 +9429,12 @@ * IN PIRP Irp, * IN PDRIVER_CANCEL CancelRoutine) */ -#define IoSetCancelRoutine( Irp, NewCancelRoutine ) ( \ - (PDRIVER_CANCEL)InterlockedExchange( (PLONG)&(Irp)->CancelRoutine, (LONG)(NewCancelRoutine) ) ) - - - /* +#define IoSetCancelRoutine(_Irp, \ + _CancelRoutine) \ + ((PDRIVER_CANCEL) InterlockedExchangePointer( \ + (PVOID *) &(_Irp)->CancelRoutine, (PVOID) (_CancelRoutine))) + +/* * VOID * IoSetCompletionRoutine( * IN PIRP Irp,

1 0

[dgoette] 39504: * bugfixing * minor improvements
by dgoette＠svn.reactos.org 08 Feb '09

08 Feb '09

Author: dgoette Date: Sun Feb 8 16:24:23 2009 New Revision: 39504 URL: http://svn.reactos.org/svn/reactos?rev=39504&view=rev Log: * bugfixing * minor improvements Modified: branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js.php branches/danny-web/reactos.org/htdocs/roscms/js/mef.js branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_EntryTable… branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_QuickInfo.… branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_SaveDraft.… branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewEditor… branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewEntryT… branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewPrevie… branches/danny-web/reactos.org/htdocs/roscms/lib/om/Entry.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/om/Generate.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/om/Log.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/om/Revision.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/om/Tag.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_User.class.p… branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Website.clas… Modified: branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql [iso-8859-1] Sun Feb 8 16:24:23 2009 @@ -161,16 +161,13 @@ INSERT INTO roscms_entries_areas VALUES (1, 'Translate', 'translate', 'user can translate this entry to the lang he has set in his profile'), (2, 'Edit', 'edit', 'modify content of this entry'), -(3, 'View Metadata', 'metadata', 'view Metadata tab '), -(4, 'View History', 'history', 'view History tab'), -(5, 'View Fields', 'fields', 'view fields tab'), -(6, 'View Entry Tab', 'entry', 'view entry tab'), -(7, 'View Security', 'security', 'view security tab'), -(8, 'View Depencies', 'depencies', 'view depencies tab'), -(9, 'System metadata', 'system_meta', 'modify System metadata'), -(10, 'Change ACL', 'acl', 'modify ACL for this entry'), -(11, 'Add Fields', 'add_fields', 'add new text fields'), -(12, 'Read', 'read', 'can view this entry'); +(3, 'View History', 'history', 'view History tab'), +(4, 'View Fields', 'fields', 'view fields tab'), +(5, 'View Revision Tab', 'revision', 'view revision tab'), +(6, 'View Depencies', 'depencies', 'view depencies tab'), +(7, 'System metadata', 'system_meta', 'modify System metadata'), +(8, 'Add Fields', 'add_fields', 'add new text fields'), +(9, 'Read', 'read', 'can view this entry'); @@ -206,7 +203,7 @@ OR (g.security_level = 3 AND s.sec_lev3_read = 1 AND r.name_short='read') OR (g.security_level = 3 AND s.sec_lev3_write = 1 AND r.name_short='edit') -OR (g.security_level = 3 AND s.sec_lev3_add = 1 AND (r.name_short='add_fields' OR r.name_short='fields' OR r.name_short='security' OR r.name_short='acl' OR r.name_short='entry')) +OR (g.security_level = 3 AND s.sec_lev3_add = 1 AND (r.name_short='add_fields' OR r.name_short='fields' OR r.name_short='revision')) OR (g.security_level = 3 AND s.sec_lev3_trans = 1 AND r.name_short='translate') OR (s.sec_allow LIKE CONCAT('%',s.sec_allow,'%') AND r.name_short='read') @@ -269,7 +266,8 @@ (29, 'add level 2 groups', 'addlvl2group', 'Add memberships with group security level 2'), (30, 'add level 3 groups', 'addlvl3group', 'Add memberships with group security level 3'), (31, 'Mix private & public entries', 'mix_priv_pub', 'show private and public type entries together'), -(32, 'show system entries', 'show_sys_entry', 'show entries of type ''system'''); +(32, 'Entry Details Security', 'entry_security', 'change security settings & name + type of entry'), +(33, 'show system entries', 'show_sys_entry', 'show entries of type ''system'''); @@ -283,7 +281,7 @@ ) ENGINE=MyISAM DEFAULT CHARSET=utf8; INSERT INTO roscms_rel_groups_area -SELECT g.id, a.id +SELECT DISTINCT g.id, a.id FROM roscms_area a JOIN roscms_groups g WHERE ((a.name_short = 'system_tags' OR a.name_short = 'entry_details' OR a.name_short = 'new_entry' OR a.name_short = 'deltag' OR a.name_short = 'del_entry' OR a.name_short = 'mix_priv_pub' OR a.name_short = 'show_sys_entry' OR a.name_short = 'addlvl1group') AND g.security_level > 1) @@ -304,7 +302,10 @@ AND g.name_short = 'transmaint') OR ((a.name_short = 'more_lang') -AND g.name_short != 'translator' AND g.name_short != 'transmaint' AND g.security_level > 0); +AND g.name_short != 'translator' AND g.name_short != 'transmaint' AND g.security_level > 0) + +OR ((a.name_short = 'entry_security') +AND (g.name_short = 'ros_sadmin' OR g.name_short = 'ros_admin')); -- -------------------------------------------------------- @@ -331,7 +332,7 @@ d.data_name, s.id, d.data_id, - 1 + TRUE FROM data_a d JOIN roscms_entries_access s ON d.data_acl=s.name_short UNION SELECT @@ -340,7 +341,7 @@ d.data_name, s.id, d.data_id, - 0 + FALSE FROM data_ d JOIN roscms_entries_access s ON d.data_acl=s.name_short; @@ -374,8 +375,8 @@ r.rev_usrid, r.rev_version, r.rev_datetime, - 1, 'unknown', + TRUE, r.rev_id FROM data_revision_a r JOIN roscms_languages l ON r.rev_language=l.name_short JOIN roscms_entries d ON (d.old_id=r.data_id AND d.old_archive IS TRUE) UNION @@ -386,8 +387,8 @@ r.rev_usrid, r.rev_version, r.rev_datetime, - 0, 'unknown', + FALSE, r.rev_id FROM data_revision r JOIN roscms_languages l ON r.rev_language=l.name_short JOIN roscms_entries d ON (d.old_id=r.data_id AND d.old_archive IS FALSE); @@ -513,10 +514,12 @@ -- -------------------------------------------------------- -- port status tags to revisions -- -------------------------------------------------------- + UPDATE roscms_entries_revisions r -SET status = (SELECT value FROM roscms_entries_tags WHERE rev_id=r.id AND name='status' LIMIT 1); +SET status = (SELECT value FROM roscms_entries_tags WHERE rev_id=r.id AND name='status' ORDER BY value ASC LIMIT 1); DELETE FROM roscms_entries_tags WHERE name='status'; + @@ -525,7 +528,7 @@ -- -------------------------------------------------------- DELETE FROM roscms_entries_tags WHERE name='visible'; DELETE FROM roscms_entries_tags WHERE name='kind' AND value='default'; - +DELETE FROM roscms_entries_tags WHERE name='number_sort'; -- -------------------------------------------------------- @@ -707,6 +710,17 @@ -- -------------------------------------------------------- +-- remove converter specific fields +-- -------------------------------------------------------- +ALTER TABLE roscms_entries + DROP old_id, + DROP old_archive, + ADD UNIQUE KEY type_name ( type , name ); +ALTER TABLE roscms_entries_revisions DROP old_id; + + + +-- -------------------------------------------------------- -- convert to dynamic entries -- -------------------------------------------------------- UPDATE roscms_entries SET type = 'dynamic' WHERE type='page' AND (name='news_page' OR name='newsletter' OR name='interview'); @@ -716,23 +730,28 @@ 'content', CONCAT(d.name,'_',t.value), d.access_id -FROM roscms_entries d JOIN roscms_entries_revisions r ON r.data_id=d.id JOIN roscms_entries_tags t ON t.rev_id=r.id -WHERE t.name='number' AND d.type='content'; +FROM roscms_entries d JOIN roscms_entries e ON e.name=d.name JOIN roscms_entries_revisions r ON r.data_id=d.id JOIN roscms_entries_tags t ON t.rev_id=r.id +WHERE t.name='number' AND d.type='content' AND e.type = 'dynamic'; UPDATE roscms_entries_revisions r JOIN roscms_entries o ON r.data_id=o.id JOIN roscms_entries_tags t ON t.rev_id=r.id JOIN roscms_entries d ON d.name=CONCAT(o.name,'_',t.value) SET r.data_id=d.id WHERE t.name='number' AND o.type='content'; +INSERT INTO roscms_entries_tags (rev_id, name, value, user_id) +SELECT + r2.id, + 'next_index', + MAX(t.value*1)+1 AS val, + -1 +FROM roscms_entries d +JOIN roscms_entries_revisions r2 ON d.id=r2.data_id +JOIN roscms_entries e ON e.name LIKE CONCAT(d.name,'_%') +JOIN roscms_entries_revisions r ON r.data_id=e.id +JOIN roscms_entries_tags t ON t.rev_id=r.id +WHERE d.type = 'dynamic' +AND e.type = 'content' +AND t.name='number' +GROUP BY d.name; + DELETE FROM roscms_entries WHERE type='content' AND (name='news_page' OR name='newsletter' OR name='interview'); - - - --- -------------------------------------------------------- --- remove converter specific fields --- -------------------------------------------------------- -ALTER TABLE roscms_entries - DROP old_id, - DROP old_archive, - ADD UNIQUE KEY type_name ( type , name ); -ALTER TABLE roscms_entries_revisions DROP old_id; @@ -766,4 +785,4 @@ DROP TABLE users; DROP TABLE user_unsafenames; DROP TABLE user_unsafepwds; -DROP TABLE user_sessions; +DROP TABLE user_sessions; Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js [iso-8859-1] Sun Feb 8 16:24:23 2009 @@ -1056,7 +1056,7 @@ var selhtml_new = '<span class="button" onclick="selectType(\'new\')">New</span>'; var selhtml_draft = '<span class="button" onclick="selectType(\'draft\')">Draft</span>'; var selhtml_uptodate = '<span class="button" onclick="selectType(\'transg\')">Current</span>'; - var selhtml_outdated = '<span class="button" onclick="selectType(\'transr\')">Dated</span>'; + var selhtml_outdated = '<span class="button" onclick="selectType(\'transr\')">Outdated</span>'; var selhtml_notrans = '<span class="button" onclick="selectType(\'transb\')">Missing</span>'; // use for all types @@ -1359,21 +1359,18 @@ /** - * updates or changes a specific tag, mostly status or star - * - * @param int rev revision id - * @param string dtn tag name - * @param string dtv tag value - * @param int dusr user - * @param int dtid tag id + * updates or changes a specific tag, mostly star + * + * @param int rev_id revision id + * @param string value tag value * @param string objid */ -function updateTag( rev_id, dtn, dtv, dusr, dtid, objid ) -{ - if (dtn !== '' && dtv !== '') { - makeRequest('?page=backend&type=text&subtype=eta&d_fl=updatetag&rev='+rev_id+'&d_val='+encodeURIComponent(dtn)+'&d_val2='+encodeURIComponent(dtv)+'&d_val3='+dusr+'&d_val4='+dtid, 'eta', objid, 'html', 'GET', ''); - } -} // end of function updateTag +function updateBookmark( rev_id, value, objid ) +{ + if (value != '') { + makeRequest('?page=backend&type=text&subtype=eta&d_fl=setbookmark&rev='+rev_id+'&tag_value='+encodeURIComponent(value), 'eta', objid, 'html', 'GET', ''); + } +} // end of function updateBookmark @@ -1438,7 +1435,6 @@ loadEntryTableWithOffset(roscms_current_tbl_position); window.clearTimeout(autosave_timer); - alertbox('Draft saved'); } } // end of function saveAsDraft @@ -1994,6 +1990,13 @@ autosave_cache = tempcache; } document.getElementById('mefasi').innerHTML = 'Draft saved at '+ curr_hour +':'+ curr_min; + + if (http_request.responseText != '') { + alertbox('Error: '+http_request.responseText); + } + else { + alertbox('Draft saved'); + } break; case 'alert': @@ -2044,7 +2047,7 @@ dtv = 'off'; document.getElementById(objid).className = 'cStarOff'; } - updateTag(devideids2, devideids3, 'star', dtv, dusr, devide2[1], objid, '3'); + updateBookmark(devideids3, dtv, objid); } } } // end of function setBookmark @@ -2176,12 +2179,12 @@ break; case '3': - filtstring2 = 'y_is_page_0|k_is_stable_0|l_is_'+userlang+'_0|i_is_read_0|o_asc_name_0'; + filtstring2 = 'y_is_page_0|k_is_stable_0|c_is_language_0|i_is_read_0|o_asc_name_0'; loadEntryTable('page'); break; case '13': - filtstring2 = 'y_is_dynamic_0|k_is_stable_0|l_is_'+userlang+'_0|i_is_read_0|o_asc_name_0'; + filtstring2 = 'y_is_dynamic_0|k_is_stable_0|c_is_language_0|i_is_read_0|o_asc_name_0'; loadEntryTable('dynamic'); break; @@ -2191,12 +2194,12 @@ break; case '5': - filtstring2 = 'y_is_template_0|k_is_stable_0|l_is_'+userlang+'_0|i_is_read_0|o_asc_name_0'; + filtstring2 = 'y_is_template_0|k_is_stable_0|c_is_language_0|i_is_read_0|o_asc_name_0'; loadEntryTable('template'); break; case '6': - filtstring2 = 'y_is_script_0|k_is_stable_0|l_is_'+userlang+'_0|i_is_read_0|o_asc_name_0'; + filtstring2 = 'y_is_script_0|k_is_stable_0|c_is_language_0|i_is_read_0|o_asc_name_0'; loadEntryTable('script'); break; @@ -2287,11 +2290,11 @@ if (did > 0 && drid > 0) { if (document.getElementById(objid).src == roscms_intern_webserver_roscms+'images/star_on_small.gif') { document.getElementById(objid).src = roscms_intern_webserver_roscms+'images/star_off_small.gif'; - updateTag(drid, 'star', 'off', dusr, document.getElementById(objid).className, objid, '3'); + updateBookmark(drid, 'off', objid); } else { document.getElementById(objid).src = roscms_intern_webserver_roscms+'images/star_on_small.gif'; - updateTag(drid, 'star', 'on', dusr, document.getElementById(objid).className, objid, '3'); + updateBookmark(drid, 'on', objid); } } } // end of function ToggleBookmark Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js.php [iso-8859-1] Sun Feb 8 16:24:23 2009 @@ -23,12 +23,8 @@ Login::required(); // get user language -$user_lang = ThisUser::getInstance()->language(); - -// prepare build languages -$stmt=&DBConnection::getInstance()->prepare("SELECT id, level, name FROM ".ROSCMST_LANGUAGES." WHERE level > 0 ORDER BY name ASC"); -$stmt->execute(); -$languages = $stmt->fetchAll(PDO::FETCH_ASSOC); +$thisuser = ThisUser::getInstance(); +$user_lang = $thisuser->language(); ?> @@ -104,7 +100,16 @@ filtentryselstrs2 = '<select id="sfc'+filterid+'"><?php // build languages -foreach($languages as $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(PDO::FETCH_ASSOC)) { echo '<option value="'.$language['id'].'"'.(($language['id'] == $user_lang) ? ' selected="selected"' : '').'>'.$language['name'].'</option>'; } @@ -116,11 +121,18 @@ filtentryselstrs1 = '<select id="sfb'+filterid+'"><option value="is">to</option></select>'; filtentryselstrs2 = '<select id="sfc'+filterid+'"><?php -// build translation languages -foreach($languages as $language) { - if ($language['level'] != '10') { - echo '<option value="'.$language['id'].'"'.(($language['id'] == $user_lang) ? ' selected="selected"' : '').'>'.$language['name'].'</option>'; - } +// translation languages +if ($thisuser->hasAccess('more_lang')) { + $stmt=&DBConnection::getInstance()->prepare("SELECT id, name FROM ".ROSCMST_LANGUAGES." WHERE level > 0 AND id!=:standard_lang ORDER BY name ASC"); +} +else { + $stmt=&DBConnection::getInstance()->prepare("SELECT id, name FROM ".ROSCMST_LANGUAGES." WHERE id=:lang_id AND id != :standard_lang"); + $stmt->bindParam('lang_id',$user_lang,PDO::PARAM_INT); +} +$stmt->bindParam('standard_lang',Language::getStandardId(),PDO::PARAM_INT); +$stmt->execute(); +while ($language = $stmt->fetch(PDO::FETCH_ASSOC)) { + echo '<option value="'.$language['id'].'"'.(($language['id'] == $user_lang) ? ' selected="selected"' : '').'>'.$language['name'].'</option>'; } ?></select>'; break; Modified: branches/danny-web/reactos.org/htdocs/roscms/js/mef.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/js/mef.js [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/js/mef.js [iso-8859-1] Sun Feb 8 16:24:23 2009 @@ -1,5 +1,4 @@ -var roscmseditorsavecache = ''; var roscms_richtexteditors = new Array(); @@ -20,7 +19,7 @@ var butid = document.getElementById(objid); var wrapid = document.getElementById('swraped'+objid.substr(6)); - if (tinyMCE.getInstanceById(id) === null) { + if (tinyMCE.getInstanceById(id) == null) { tinyMCE.execCommand('mceAddControl', false, id); butid.value = 'HTML Source'; wrapid.style.visibility = 'hidden'; @@ -58,7 +57,8 @@ function ajaxsaveContent( id ) { - if (tinyMCE.getInstanceById(id) !== null) { + + if (tinyMCE.getInstanceById(id) != null) { return tinyMCE.getInstanceById(id).getHTML(); } @@ -94,23 +94,3 @@ setWrap('off', objid); } } - - - -function ajaxLoad( ) -{ - var inst = tinyMCE.getInstanceById('elm1'); - - // Do you ajax call here - inst.setHTML('HTML content that got passed from server.'); -} - - - -function ajaxSave( ) -{ - var inst = tinyMCE.getInstanceById('elm1'); - - // Do you ajax call here - alert(inst.getHTML()); -} Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_EntryTable… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_EntryTable… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_EntryTable… [iso-8859-1] Sun Feb 8 16:24:23 2009 @@ -41,8 +41,8 @@ parent::__construct(); // update one tag - if ($_GET['d_fl'] == 'updatetag') { - echo $this->updateTag(); + if ($_GET['d_fl'] == 'setbookmark') { + echo $this->setBookmark(); } // update a list (if there a entries selected) @@ -76,7 +76,7 @@ } // go through all selected revisions - $stmt=&DBConnection::getInstance()->prepare("SELECT lang_id, version, data_id, id, user_id, status FROM ".ROSCMST_REVISIONS." WHERE id IN(".$id_list.") LIMIT 1"); + $stmt=&DBConnection::getInstance()->prepare("SELECT lang_id, version, data_id, id, user_id, status FROM ".ROSCMST_REVISIONS." WHERE id IN(".$id_list.")"); $stmt->execute(); while ($revision = $stmt->fetch(PDO::FETCH_ASSOC)) { @@ -132,11 +132,10 @@ * @return int * @access private */ - private function updateTag( ) - { - Tag::deleteByName($_GET['rev'], $_GET['tag_name'] , $_GET['user']); - Tag::add($_GET['rev'], $_GET['tag_name'] , $_GET['tag_value'], $_GET['user']); - return Tag::getId($_GET['rev'], $_GET['tag_value'], $_GET['user']); + private function setBookmark( ) + { + Tag::deleteByName($_GET['rev'], 'star', ThisUser::getInstance()->id() ); + Tag::add($_GET['rev'], 'star' , $_GET['tag_value'], ThisUser::getInstance()->id()); } @@ -152,33 +151,34 @@ { $thisuser = &ThisUser::getInstance(); + // able to delete this entry ? + if (!$thisuser->hasAccess('del_entry') && ($revision['user_id'] != $thisuser->id() || $revision['version']>0)) { + echo 'Not enough rights for delete process.'; + return false; + } + + // delete own entries ? + if ($revision['user_id'] == $thisuser->id() && $revision['version'] == 0 ) { + return Revision::delete($revision['id']); + } + // access to this entry ? if (!$thisuser->hasAccess('more_lang') && $revision['lang_id'] != $thisuser->language()) { echo 'You have no rights to delete entries from other languages'; return false; } - // able to delete this entry ? - if (!$thisuser->hasAccess('del_entry') && ($revision['user_id'] != $thisuser->id() || $revision['version']>0)) { - echo 'Not enough rights for delete process.'; - return false; - } - // entries need to be backuped if (!$thisuser->hasAccess('del_wo_archiv')) { return Revision::toArchive($revision['id']); } - // - elseif ($revision['version']) { - return Revision::delete($revision['id']); - } - // delete everything else { - Revision::deleteFile($revision['id']); + //Data::deleteFile($revision['id']); return Revision::delete($revision['id']); } + } // end of member function deleteEntry @@ -285,21 +285,24 @@ // update depencies for new rev $depency = new Depencies(); if (!$depency->addRevision($revision['id'])) { - echo 'Can\'t generate updated entry.'; - return false; - } + echo 'Error while updating depencies'; + return false; + } + + // make entry stable + Revision::setStatus($revision['id'],'stable'); // generate content $generate = new Generate(); if (!$generate->update($revision['id'])) { + Revision::setStatus($revision['id'],$revision['status']); echo 'Can\'t generate updated entry.'; return false; } Log::writeLow('mark entry as stable: data-id '.$revision['data_id'].', rev-id '.$revision['id']); - // make entry stable - return Revision::setStatus($revision['id'],'stable'); + return true; } // end of member function markStable Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_QuickInfo.… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_QuickInfo.… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_QuickInfo.… [iso-8859-1] Sun Feb 8 16:24:23 2009 @@ -47,7 +47,7 @@ private function getInfo( ) { // get current revision - $stmt=&DBConnection::getInstance()->prepare("SELECT u.name AS user_name, l.name AS language, r.data_id, d.name, d.type, a.name AS acl, r.id, r.version, datetime FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id = d.id JOIN ".ROSCMST_USERS." u ON r.user_id=u.id JOIN ".ROSCMST_LANGUAGES." l ON l.id=r.lang_id JOIN ".ROSCMST_ACCESS." a ON a.id=d.access_id WHERE r.id = :rev_id LIMIT 1"); + $stmt=&DBConnection::getInstance()->prepare("SELECT u.name AS user_name, l.name AS language, r.data_id, d.name, d.type, a.name AS acl, r.id, r.version, datetime, status FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id = d.id JOIN ".ROSCMST_USERS." u ON r.user_id=u.id JOIN ".ROSCMST_LANGUAGES." l ON l.id=r.lang_id JOIN ".ROSCMST_ACCESS." a ON a.id=d.access_id WHERE r.id = :rev_id LIMIT 1"); $stmt->bindParam('rev_id',$_GET['d_r_id'],PDO::PARAM_INT); $stmt->execute(); $revision = $stmt->fetchOnce(PDO::FETCH_ASSOC); @@ -65,6 +65,7 @@ // start to echo metadata echo $t_s.'Name'.$t_e . wordwrap($revision['name'],14,'<br />',1).$t_lb; echo $t_s.'Type'.$t_e . $revision['type'].$t_lb; + echo $t_s.'Status'.$t_e . $revision['status'].$t_lb; echo $t_s.'Version'.$t_e . $revision['version'].$t_lb; echo $t_s.'Lang'.$t_e . $revision['language'].$t_lb; echo $t_s.'User'.$t_e . wordwrap($revision['user_name'],13,'<br />',1).$t_lb; Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_SaveDraft.… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_SaveDraft.… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_SaveDraft.… [iso-8859-1] Sun Feb 8 16:24:23 2009 @@ -57,6 +57,10 @@ { $thisuser = &ThisUser::getInstance(); $rev_id = 0; // helper var, contains current rev_id in force + + if (!$thisuser->hasAccess('more_lang') && $_GET['lang_id'] != $thisuser->language()) { + die ('Can\'t save drafts of other than your language, due to access restrictions'); + } // detect if theres already a autosave-draft saved, and get rev_id $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_REVISIONS." WHERE data_id = :data_id AND user_id = :user_id AND lang_id = :lang AND archive IS FALSE AND status = 'draft' ORDER BY id DESC LIMIT 1"); @@ -67,7 +71,7 @@ $draft_candidate = $stmt->fetchColumn(); // if there is a valid value returned, use it as rev_id - if ($draft_candidate !== false) + if ($draft_candidate !== false) { $rev_id = $draft_candidate; } Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewEditor… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewEditor… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewEditor… [iso-8859-1] Sun Feb 8 16:24:23 2009 @@ -421,27 +421,33 @@ else { echo '<span class="detailmenu" onclick="'."showEditorTabMetadata(".$this->rev_id.")".'">Metadata</span>'; } - echo ' | '; // History - if ($mode == self::HISTORY) { - echo '<strong>History</strong>'; - } - else { - echo '<span class="detailmenu" onclick="'."showEditorTabHistory(".$this->rev_id.")".'">History</span>'; - } - echo ' | '; + if (Entry::hasAccess($this->data_id,'history')) { + echo ' | '; + + if ($mode == self::HISTORY) { + echo '<strong>History</strong>'; + } + else { + echo '<span class="detailmenu" onclick="'."showEditorTabHistory(".$this->rev_id.")".'">History</span>'; + } + } // Depencies - if ($mode == self::DEPENCIES) { - echo '<strong>Depencies</strong>'; - } - else { - echo '<span class="detailmenu" onclick="'."showEditorTabDepencies(".$this->rev_id.")".'">Depencies</span>'; + if (Entry::hasAccess($this->data_id,'depencies')) { + echo ' | '; + + if ($mode == self::DEPENCIES) { + echo '<strong>Depencies</strong>'; + } + else { + echo '<span class="detailmenu" onclick="'."showEditorTabDepencies(".$this->rev_id.")".'">Depencies</span>'; + } } // allowed only for someone with "add" rights - if ($thisuser->hasAccess('entry_fields')) { + if (Entry::hasAccess($this->data_id,'fields')) { echo ' | '; // Fields @@ -454,7 +460,7 @@ } // Revision Data - if ($thisuser->hasAccess('entry_revs')) { + if (Entry::hasAccess($this->data_id,'revision')) { echo ' | '; // Revision @@ -495,7 +501,7 @@ $this->showEntryDepencies($this->data_id); break; case self::SECURITY: - $this->showEntryDetailsSecurity(); + $this->showEntryDetailsEntry(); break; case self::FIELDS: $this->showEntryDetailsFields(); @@ -708,11 +714,11 @@ /** - * Interface to modify security settings - * - * @access private - */ - private function showEntryDetailsSecurity( ) + * Interface to modify entry settings + * + * @access private + */ + private function showEntryDetailsEntry( ) { // entry details $stmt=&DBConnection::getInstance()->prepare("SELECT id, name, type, access_id FROM ".ROSCMST_ENTRIES." WHERE id = :data_id LIMIT 1"); Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewEntryT… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewEntryT… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewEntryT… [iso-8859-1] Sun Feb 8 16:24:23 2009 @@ -61,7 +61,7 @@ $this->generateFilterSQL($_GET['d_filter2']); // begin to construct xml - $this->generateXML($_GET['d_cp']); + $this->generateXML(@$_GET['d_cp']); } // end of constructor @@ -79,7 +79,7 @@ // convert requested columns to array $this->column_list = substr($this->column_list,1,-1);// prevent from additional entries caused by '|' at start and end - if ($this->column_list === '') { + if ($this->column_list === false) { $column_array = array(); } else { @@ -105,7 +105,7 @@ echo $ptm_entries.'<table>'; // start table header - echo '<view curpos="'.$page_offset.'" pagelimit="'.$this->page_limit.'" pagemax="'.$ptm_entries.'" tblcols="|'.$this->column_list.'|" />'; + echo '<view curpos="'.$page_offset.'" pagelimit="'.$this->page_limit.'" pagemax="'.$ptm_entries.'" tblcols="'.($this->column_list !== false ? '|'.$this->column_list.'|' : '').'" />'; // prepare for usage in loop $stmt_trans=&DBConnection::getInstance()->prepare("SELECT r.data_id, d.name, d.type, r.id, r.version, r.lang_id, r.datetime, r.user_id FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id=d.id WHERE d.id = :data_id AND r.version > 0 AND r.lang_id = :lang AND r.archive = :archive LIMIT 1"); @@ -134,7 +134,7 @@ $star_state = '0'; $star_id = 0; $line_status = 'unknown'; - $column_list_row = ''; + $column_list_row = null; $security = ''; // for non translation @@ -217,7 +217,7 @@ $stmt_lang->bindParam('lang',$row['lang_id'],PDO::PARAM_STR); $stmt_lang->execute(); $language = $stmt_lang->fetchColumn(); - if ($language != '') { + if ($language !== false) { $column_list_row .= $language; } else { @@ -228,7 +228,7 @@ $stmt_user->bindParam('user_id',$row['user_id'],PDO::PARAM_INT); $stmt_user->execute(); $user_name = $stmt_user->fetchColumn(); - if ($user_name != '') { + if ($user_name !== false) { $column_list_row .= $user_name; } else { @@ -242,7 +242,7 @@ $stmt_acl->bindParam('access_id',$row['access_id'],PDO::PARAM_INT); $stmt_acl->execute(); $acl = $stmt_acl->fetchColumn(); - if ($acl != '') { + if ($acl !== false) { $column_list_row .= $acl; } else { @@ -260,7 +260,9 @@ break; } } // foreach - $column_list_row .= '|'; + if ($column_list_row !== null) { + $column_list_row .= '|'; + } // has person right to write / edit entries ? if (Entry::hasAccess($row['data_id'], 'edit')) { Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewPrevie… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewPrevie… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewPrevie… [iso-8859-1] Sun Feb 8 16:24:23 2009 @@ -53,7 +53,7 @@ private function show( $rev_id ) { echo_strip(' - <iframe style="width:100%;height:600px;background-color: white;border: 1px solid black;" src="?page=backend&type=page&rev='.$rev_id.'"></iframe>'); + <iframe style="width:100%;height:600px;background-color: white;border: 1px solid black;" src="?page=backend&type=text&subtype=prv&rev='.$rev_id.'"></iframe>'); } // end of member function show Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/om/Entry.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/Entry.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/om/Entry.class.php [iso-8859-1] Sun Feb 8 16:24:23 2009 @@ -182,15 +182,12 @@ if ($data_id === false) { // insert new data - $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_ENTRIES." ( id , name , type ) VALUES ( NULL , :name, :type )"); - $stmt->bindParam('name',$data_name,PDO::PARAM_STR); - $stmt->bindParam('type',$data_type,PDO::PARAM_STR); - $stmt->execute(); - - // and get new data_id - $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_ENTRIES." WHERE name = :name AND type = :type LIMIT 1"); - $stmt->bindParam('name',$data_name,PDO::PARAM_STR); - $stmt->bindParam('type',$data_type,PDO::PARAM_STR); + $stmt_ins=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_ENTRIES." ( id , name , type ) VALUES ( NULL , :name, :type )"); + $stmt_ins->bindParam('name',$data_name,PDO::PARAM_STR); + $stmt_ins->bindParam('type',$data_type,PDO::PARAM_STR); + $stmt_ins->execute(); + + // and get new data_id (use old used statement again) $stmt->execute(); $data_id = $stmt->fetchColumn(); } Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/om/Generate.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/Generate.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/om/Generate.class.php [iso-8859-1] Sun Feb 8 16:24:23 2009 @@ -1,8 +1,8 @@ <?php /* RosCMS - ReactOS Content Management System - Copyright (C) 2007 Klemens Friedl <frik85(a)reactos.org> - 2008 Danny Götte <dangerground(a)web.de> + Copyright (C) 2007 Klemens Friedl <frik85(a)reactos.org> + 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 @@ -128,9 +128,6 @@ $this->cacheFiles(); } - // we need to reset this, as cacheFiles() overwrites this setting - $this->base_dir = $this->destination_folder; - // build all entries if ($id === null) { $stmt=&DBConnection::getInstance()->prepare("SELECT d.name, type, l.id AS lang_id, l.name AS language, l.name_short AS lang_short FROM ".ROSCMST_ENTRIES." d CROSS JOIN ".ROSCMST_LANGUAGES." l WHERE (d.type = 'page' OR d.type = 'dynamic') ORDER BY l.level DESC, l.id ASC, d.name ASC"); @@ -256,7 +253,7 @@ * @return bool * @access private */ - private function makeDynamic( $data_name ) + private function makeDynamic( $data_name, $number = null ) { // get page data $revision = $this->getFrom('dynamic', $data_name); @@ -273,13 +270,26 @@ return false; } - // get last index - $next_index = (int)Tag::getValue($revision['id'],'next_index',-1); - - for ($i=1; $i < $next_index; ++$i) { + // generate all numbers + if ($number === null) { + // get last index + $next_index = (int)Tag::getValue($revision['id'],'next_index',-1); + $start = 1; + } + + // generate only one number + else { + $start = $number; + $next_index = $start + 1; + } + + for ($i=$start; $i < $next_index; ++$i) { // get file name $file_name = $data_name.'_'.$i.'.'.$file_extension; + + // information, what was generated + echo $this->lang_id.'--'.$file_name.'<br />'; // can I copy from standard lang ? if (!$this->cloneFile(RosCMS::getInstance()->siteLanguage(), $this->lang, $file_name)) { @@ -332,7 +342,6 @@ // cache revision (set language, cache, restore base_dir) $this->lang_id = $revision['lang_id']; $this->cacheFiles($revision['data_id']); - $this->base_dir = $this->destination_folder; // for usage in loop // in standard language we may have depencies to other languages, so better generate them all @@ -345,10 +354,19 @@ } // get list of entries which depend on this one and handle their types - $stmt=&DBConnection::getInstance()->prepare("SELECT r.lang_id, d.name, d.type, r.id FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_REVISIONS." r ON r.id=w.rev_id JOIN ".ROSCMST_ENTRIES." d ON d.id=r.data_id WHERE w.child_id=:depency_id AND w.rev_id NOT IN(:rev_id,:rev_id2) AND r.archive IS FALSE AND w.include IS TRUE"); + $stmt=&DBConnection::getInstance()->prepare(" + SELECT + org.name, org.type, COALESCE( trans.id, org.id ) AS id, org.data_id + FROM ( + SELECT d.name, d.type, r.id, r.data_id FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_REVISIONS." r ON r.id=w.rev_id JOIN ".ROSCMST_ENTRIES." d ON d.id=r.data_id WHERE w.child_id=:depency_id AND r.lang_id = :standard_lang AND w.rev_id NOT IN(:rev_id,:rev_id2) AND r.archive IS FALSE AND w.include IS TRUE + ) AS org LEFT OUTER JOIN ( + SELECT d.name, d.type, r.id, r.data_id FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_REVISIONS." r ON r.id=w.rev_id JOIN ".ROSCMST_ENTRIES." d ON d.id=r.data_id WHERE w.child_id=:depency_id AND r.lang_id = :lang_id AND w.rev_id NOT IN(:rev_id,:rev_id2) AND r.archive IS FALSE AND w.include IS TRUE + ) AS trans ON org.data_id = trans.data_id"); $stmt->bindParam('depency_id',$revision['data_id'],PDO::PARAM_INT); $stmt->bindParam('rev_id',$base_rev,PDO::PARAM_INT); $stmt->bindParam('rev_id2',$rev_id,PDO::PARAM_INT); + $stmt->bindParam('standard_lang',Language::getStandardId(),PDO::PARAM_INT); + $stmt->bindParam('lang_id',$revision['lang_id'],PDO::PARAM_INT); $stmt->execute(); while ($depency = $stmt->fetch(PDO::FETCH_ASSOC)) { @@ -356,7 +374,7 @@ switch ($depency['type']) { case 'page': case 'dynamic': - + // generate pages for all languages, if standard lang, otherwise only once $stmt_lang->execute(); while ($language = $stmt_lang->fetch(PDO::FETCH_ASSOC)) { @@ -379,6 +397,7 @@ // scripts are only executed in pages break; default: + // only run update once per $rev_id $this->update($depency['id']); break; @@ -398,7 +417,14 @@ */ private function cacheFiles( $data_id = null, $depencies = true ) { - $this->base_dir = $this->cache_dir; + // set dir to generate contents + static $backup; + static $first; + if (empty($backup)){ + $backup = $this->base_dir; + $first = $data_id; + $this->base_dir = $this->cache_dir; + } if ($data_id === null) { $stmt=&DBConnection::getInstance()->prepare("SELECT d.id AS data_id, d.type, d.name, l.id AS lang_id FROM ".ROSCMST_ENTRIES." d CROSS JOIN ".ROSCMST_LANGUAGES." l WHERE d.type = 'content' OR d.type = 'script' OR d.type='template' ORDER BY l.level DESC"); @@ -463,6 +489,11 @@ $this->writeFile($data['lang_id'],$filename, $content); } } // end while + + // reset old build path + if ($first == $data_id) { + $this->base_dir = $backup; + } } // end of member function cacheFiles @@ -557,23 +588,22 @@ private function getFrom( $type, $name ) { // get entry - $stmt=&DBConnection::getInstance()->prepare("SELECT t.content, r.id, r.lang_id, r.version FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id = d.id JOIN ".ROSCMST_TEXT." t ON t.rev_id = r.id WHERE d.name = :name AND d.type = :type AND r.version > 0 AND r.lang_id IN(:lang_one, :lang_two) AND r.archive IS FALSE AND t.name = 'content' AND r.status='stable' ORDER BY r.version DESC LIMIT 2"); + $stmt=&DBConnection::getInstance()->prepare("SELECT t.content, r.id, r.lang_id, r.version, r.status FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id = d.id JOIN ".ROSCMST_TEXT." t ON t.rev_id = r.id WHERE d.name = :name AND d.type = :type AND r.version > 0 AND r.lang_id = :lang_id AND r.archive IS FALSE AND t.name = 'content' AND status='stable' LIMIT 1"); $stmt->bindParam('name',$name,PDO::PARAM_STR); $stmt->bindParam('type',$type,PDO::PARAM_STR); - $stmt->bindParam('lang_one',$this->lang_id,PDO::PARAM_INT); - $stmt->bindParam('lang_two',Language::getStandardId(),PDO::PARAM_INT); - $stmt->execute(); - $results=$stmt->fetchAll(PDO::FETCH_ASSOC); + $stmt->bindParam('lang_id',$this->lang_id,PDO::PARAM_INT); + $stmt->execute(); + $revision=$stmt->fetch(PDO::FETCH_ASSOC); // check if depency not available - if (count($results) === 0){ - return false; - } - - // try to get the dataset with lang_id == $lang, to boost the translated content - $revision = $results[0]; - if (count($results) === 2 && $revision['lang_id'] == Language::getStandardId() ) { - $revision = $results[1]; + if ($revision === false) { + $stmt->bindParam('lang_id',Language::getStandardId(),PDO::PARAM_INT); + $stmt->execute(); + $revision=$stmt->fetch(PDO::FETCH_ASSOC); + + if ($revision === false) { + return false; + } } return $revision; } @@ -626,14 +656,11 @@ */ private function cloneFile( $source_folder, $dest_folder, $filename ) { - $standard_id = Language::getStandardId(); - // check, if language is different than standard and if requested file exists - if ($this->lang_id != $standard_id && file_exists($this->base_dir.$source_folder.'/'.$filename)) { + if ($this->lang_id != Language::getStandardId() && file_exists($this->base_dir.$source_folder.'/'.$filename)) { return copy($this->base_dir.$source_folder.'/'.$filename, $this->base_dir.$dest_folder.'/'.$filename); } return false; - } // end of member function cloneFile @@ -648,7 +675,7 @@ private function getCached( $matches ) { // get cached content - $fh = fopen($this->cache_dir.$this->lang_id.'/'.$matches[1].'.rcf', 'r'); + $fh = @fopen($this->cache_dir.$this->lang_id.'/'.$matches[1].'.rcf', 'r'); if ($fh !== false){ $content = fread($fh, filesize($this->cache_dir.$this->lang_id.'/'.$matches[1].'.rcf')+1); fclose($fh); @@ -656,7 +683,7 @@ // fail else { - $content = '[#'.$matches[1].']'; + $content = '[#'.$matches[1].'--'.$this->cache_dir.$this->lang_id.'/'.$matches[1].'.rcf'.']'; } return $content; @@ -672,9 +699,10 @@ * @access private */ private function evalTemplate( $matches ) - { - $revision = $this->getFrom('script',$matches[1]); - + { + // get entry + $revision=$this->getFrom('script',$matches[1]); + // execute php code if( Tag::getValue($revision['id'], 'kind',-1) == 'php') { @@ -688,12 +716,12 @@ // execute code and return the output eval('?>'.$revision['content']); $content = ob_get_contents(); - ob_end_clean(); + ob_end_clean(); } // no other script types supported -> return nothing else { - $content = ''; + $content = $revision['content']; } // replace roscms links Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/om/Log.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/Log.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/om/Log.class.php [iso-8859-1] Sun Feb 8 16:24:23 2009 @@ -180,7 +180,7 @@ // insert long text $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_TEXT." ( id , rev_id , name , content ) VALUES (NULL, :rev_id, :name, :content)"); $stmt->bindParam('rev_id',$rev_id,PDO::PARAM_INT); - $stmt->bindValue('content',$entry,PDO::PARAM_STR); + $stmt->bindValue('content','',PDO::PARAM_STR); // insert all three $stmt->bindValue('name','low',PDO::PARAM_INT); @@ -229,7 +229,12 @@ * @access public */ public static function read($level = 'medium', $log = '' ) { - return Entry::getContent('log_website_'.($log!=''?$log.'_':'').date('Y-W'), 'system', Language::getStandardId(), $level.'_security_log', 'text'); + $stmt=&DBConnection::getInstance()->prepare("SELECT t.content FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id = d.id JOIN ".ROSCMST_TEXT." t ON t.rev_id=r.id WHERE d.name = :name AND d.type = 'system' AND r.lang_id = :lang AND t.name = :type ORDER BY r.datetime DESC LIMIT 1"); + $stmt->bindValue('name','log_website_'.($log!=''?$log.'_':'').date('Y-W'),PDO::PARAM_STR); + $stmt->bindParam('type',$level,PDO::PARAM_STR); + $stmt->bindParam('lang',Language::getStandardId(),PDO::PARAM_INT); + $stmt->execute(); + return $stmt->fetchColumn(); } // end of member function read Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/om/Revision.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/Revision.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/om/Revision.class.php [iso-8859-1] Sun Feb 8 16:24:23 2009 @@ -155,10 +155,10 @@ */ public static function delete( $rev_id ) { - Log::writeMedium("delete entry: rev-id [rev-id: ".$rev_id."]"); + Log::writeMedium('delete entry: rev-id [rev-id: '.$rev_id.']'); // delete Depencies - $success = $success && Depencies::removeRevision($rev_id); + $success = Depencies::removeRevision($rev_id); // delete revision and texts $stmt=&DBConnection::getInstance()->prepare("DELETE FROM ".ROSCMST_REVISIONS." WHERE id = :rev_id LIMIT 1"); @@ -369,17 +369,13 @@ if ($rev_id === false) { // create new revision - $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_REVISIONS." ( id , data_id , version , lang_id , user_id , datetime, status ) VALUES ( NULL, :data_id, 0, :lang, :user_id, NOW(), 'draft')"); - $stmt->bindParam('data_id',$data_id,PDO::PARAM_INT); - $stmt->bindParam('lang',$lang_id,PDO::PARAM_INT); - $stmt->bindParam('user_id',$thisuser_id,PDO::PARAM_INT); - $stmt->execute(); - - // get new revision id - $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_REVISIONS." WHERE data_id = :data_id AND version = 0 AND lang_id = :lang AND user_id = :user_id AND status='draft' ORDER BY datetime DESC LIMIT 1"); - $stmt->bindParam('data_id',$data_id,PDO::PARAM_INT); - $stmt->bindParam('lang',$lang_id,PDO::PARAM_INT); - $stmt->bindParam('user_id',$thisuser_id,PDO::PARAM_INT); + $stmt_ins=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_REVISIONS." ( id , data_id , version , lang_id , user_id , datetime, status ) VALUES ( NULL, :data_id, 0, :lang, :user_id, NOW(), 'draft')"); + $stmt_ins->bindParam('data_id',$data_id,PDO::PARAM_INT); + $stmt_ins->bindParam('lang',$lang_id,PDO::PARAM_INT); + $stmt_ins->bindParam('user_id',$thisuser_id,PDO::PARAM_INT); + $stmt_ins->execute(); + + // get new revision id (use old used statement again) $stmt->execute(); // return new revision id @@ -421,6 +417,11 @@ */ public static function translate( $rev_id, $lang_id = 0 ) { + // can translate to this language ? + if (!ThisUser::getInstance()->hasAccess('more_lang') && $lang_id != ThisUser::getInstance()->language()) { + die ('You\'ve no rights to translate into this language'.$lang_id.'--'.ThisUser::getInstance()->language()); + } + // original_revision $stmt=&DBConnection::getInstance()->prepare("SELECT id, data_id, lang_id FROM ".ROSCMST_REVISIONS." WHERE id = :rev_id LIMIT 1"); $stmt->bindParam('rev_id',$rev_id,PDO::PARAM_INT); @@ -433,11 +434,11 @@ } // insert translated revision - $new_rev_id = Revision::add($revision['data_id'],$lang_id); + $new_rev_id = self::add($revision['data_id'],$lang_id); // check if copy process was successfull if ($new_rev_id === false) { - die('copy-process of data_revision not successful'); + die('Copy-process of data_revision not successful, maybe you\'ve that entry already as a draft.'); } // copy short text Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/om/Tag.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/Tag.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/om/Tag.class.php [iso-8859-1] Sun Feb 8 16:24:23 2009 @@ -25,6 +25,7 @@ */ class Tag { + /** @@ -50,6 +51,7 @@ } // end of member function getId + /** * wrapper for deleteById * @@ -64,6 +66,7 @@ $tag_id = self::getId($rev_id, $tag_name, $user_id); return self::deleteById($tag_id); } // end of member function deleteByName + /** @@ -93,6 +96,7 @@ } // end of member function deleteById + /** * add a new tag * @@ -105,7 +109,8 @@ */ public static function add( $rev_id, $tag_name, $tag_value, $user_id ) { - if ($user_id != ThisUser::getInstance()->id() && !($user_id == -1 && ThisUser::getInstance()->hasAccess('system_tags'))) { + // check if user has rights to add this type of tag + if ($user_id != ThisUser::getInstance()->id() && ($user_id != -1 || !ThisUser::getInstance()->hasAccess('system_tags'))) { die('ERROR: no rights to access this function'); } @@ -132,6 +137,7 @@ } // end of member function add + /** * updates a given tag with new value * @@ -160,6 +166,7 @@ } // end of member function update + /** * copies tags from old-data to new-data * @@ -170,14 +177,36 @@ */ public static function copyFromRevision( $old_rev_id, $new_rev_id ) { - - // prepare statements for while loop - $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_TAGS." ( rev_id , name, value, user_id ) SELECT :new_rev_id, name, value, user_id FROM ".ROSCMST_TAGS." WHERE rev_id = :old_rev_id"); + // prepare insert for usage in loop + $stmt_ins=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_TAGS." ( id , rev_id , name , value , user_id ) VALUES (NULL, :rev_id, :tag_name, :tag_value, :user_id)"); + $stmt_ins->bindParam('rev_id',$new_rev_id,PDO::PARAM_INT); + + // check each old tag + $stmt=&DBConnection::getInstance()->prepare("SELECT name, value, user_id FROM ".ROSCMST_TAGS." WHERE rev_id = :old_rev_id"); $stmt->bindParam('old_rev_id',$old_rev_id, PDO::PARAM_INT); - $stmt->bindParam('new_rev_id',$new_rev_id, PDO::PARAM_INT); - return $stmt->execute(); - + $success = $stmt->execute(); + while ($old = $stmt->fetch(PDO::FETCH_ASSOC)) { + $tag_id = Tag::getId($new_rev_id, $old['name'], $old['user_id']); + + // check if tag already exists + if ($tag_id == false) { // could be 0 + + // tag doesn't exist -> insert new + $stmt_ins->bindParam('tag_name',$old['name'],PDO::PARAM_STR); + $stmt_ins->bindParam('tag_value',$old['value'],PDO::PARAM_STR); + $stmt_ins->bindParam('user_id',$old['user_id'],PDO::PARAM_INT); + $success = $success && $stmt_ins->execute(); + } + else { + + // update old tag with new value + $success = $success && Tag::update($tag_id, $old['value']); + } + } + + return ; } // end of member function copyFromRevision + /** @@ -203,6 +232,7 @@ } // end of member function getValue + /** * returns revision id * @@ -222,5 +252,6 @@ } // end of member function getRevision + } // end of Tag ?> 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] Sun Feb 8 16:24:23 2009 @@ -57,10 +57,6 @@ protected function body( ) { echo_strip(' - <br /> - <h2>Maintain</h2> - <p><b>RosCMS Maintainer Interface</b></p> - <br /> <p><a href="javascript:optimizeDB()">Optimize Database Tables</a></p> <br /> <p><a href="javascript:rebuildDepencies()">Rebuild Depency Tree</a></p> Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_User.class.p… 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_User.class.p… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_User.class.p… [iso-8859-1] Sun Feb 8 16:24:23 2009 @@ -60,19 +60,17 @@ echo_strip(' <br /> - <h2>User</h2> - <p style="font-weight: bold;">User Account Management Interface</p> + <fieldset> + <legend>User search</legend> + <label for="textfield">Username: </label><input type="text" name="textfield" id="textfield" onkeyup="getUser()" /><br /> + <input name="searchopt" type="radio" id="searchopt1" value="accountname" checked="checked" onclick="getUser()" /><label for="searchopt1">account name</label> + <input name="searchopt" type="radio" id="searchopt2" value="fullname" onclick="getUser()" /><label for="searchopt2">full name </label> + <input name="searchopt" type="radio" id="searchopt3" value="email" onclick="getUser()" /><label for="searchopt3">email address</label> + <input name="searchopt" type="radio" id="searchopt4" value="website" onclick="getUser()" /><label for="searchopt4">website</label>'.($thisuser->hasAccess('more_lang') ? ' + <input name="searchopt" type="radio" id="searchopt5" value="language" onclick="getUser()" /><label for="searchopt5">language</label>' : '').' + <img id="ajaxloading" style="display:none;" src="images/ajax_loading.gif" width="13" height="13" alt="" /><br /> + </fieldset> <br /> - <div> - <label for="textfield">Username: </label><input type="text" name="textfield" id="textfield" onkeyup="getUser()" /><br /> - <input name="searchopt" type="radio" id="searchopt1" value="accountname" checked="checked" onclick="getUser()" /><label>account name</label> - <input name="searchopt" type="radio" id="searchopt2" value="fullname" onclick="getUser()" /><label>full name </label> - <input name="searchopt" type="radio" id="searchopt3" value="email" onclick="getUser()" /><label>email address</label> - <input name="searchopt" type="radio" id="searchopt4" value="website" onclick="getUser()" /><label>website</label>'.($thisuser->hasAccess('more_lang') ? ' - <input name="searchopt" type="radio" id="searchopt5" value="language" onclick="getUser()" /><label>language</label>' : '').' - <img id="ajaxloading" style="display:none;" src="images/ajax_loading.gif" width="13" height="13" alt="" /><br /> - <br /> - </div> <div id="userarea"></div> <br /> <br /> 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] Sun Feb 8 16:24:23 2009 @@ -281,7 +281,14 @@ <select name="favlangopt" id="favlangopt" style="vertical-align: top; width: 22ex;" onchange="setLang(this.value)">'); // preselect current user language - $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." 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'].'"';

1 0

[cwittich] 39503: add -H to compilerflags for resolving header issues (as comment)
by cwittich＠svn.reactos.org 08 Feb '09

08 Feb '09

Author: cwittich Date: Sun Feb 8 14:47:30 2009 New Revision: 39503 URL: http://svn.reactos.org/svn/reactos?rev=39503&view=rev Log: add -H to compilerflags for resolving header issues (as comment) Modified: trunk/reactos/ReactOS-i386.rbuild Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=39… ============================================================================== --- trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] Sun Feb 8 14:47:30 2009 @@ -40,6 +40,7 @@ <compilerflag>-fno-strict-aliasing</compilerflag> <compilerflag>-Wno-strict-aliasing</compilerflag> <compilerflag>-Wpointer-arith</compilerflag> +  <linkerflag>-disable-stdcall-fixup</linkerflag> </project>

1 0

[cwittich] 39502: -remove wingdi.h from wine/winuser.h -define NOGDI for some wine dlls (this should be fixed in wine) -move wine specific window messages to internal user32 header -fix devenum includes -remove some wrong include guards in windows.h -remove the GetObjectW hack from jscript.dll
by cwittich＠svn.reactos.org 08 Feb '09

08 Feb '09

Author: cwittich Date: Sun Feb 8 14:38:16 2009 New Revision: 39502 URL: http://svn.reactos.org/svn/reactos?rev=39502&view=rev Log: -remove wingdi.h from wine/winuser.h -define NOGDI for some wine dlls (this should be fixed in wine) -move wine specific window messages to internal user32 header -fix devenum includes -remove some wrong include guards in windows.h -remove the GetObjectW hack from jscript.dll Modified: trunk/reactos/dll/directx/devenum/devenum_private.h trunk/reactos/dll/directx/dinput/dinput.rbuild trunk/reactos/dll/directx/dplayx/dplayx.rbuild trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild trunk/reactos/dll/win32/jscript/global.c trunk/reactos/dll/win32/jscript/jscript.rbuild trunk/reactos/dll/win32/user32/include/message.h trunk/reactos/include/psdk/windows.h trunk/reactos/include/psdk/winuser.h trunk/reactos/include/reactos/wine/winuser.h Modified: trunk/reactos/dll/directx/devenum/devenum_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/devenum/devenu… ============================================================================== --- trunk/reactos/dll/directx/devenum/devenum_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/devenum/devenum_private.h [iso-8859-1] Sun Feb 8 14:38:16 2009 @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winuser.h" #include "winreg.h" #include "winerror.h" Modified: trunk/reactos/dll/directx/dinput/dinput.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/dinput.… ============================================================================== --- trunk/reactos/dll/directx/dinput/dinput.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dinput/dinput.rbuild [iso-8859-1] Sun Feb 8 14:38:16 2009 @@ -4,6 +4,7 @@ <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="dinput.spec" /> <define name="_WIN32_WINNT">0x600</define> + <define name="NOGDI" /> <include base="dinput">.</include> <include base="ReactOS">include/reactos/wine</include> <library>wine</library> Modified: trunk/reactos/dll/directx/dplayx/dplayx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/dplayx.… ============================================================================== --- trunk/reactos/dll/directx/dplayx/dplayx.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dplayx/dplayx.rbuild [iso-8859-1] Sun Feb 8 14:38:16 2009 @@ -3,6 +3,7 @@ <module name="dplayx" type="win32dll" baseaddress="${BASEADDRESS_DPLAYX}" installbase="system32" installname="dplayx.dll" unicode="yes">  <importlibrary definition="dplayx.spec" /> + <define name="NOGDI" /> <include base="dplayx">.</include> <include base="ReactOS">include/reactos/wine</include> <library>wine</library> Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild [iso-8859-1] Sun Feb 8 14:38:16 2009 @@ -6,7 +6,7 @@ <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> <define name="USE_WIN32_OPENGL" /> - + <define name="NOGDI" /> <library>uuid</library> <library>wine</library> <library>user32</library> Modified: trunk/reactos/dll/win32/jscript/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/global.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/global.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/global.c [iso-8859-1] Sun Feb 8 14:38:16 2009 @@ -43,7 +43,7 @@ static const WCHAR parseIntW[] = {'p','a','r','s','e','I','n','t',0}; static const WCHAR parseFloatW[] = {'p','a','r','s','e','F','l','o','a','t',0}; static const WCHAR unescapeW[] = {'u','n','e','s','c','a','p','e',0}; -static const WCHAR getObjectW[] = {'G','e','t','O','b','j','e','c','t',0}; +static const WCHAR GetObjectW[] = {'G','e','t','O','b','j','e','c','t',0}; static const WCHAR ScriptEngineW[] = {'S','c','r','i','p','t','E','n','g','i','n','e',0}; static const WCHAR ScriptEngineMajorVersionW[] = {'S','c','r','i','p','t','E','n','g','i','n','e','M','a','j','o','r','V','e','r','s','i','o','n',0}; @@ -298,7 +298,7 @@ {DateW, JSGlobal_Date, PROPF_CONSTR}, {EnumeratorW, JSGlobal_Enumerator, PROPF_METHOD}, {FunctionW, JSGlobal_Function, PROPF_CONSTR}, - {getObjectW, JSGlobal_GetObject, PROPF_METHOD}, + {GetObjectW, JSGlobal_GetObject, PROPF_METHOD}, {InfinityW, JSGlobal_Infinity, 0}, /* {MathW, JSGlobal_Math, 0}, */ {NaNW, JSGlobal_NaN, 0}, Modified: trunk/reactos/dll/win32/jscript/jscript.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.… ============================================================================== --- trunk/reactos/dll/win32/jscript/jscript.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jscript.rbuild [iso-8859-1] Sun Feb 8 14:38:16 2009 @@ -6,6 +6,7 @@ <include base="jscript" root="intermediate">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <define name="RPC_NO_WINDOWS_H" /> <dependency>jsglobal</dependency> <library>wine</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/user32/include/message.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/m… ============================================================================== --- trunk/reactos/dll/win32/user32/include/message.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/message.h [iso-8859-1] Sun Feb 8 14:38:16 2009 @@ -12,4 +12,7 @@ BOOL FASTCALL MessageInit(VOID); VOID FASTCALL MessageCleanup(VOID); +#define WM_ALTTABACTIVE 0x0029 +#define WM_SETVISIBLE 0x0009 + #endif /* LIB_USER32_INCLUDE_MESSAGE_H */ Modified: trunk/reactos/include/psdk/windows.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windows.h?rev… ============================================================================== --- trunk/reactos/include/psdk/windows.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windows.h [iso-8859-1] Sun Feb 8 14:38:16 2009 @@ -40,13 +40,9 @@ #include <stdarg.h> #include <windef.h> #include <winbase.h> -#if !(defined NOGDI || defined _WINGDI_H) #include <wingdi.h> -#endif +#include <winuser.h> #include <wincon.h> -#ifndef _WINUSER_H -#include <winuser.h> -#endif #ifndef _WINNLS_H #include <winnls.h> #endif Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Sun Feb 8 14:38:16 2009 @@ -4483,6 +4483,7 @@ #define WinHelp WinHelpW #define wsprintf wsprintfW #define wvsprintf wvsprintfW + #ifndef NOGDI typedef ICONMETRICSW ICONMETRICS,*LPICONMETRICS; typedef NONCLIENTMETRICSW NONCLIENTMETRICS,*LPNONCLIENTMETRICS; Modified: trunk/reactos/include/reactos/wine/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winus… ============================================================================== --- trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] Sun Feb 8 14:38:16 2009 @@ -4,8 +4,6 @@ /* * Compatibility header */ - -#include <wingdi.h> #if !defined(_MSC_VER) #include_next "winuser.h" @@ -17,7 +15,4 @@ WINUSERAPI UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT); WINUSERAPI UINT WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT); -#define WM_ALTTABACTIVE 0x0029 -#define WM_SETVISIBLE 0x0009 - #endif /* __WINE_WINUSER_H */

1 0

[gschneider] 39501: Preparation for StretchBlt pattern support: - Supply BrushObj and BrushOrigin to IntStretchBlt - Implement EngStretchBltROP to do the work, let EngStretchBlt call it (this allows ROP support for real now)
by gschneider＠svn.reactos.org 08 Feb '09

08 Feb '09

Author: gschneider Date: Sun Feb 8 14:28:20 2009 New Revision: 39501 URL: http://svn.reactos.org/svn/reactos?rev=39501&view=rev Log: Preparation for StretchBlt pattern support: - Supply BrushObj and BrushOrigin to IntStretchBlt - Implement EngStretchBltROP to do the work, let EngStretchBlt call it (this allows ROP support for real now) Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Sun Feb 8 14:28:20 2009 @@ -771,8 +771,7 @@ IN RECTL *prclDest, IN RECTL *prclSrc, IN POINTL *MaskOrigin, - IN ULONG Mode -) + IN ULONG Mode) { COLORADJUSTMENT ca; POINTL lBrushOrigin; @@ -807,6 +806,179 @@ return EngStretchBlt(psoDest, psoSource, Mask, ClipRegion, ColorTranslation, &ca, &lBrushOrigin, &rclDest, &rclSrc, &lMaskOrigin, Mode); } +/* + * @implemented + */ +BOOL +APIENTRY +EngStretchBltROP( + IN SURFOBJ *psoDest, + IN SURFOBJ *psoSource, + IN SURFOBJ *Mask, + IN CLIPOBJ *ClipRegion, + IN XLATEOBJ *ColorTranslation, + IN COLORADJUSTMENT *pca, + IN POINTL *BrushOrigin, + IN RECTL *prclDest, + IN RECTL *prclSrc, + IN POINTL *MaskOrigin, + IN ULONG Mode, + IN BRUSHOBJ *Brush, + IN DWORD ROP4) +{ + RECTL InputRect; + RECTL OutputRect; + POINTL Translate; + INTENG_ENTER_LEAVE EnterLeaveSource; + INTENG_ENTER_LEAVE EnterLeaveDest; + SURFOBJ* psoInput; + SURFOBJ* psoOutput; + PSTRETCHRECTFUNC BltRectFunc; + BOOLEAN Ret; + POINTL AdjustedBrushOrigin; + BOOL UsesSource = ROP4_USES_SOURCE(ROP4); + + if (ROP4 == R4_NOOP) + { + /* Copy destination onto itself: nop */ + return TRUE; + } + + OutputRect = *prclDest; + if (OutputRect.right < OutputRect.left) + { + OutputRect.left = prclDest->right; + OutputRect.right = prclDest->left; + } + if (OutputRect.bottom < OutputRect.top) + { + OutputRect.left = prclDest->right; + OutputRect.right = prclDest->left; + } + + InputRect = *prclSrc; + if (UsesSource) + { + if (NULL == prclSrc) + { + return FALSE; + } + + /* Make sure we don't try to copy anything outside the valid source region */ + if (InputRect.left < 0) + { + OutputRect.left -= InputRect.left; + InputRect.left = 0; + } + if (InputRect.top < 0) + { + OutputRect.top -= InputRect.top; + InputRect.top = 0; + } + + if (! IntEngEnter(&EnterLeaveSource, psoSource, &InputRect, TRUE, + &Translate, &psoInput)) + { + return FALSE; + } + + InputRect.left += Translate.x; + InputRect.right += Translate.x; + InputRect.top += Translate.y; + InputRect.bottom += Translate.y; + } + + if (NULL != ClipRegion) + { + if (OutputRect.left < ClipRegion->rclBounds.left) + { + InputRect.left += ClipRegion->rclBounds.left - OutputRect.left; + OutputRect.left = ClipRegion->rclBounds.left; + } + if (ClipRegion->rclBounds.right < OutputRect.right) + { + InputRect.right -= OutputRect.right - ClipRegion->rclBounds.right; + OutputRect.right = ClipRegion->rclBounds.right; + } + if (OutputRect.top < ClipRegion->rclBounds.top) + { + InputRect.top += ClipRegion->rclBounds.top - OutputRect.top; + OutputRect.top = ClipRegion->rclBounds.top; + } + if (ClipRegion->rclBounds.bottom < OutputRect.bottom) + { + InputRect.bottom -= OutputRect.bottom - ClipRegion->rclBounds.bottom; + OutputRect.bottom = ClipRegion->rclBounds.bottom; + } + } + + /* Check for degenerate case: if height or width of OutputRect is 0 pixels there's + nothing to do */ + if (OutputRect.right <= OutputRect.left || OutputRect.bottom <= OutputRect.top) + { + if (UsesSource) + { + IntEngLeave(&EnterLeaveSource); + } + return TRUE; + } + + if (! IntEngEnter(&EnterLeaveDest, psoDest, &OutputRect, FALSE, &Translate, &psoOutput)) + { + if (UsesSource) + { + IntEngLeave(&EnterLeaveSource); + } + return FALSE; + } + + OutputRect.left += Translate.x; + OutputRect.right += Translate.x; + OutputRect.top += Translate.y; + OutputRect.bottom += Translate.y; + + if (BrushOrigin) + { + AdjustedBrushOrigin.x = BrushOrigin->x + Translate.x; + AdjustedBrushOrigin.y = BrushOrigin->y + Translate.y; + } + else + { + AdjustedBrushOrigin = Translate; + } + + if (Mask != NULL) + { + //BltRectFunc = BltMask; + DPRINT("EngStretchBlt isn't capable of handling mask yet.\n"); + IntEngLeave(&EnterLeaveDest); + if (UsesSource) + { + IntEngLeave(&EnterLeaveSource); + } + return FALSE; + } + else + { + BltRectFunc = CallDibStretchBlt; + } + + Ret = (*BltRectFunc)(psoOutput, psoInput, Mask, ClipRegion, + ColorTranslation, &OutputRect, &InputRect, MaskOrigin, + &AdjustedBrushOrigin, ROP4); + + IntEngLeave(&EnterLeaveDest); + if (UsesSource) + { + IntEngLeave(&EnterLeaveSource); + } + + return Ret; +} + +/* + * @implemented + */ BOOL APIENTRY EngStretchBlt( @@ -820,159 +992,22 @@ IN RECTL *prclDest, IN RECTL *prclSrc, IN POINTL *MaskOrigin, - IN ULONG Mode -) + IN ULONG Mode) { - // www.osr.com/ddk/graphics/gdifncs_0bs7.htm - - RECTL InputRect; - RECTL OutputRect; - POINTL Translate; - INTENG_ENTER_LEAVE EnterLeaveSource; - INTENG_ENTER_LEAVE EnterLeaveDest; - SURFOBJ* psoInput; - SURFOBJ* psoOutput; - PSTRETCHRECTFUNC BltRectFunc; - BOOLEAN Ret; - POINTL AdjustedBrushOrigin; - BOOL UsesSource = ROP4_USES_SOURCE(Mode); - - if (Mode == R4_NOOP) - { - /* Copy destination onto itself: nop */ - return TRUE; - } - - OutputRect = *prclDest; - if (OutputRect.right < OutputRect.left) - { - OutputRect.left = prclDest->right; - OutputRect.right = prclDest->left; - } - if (OutputRect.bottom < OutputRect.top) - { - OutputRect.left = prclDest->right; - OutputRect.right = prclDest->left; - } - - InputRect = *prclSrc; - if (UsesSource) - { - if (NULL == prclSrc) - { - return FALSE; - } - - /* Make sure we don't try to copy anything outside the valid source region */ - if (InputRect.left < 0) - { - OutputRect.left -= InputRect.left; - InputRect.left = 0; - } - if (InputRect.top < 0) - { - OutputRect.top -= InputRect.top; - InputRect.top = 0; - } - - if (! IntEngEnter(&EnterLeaveSource, psoSource, &InputRect, TRUE, - &Translate, &psoInput)) - { - return FALSE; - } - - InputRect.left += Translate.x; - InputRect.right += Translate.x; - InputRect.top += Translate.y; - InputRect.bottom += Translate.y; - } - - if (NULL != ClipRegion) - { - if (OutputRect.left < ClipRegion->rclBounds.left) - { - InputRect.left += ClipRegion->rclBounds.left - OutputRect.left; - OutputRect.left = ClipRegion->rclBounds.left; - } - if (ClipRegion->rclBounds.right < OutputRect.right) - { - InputRect.right -= OutputRect.right - ClipRegion->rclBounds.right; - OutputRect.right = ClipRegion->rclBounds.right; - } - if (OutputRect.top < ClipRegion->rclBounds.top) - { - InputRect.top += ClipRegion->rclBounds.top - OutputRect.top; - OutputRect.top = ClipRegion->rclBounds.top; - } - if (ClipRegion->rclBounds.bottom < OutputRect.bottom) - { - InputRect.bottom -= OutputRect.bottom - ClipRegion->rclBounds.bottom; - OutputRect.bottom = ClipRegion->rclBounds.bottom; - } - } - - /* Check for degenerate case: if height or width of OutputRect is 0 pixels there's - nothing to do */ - if (OutputRect.right <= OutputRect.left || OutputRect.bottom <= OutputRect.top) - { - if (UsesSource) - { - IntEngLeave(&EnterLeaveSource); - } - return TRUE; - } - - if (! IntEngEnter(&EnterLeaveDest, psoDest, &OutputRect, FALSE, &Translate, &psoOutput)) - { - if (UsesSource) - { - IntEngLeave(&EnterLeaveSource); - } - return FALSE; - } - - OutputRect.left += Translate.x; - OutputRect.right += Translate.x; - OutputRect.top += Translate.y; - OutputRect.bottom += Translate.y; - - if (BrushOrigin) - { - AdjustedBrushOrigin.x = BrushOrigin->x + Translate.x; - AdjustedBrushOrigin.y = BrushOrigin->y + Translate.y; - } - else - { - AdjustedBrushOrigin = Translate; - } - - if (Mask != NULL) - { - //BltRectFunc = BltMask; - DPRINT("EngStretchBlt isn't capable of handling mask yet.\n"); - IntEngLeave(&EnterLeaveDest); - if (UsesSource) - { - IntEngLeave(&EnterLeaveSource); - } - return FALSE; - } - else - { - BltRectFunc = CallDibStretchBlt; - } - - Ret = (*BltRectFunc)(psoOutput, psoInput, Mask, ClipRegion, - ColorTranslation, &OutputRect, &InputRect, MaskOrigin, - &AdjustedBrushOrigin, Mode); - - IntEngLeave(&EnterLeaveDest); - if (UsesSource) - { - IntEngLeave(&EnterLeaveSource); - } - - return Ret; + return EngStretchBltROP( + psoDest, + psoSource, + Mask, + ClipRegion, + ColorTranslation, + pca, + BrushOrigin, + prclDest, + prclSrc, + MaskOrigin, + Mode, + NULL, + SRCCOPY); } BOOL APIENTRY @@ -1104,8 +1139,8 @@ if (! ret) { // FIXME: see previous fixme - ret = EngStretchBlt(psoDest, psoSource, MaskSurf, ClipRegion, ColorTranslation, - &ca, BrushOrigin, &OutputRect, &InputRect, NULL, ROP); + ret = EngStretchBltROP(psoDest, psoSource, MaskSurf, ClipRegion, ColorTranslation, + &ca, BrushOrigin, &OutputRect, &InputRect, NULL, COLORONCOLOR, Brush, ROP); } if (UsesSource) Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Sun Feb 8 14:28:20 2009 @@ -756,7 +756,9 @@ RECTL SourceRect; BOOL Status = FALSE; XLATEOBJ *XlateObj = NULL; + POINTL BrushOrigin; PGDIBRUSHOBJ BrushObj = NULL; + GDIBRUSHINST BrushInst; BOOL UsesSource = ROP3_USES_SOURCE(ROP); BOOL UsesPattern = ROP3_USES_PATTERN(ROP); @@ -835,6 +837,9 @@ IntLPtoDP(DCSrc, (LPPOINT)&SourceRect, 2); } + BrushOrigin.x = 0; + BrushOrigin.y = 0; + /* Determine surfaces to be used in the bitblt */ BitmapDest = SURFACE_LockSurface(DCDest->w.hBitmap); if (BitmapDest == NULL) @@ -920,13 +925,16 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); goto failed; } + BrushOrigin = *((PPOINTL)&BrushObj->ptOrigin); + IntGdiInitBrushInstance(&BrushInst, BrushObj, DCDest->XlateBrush); } /* Perform the bitblt operation */ Status = IntEngStretchBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, NULL, DCDest->CombinedClip, XlateObj, - &DestRect, &SourceRect, NULL, NULL, NULL, - ROP3_TO_ROP4(ROP)); + &DestRect, &SourceRect, NULL, + BrushObj ? &BrushInst.BrushObject : NULL, + &BrushOrigin, ROP3_TO_ROP4(ROP)); failed: if (XlateObj) Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Sun Feb 8 14:28:20 2009 @@ -938,26 +938,6 @@ UNIMPLEMENTED; return 0; } -BOOL APIENTRY -EngStretchBltROP( - IN SURFOBJ *Dest, - IN SURFOBJ *Source, - IN SURFOBJ *Mask, - IN CLIPOBJ *Clip, - IN XLATEOBJ *Xlate, - IN COLORADJUSTMENT *ColorAdjustment, - IN POINTL *BrushOrigin, - IN RECTL *DestRect, - IN RECTL *SourceRect, - IN POINTL *MaskPoint, - IN ULONG Mode, - IN BRUSHOBJ *BrushObj, - IN DWORD ROP4) -{ - UNIMPLEMENTED; - return FALSE; -} - /* * @unimplemented

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
56
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2009