Ros-diffs May 2009

ros-diffs@reactos.org

27 participants
504 discussions

[dchapyshev] 40847: - Sync comctl32 (without listview.c), comdlg32 with Wine 1.1.21

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat May 9 13:20:57 2009 New Revision: 40847 URL: http://svn.reactos.org/svn/reactos?rev=40847&view=rev Log: - Sync comctl32 (without listview.c), comdlg32 with Wine 1.1.21 Modified: trunk/reactos/dll/win32/comctl32/commctrl.c trunk/reactos/dll/win32/comctl32/header.c trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/dll/win32/comdlg32/filedlg.c trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c trunk/reactos/dll/win32/comdlg32/filedlgbrowser.h Modified: trunk/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/commctr… ============================================================================== --- trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] Sat May 9 13:20:57 2009 @@ -772,7 +772,7 @@ HWND WINAPI CreateToolbarEx (HWND hwnd, DWORD style, UINT wID, INT nBitmaps, - HINSTANCE hBMInst, UINT wBMID, LPCTBBUTTON lpButtons, + HINSTANCE hBMInst, UINT_PTR wBMID, LPCTBBUTTON lpButtons, INT iNumButtons, INT dxButton, INT dyButton, INT dxBitmap, INT dyBitmap, UINT uStructSize) { Modified: trunk/reactos/dll/win32/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/header.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/header.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/header.c [iso-8859-1] Sat May 9 13:20:57 2009 @@ -1663,7 +1663,8 @@ } else InvalidateRect(hwnd, &infoPtr->items[infoPtr->iMoveItem].rect, FALSE); - + + infoPtr->bDragging = FALSE; HEADER_SetHotDivider(hwnd, FALSE, -1); } else if (!(dwStyle&HDS_DRAGDROP) || !HEADER_IsDragDistance(infoPtr, &pt)) Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Sat May 9 13:20:57 2009 @@ -1841,7 +1841,9 @@ btnPtr->fsState = lpTbb[iButton].fsState; btnPtr->fsStyle = lpTbb[iButton].fsStyle; btnPtr->dwData = lpTbb[iButton].dwData; - if(HIWORD(lpTbb[iButton].iString) && lpTbb[iButton].iString != -1) + if (btnPtr->fsStyle & BTNS_SEP) + btnPtr->iString = -1; + else if(HIWORD(lpTbb[iButton].iString) && lpTbb[iButton].iString != -1) { if (fUnicode) Str_SetPtrW((LPWSTR*)&btnPtr->iString, (LPWSTR)lpTbb[iButton].iString ); @@ -3433,9 +3435,6 @@ INT nIndex; LPWSTR lpText; - if (lParam == 0) - return -1; - nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam, FALSE); if (nIndex == -1) return -1; @@ -3443,7 +3442,7 @@ lpText = TOOLBAR_GetText(infoPtr,&infoPtr->buttons[nIndex]); return WideCharToMultiByte( CP_ACP, 0, lpText, -1, - (LPSTR)lParam, 0x7fffffff, NULL, NULL ) - 1; + (LPSTR)lParam, lParam ? 0x7fffffff : 0, NULL, NULL ) - 1; } Modified: trunk/reactos/dll/win32/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/filedlg.c [iso-8859-1] Sat May 9 13:20:57 2009 @@ -37,7 +37,6 @@ * FIXME: add to recent docs * * FIXME: flags not implemented: OFN_DONTADDTORECENT, - * OFN_ENABLESIZING, * OFN_NODEREFERENCELINKS, OFN_NOREADONLYRETURN, * OFN_NOTESTFILECREATE, OFN_USEMONIKERS * @@ -82,7 +81,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg); #define UNIMPLEMENTED_FLAGS \ -(OFN_DONTADDTORECENT | OFN_ENABLESIZING |\ +(OFN_DONTADDTORECENT |\ OFN_NODEREFERENCELINKS | OFN_NOREADONLYRETURN |\ OFN_NOTESTFILECREATE /*| OFN_USEMONIKERS*/) @@ -269,6 +268,13 @@ { COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); return FALSE; + } + + if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) + { + ((LPDLGTEMPLATEW)template)->style |= WS_SIZEBOX; + fodInfos->sizedlg.cx = fodInfos->sizedlg.cy = 0; + fodInfos->initial_size.x = fodInfos->initial_size.y = 0; } /* old style hook messages */ @@ -979,6 +985,125 @@ } /*********************************************************************** + * FILEDLG95_OnWMGetMMI + * + * WM_GETMINMAXINFO message handler for resizable dialogs + */ +static LRESULT FILEDLG95_OnWMGetMMI( HWND hwnd, LPMINMAXINFO mmiptr) +{ + FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); + if( !(fodInfos->ofnInfos->Flags & OFN_ENABLESIZING)) return FALSE; + if( fodInfos->initial_size.x || fodInfos->initial_size.y) + { + mmiptr->ptMinTrackSize = fodInfos->initial_size; + } + return TRUE; +} + +/*********************************************************************** + * FILEDLG95_OnWMSize + * + * WM_SIZE message handler, resize the dialog. Re-arrange controls. + * + * FIXME: this could be made more elaborate. Now use a simple scheme + * where the file view is enlarged and the controls are either moved + * vertically or horizontally to get out of the way. Only the "grip" + * is moved in both directions to stay in the corner. + */ +static LRESULT FILEDLG95_OnWMSize(HWND hwnd, WPARAM wParam, LPARAM lParam) +{ + RECT rc, rcview; + int chgx, chgy; + HWND ctrl; + HDWP hdwp; + FileOpenDlgInfos *fodInfos; + + if( wParam != SIZE_RESTORED) return FALSE; + fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); + if( !(fodInfos->ofnInfos->Flags & OFN_ENABLESIZING)) return FALSE; + /* get the new dialog rectangle */ + GetWindowRect( hwnd, &rc); + /* not initialized yet */ + if( (fodInfos->sizedlg.cx == 0 && fodInfos->sizedlg.cy == 0) || + ((fodInfos->sizedlg.cx == rc.right -rc.left) && /* no change */ + (fodInfos->sizedlg.cy == rc.bottom -rc.top))) + return FALSE; + chgx = rc.right - rc.left - fodInfos->sizedlg.cx; + chgy = rc.bottom - rc.top - fodInfos->sizedlg.cy; + fodInfos->sizedlg.cx = rc.right - rc.left; + fodInfos->sizedlg.cy = rc.bottom - rc.top; + /* change the size of the view window */ + GetWindowRect( fodInfos->ShellInfos.hwndView, &rcview); + MapWindowPoints( NULL, hwnd, (LPPOINT) &rcview, 2); + hdwp = BeginDeferWindowPos( 10); + DeferWindowPos( hdwp, fodInfos->ShellInfos.hwndView, NULL, 0, 0, + rcview.right - rcview.left + chgx, + rcview.bottom - rcview.top + chgy, + SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); + /* change position and sizes of the controls */ + for( ctrl = GetWindow( hwnd, GW_CHILD); ctrl ; ctrl = GetWindow( ctrl, GW_HWNDNEXT)) + { + GetWindowRect( ctrl, &rc); + MapWindowPoints( NULL, hwnd, (LPPOINT) &rc, 2); + if( ctrl == fodInfos->DlgInfos.hwndGrip) + { + DeferWindowPos( hdwp, ctrl, NULL, rc.left + chgx, rc.top + chgy, + 0, 0, + SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER); + } + else if( rc.top > rcview.bottom) + { + /* if it was below the shell view + * move to bottom */ + DeferWindowPos( hdwp, ctrl, NULL, rc.left, rc.top + chgy, + rc.right - rc.left, rc.bottom - rc.top, + SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER); + } + else if( rc.left > rcview.right) + { + /* if it was to the right of the shell view + * move to right */ + DeferWindowPos( hdwp, ctrl, NULL, rc.left + chgx, rc.top, + rc.right - rc.left, rc.bottom - rc.top, + SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER); + } + } + if(fodInfos->DlgInfos.hwndCustomDlg && + (fodInfos->ofnInfos->Flags & (OFN_ENABLETEMPLATE | OFN_ENABLETEMPLATEHANDLE))) + { + GetClientRect(hwnd, &rc); + DeferWindowPos( hdwp,fodInfos->DlgInfos.hwndCustomDlg, NULL, + 0, 0, rc.right, rc.bottom, SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); + for( ctrl = GetWindow( fodInfos->DlgInfos.hwndCustomDlg, GW_CHILD); + ctrl ; ctrl = GetWindow( ctrl, GW_HWNDNEXT)) + { + GetWindowRect( ctrl, &rc); + MapWindowPoints( NULL, hwnd, (LPPOINT) &rc, 2); + if( rc.top > rcview.bottom) + { + /* if it was below the shell view + * move to bottom */ + DeferWindowPos( hdwp, ctrl, NULL, rc.left, rc.top + chgy, + rc.right - rc.left, rc.bottom - rc.top, + SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER); + } + else if( rc.left > rcview.right) + { + /* if it was to the right of the shell view + * move to right */ + DeferWindowPos( hdwp, ctrl, NULL, rc.left + chgx, rc.top, + rc.right - rc.left, rc.bottom - rc.top, + SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER); + } + } + } + EndDeferWindowPos( hdwp); + /* should not be needed */ + RedrawWindow( hwnd, NULL, 0, RDW_ALLCHILDREN | RDW_INVALIDATE ); + return TRUE; +} + +/*********************************************************************** * FileOpenDlgProc95 * * File open dialog procedure @@ -994,6 +1119,9 @@ case WM_INITDIALOG: { FileOpenDlgInfos * fodInfos = (FileOpenDlgInfos *)lParam; + RECT rc; + int gripx = GetSystemMetrics( SM_CYHSCROLL); + int gripy = GetSystemMetrics( SM_CYVSCROLL); /* Adds the FileOpenDlgInfos in the property list of the dialog so it will be easily accessible through a GetPropA(...) */ @@ -1001,17 +1129,49 @@ FILEDLG95_InitControls(hwnd); + if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) + { + GetWindowRect( hwnd, &rc); + fodInfos->DlgInfos.hwndGrip = + CreateWindowExA( 0, "SCROLLBAR", NULL, + WS_CHILD | WS_GROUP | WS_VISIBLE | WS_CLIPSIBLINGS | + SBS_SIZEGRIP | SBS_SIZEBOXBOTTOMRIGHTALIGN, + rc.right - gripx, rc.bottom - gripy, + gripx, gripy, hwnd, (HMENU) -1, COMDLG32_hInstance, NULL); + } + fodInfos->DlgInfos.hwndCustomDlg = CreateTemplateDialog((FileOpenDlgInfos *)lParam, hwnd); FILEDLG95_ResizeControls(hwnd, wParam, lParam); FILEDLG95_FillControls(hwnd, wParam, lParam); - SendCustomDlgNotificationMessage(hwnd,CDN_INITDONE); - SendCustomDlgNotificationMessage(hwnd,CDN_FOLDERCHANGE); - SendCustomDlgNotificationMessage(hwnd,CDN_SELCHANGE); + if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) + { + GetWindowRect( hwnd, &rc); + /* FIXME: should remember sizes of last invocation */ + fodInfos->sizedlg.cx = rc.right - rc.left; + fodInfos->sizedlg.cy = rc.bottom - rc.top; + fodInfos->initial_size.x = fodInfos->sizedlg.cx; + fodInfos->initial_size.y = fodInfos->sizedlg.cy; + GetClientRect( hwnd, &rc); + SetWindowPos( fodInfos->DlgInfos.hwndGrip, NULL, + rc.right - gripx, rc.bottom - gripy, + 0, 0, SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER); + } + + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + { + SendCustomDlgNotificationMessage(hwnd,CDN_INITDONE); + SendCustomDlgNotificationMessage(hwnd,CDN_FOLDERCHANGE); + SendCustomDlgNotificationMessage(hwnd,CDN_SELCHANGE); + } return 0; } + case WM_SIZE: + return FILEDLG95_OnWMSize(hwnd, wParam, lParam); + case WM_GETMINMAXINFO: + return FILEDLG95_OnWMGetMMI( hwnd, (LPMINMAXINFO)lParam); case WM_COMMAND: return FILEDLG95_OnWMCommand(hwnd, wParam, lParam); case WM_DRAWITEM: @@ -1592,11 +1752,12 @@ /* ask the hook if we can close */ if(IsHooked(fodInfos)) { - LRESULT retval; + LRESULT retval = 0; TRACE("---\n"); /* First send CDN_FILEOK as MSDN doc says */ - retval = SendCustomDlgNotificationMessage(hwnd,CDN_FILEOK); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + retval = SendCustomDlgNotificationMessage(hwnd,CDN_FILEOK); if (GetWindowLongPtrW(fodInfos->DlgInfos.hwndCustomDlg, DWLP_MSGRESULT)) { TRACE("canceled\n"); @@ -1991,7 +2152,8 @@ IPersistFolder2_Release(ppf2); if( ! COMDLG32_PIDL_ILIsEqual(pidlCurrent, fodInfos->ShellInfos.pidlAbsCurrent)) { - if (SUCCEEDED(IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser, pidlCurrent, SBSP_ABSOLUTE))) + if (SUCCEEDED(IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser, pidlCurrent, SBSP_ABSOLUTE)) + && fodInfos->ofnInfos->Flags & OFN_EXPLORER) { SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); } @@ -2294,7 +2456,8 @@ NULL, SBSP_PARENT))) { - SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); return TRUE; } return FALSE; @@ -2316,7 +2479,8 @@ SHGetSpecialFolderLocation(0,CSIDL_DESKTOP,&pidl); hres = IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser, pidl, SBSP_ABSOLUTE); - SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); COMDLG32_SHFree(pidl); return SUCCEEDED(hres); } @@ -2494,7 +2658,8 @@ len = lstrlenW(lpstrFilter)+1; fodInfos->ShellInfos.lpstrCurrentFilter = MemAlloc( len * sizeof(WCHAR) ); lstrcpyW(fodInfos->ShellInfos.lpstrCurrentFilter,lpstrFilter); - SendCustomDlgNotificationMessage(hwnd,CDN_TYPECHANGE); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + SendCustomDlgNotificationMessage(hwnd,CDN_TYPECHANGE); } /* Refresh the actual view to display the included items*/ @@ -2798,7 +2963,8 @@ tmpFolder->pidlItem, SBSP_ABSOLUTE))) { - SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); return TRUE; } break; @@ -3472,7 +3638,8 @@ MessageBoxW( hwnd, notexist, fodInfos->title, MB_OK | MB_ICONEXCLAMATION ); } bBrowseSelFolder = TRUE; - SendCustomDlgNotificationMessage(hwnd,CDN_FOLDERCHANGE); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + SendCustomDlgNotificationMessage(hwnd,CDN_FOLDERCHANGE); } COMDLG32_SHFree( pidlSelection ); } Modified: trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c [iso-8859-1] Sat May 9 13:20:57 2009 @@ -785,7 +785,8 @@ if (ulAttr & (SFGAO_FOLDER | SFGAO_HASSUBFOLDER) ) { hRes = IShellBrowser_BrowseObject((IShellBrowser *)This,pidl,SBSP_RELATIVE); - SendCustomDlgNotificationMessage(This->hwndOwner, CDN_FOLDERCHANGE); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + SendCustomDlgNotificationMessage(This->hwndOwner, CDN_FOLDERCHANGE); } else { @@ -960,7 +961,8 @@ FILEDLG95_FILENAME_FillFromSelection(This->hwndOwner); - SendCustomDlgNotificationMessage(This->hwndOwner, CDN_SELCHANGE); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + SendCustomDlgNotificationMessage(This->hwndOwner, CDN_SELCHANGE); return S_OK; } Modified: trunk/reactos/dll/win32/comdlg32/filedlgbrowser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlgbrowser.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/filedlgbrowser.h [iso-8859-1] Sat May 9 13:20:57 2009 @@ -58,6 +58,8 @@ LPCWSTR defext; LPCWSTR filter; LPCWSTR customfilter; + SIZE sizedlg; /* remember the size of the dialog */ + POINT initial_size; /* remember the initial size of the dialog */ struct { IShellBrowser *FOIShellBrowser; IShellFolder *FOIShellFolder; @@ -78,6 +80,7 @@ HWND hwndLookInCB; HWND hwndFileName; HWND hwndTB; + HWND hwndGrip; HWND hwndCustomDlg; DWORD dwDlgProp; } DlgInfos;

15 years, 8 months

[dchapyshev] 40846: - Sync clusapi, credui, crypt32, cryptui with Wine 1.1.21

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat May 9 13:18:43 2009 New Revision: 40846 URL: http://svn.reactos.org/svn/reactos?rev=40846&view=rev Log: - Sync clusapi, credui, crypt32, cryptui with Wine 1.1.21 Modified: trunk/reactos/dll/win32/clusapi/clusapi.c trunk/reactos/dll/win32/clusapi/clusapi.spec trunk/reactos/dll/win32/credui/credui_Ro.rc trunk/reactos/dll/win32/crypt32/protectdata.c trunk/reactos/dll/win32/cryptui/main.c Modified: trunk/reactos/dll/win32/clusapi/clusapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/clusapi/clusapi.… ============================================================================== --- trunk/reactos/dll/win32/clusapi/clusapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/clusapi/clusapi.c [iso-8859-1] Sat May 9 13:18:43 2009 @@ -97,7 +97,7 @@ */ DWORD WINAPI ClusterEnum(HCLUSENUM hEnum, DWORD dwIndex, LPDWORD lpdwType, LPWSTR lpszName, LPDWORD lpcchName) { - FIXME("(%p, %u, %u, %s, %u) stub!\n", hEnum, dwIndex, *lpdwType, debugstr_w(lpszName), *lpcchName); + FIXME("(%p, %u, %u, %p, %u) stub!\n", hEnum, dwIndex, *lpdwType, lpszName, *lpcchName); return ERROR_NO_MORE_ITEMS; } Modified: trunk/reactos/dll/win32/clusapi/clusapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/clusapi/clusapi.… ============================================================================== --- trunk/reactos/dll/win32/clusapi/clusapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/clusapi/clusapi.spec [iso-8859-1] Sat May 9 13:18:43 2009 @@ -12,7 +12,7 @@ @ stub CloseClusterResource @ stdcall ClusterCloseEnum(ptr) @ stub ClusterControl -@ stdcall ClusterEnum(ptr long ptr wstr ptr) +@ stdcall ClusterEnum(ptr long ptr ptr ptr) @ stub ClusterGetEnumCount @ stub ClusterGroupCloseEnum @ stub ClusterGroupControl Modified: trunk/reactos/dll/win32/credui/credui_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Ro… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Ro.rc [iso-8859-1] Sat May 9 13:18:43 2009 @@ -47,7 +47,7 @@ IDS_INCORRECTPASSWORDTITLE "Autentificare eÈuatÄ" IDS_INCORRECTPASSWORD "VerificaÈi numele de utilizator Èi parola." IDS_CAPSLOCKONTITLE "Tasta Caps Lock este activatÄ" - IDS_CAPSLOCKON "Cu tasta Caps Lock activatÄ este foarte probabil cÄ veÈi introduce parola greÈit. \n\nInainte de a introduce parola apÄsaÈi tasta Caps Lock pentru a dezactiva scrierea cu majuscule." + IDS_CAPSLOCKON "Cu tasta Caps Lock activatÄ este foarte probabil cÄ veÈi introduce parola greÈit.\n\nInainte de a introduce parola apÄsaÈi tasta Caps Lock pentru a dezactiva scrierea cu majuscule." } #pragma code_page(default) Modified: trunk/reactos/dll/win32/crypt32/protectdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/protectd… ============================================================================== --- trunk/reactos/dll/win32/crypt32/protectdata.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/protectdata.c [iso-8859-1] Sat May 9 13:18:43 2009 @@ -616,11 +616,9 @@ return FALSE; } pInfo->salt.cbData=CRYPT32_PROTECTDATA_SALT_LEN; - } - - /* debug: show our salt */ - TRACE_DATA_BLOB(&pInfo->salt); - + /* debug: show our salt */ + TRACE_DATA_BLOB(&pInfo->salt); + } pInfo->cipher.cbData=0; pInfo->cipher.pbData=NULL; Modified: trunk/reactos/dll/win32/cryptui/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] Sat May 9 13:18:43 2009 @@ -4993,6 +4993,12 @@ data = (struct ImportWizData *)page->lParam; SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data); + if (data->fileName) + { + HWND fileNameEdit = GetDlgItem(hwnd, IDC_IMPORT_FILENAME); + + SendMessageW(fileNameEdit, WM_SETTEXT, 0, (LPARAM)data->fileName); + } break; } case WM_NOTIFY: @@ -5383,10 +5389,15 @@ data.dwFlags = dwFlags; data.pwszWizardTitle = pwszWizardTitle; if (pImportSrc) + { memcpy(&data.importSrc, pImportSrc, sizeof(data.importSrc)); + data.fileName = (LPWSTR)pImportSrc->u.pwszFileName; + } else + { memset(&data.importSrc, 0, sizeof(data.importSrc)); - data.fileName = NULL; + data.fileName = NULL; + } data.freeSource = FALSE; data.hDestCertStore = hDestCertStore; data.freeDest = FALSE; @@ -5470,7 +5481,8 @@ hdr.u4.pszbmWatermark = MAKEINTRESOURCEW(IDB_CERT_WATERMARK); hdr.u5.pszbmHeader = MAKEINTRESOURCEW(IDB_CERT_HEADER); PropertySheetW(&hdr); - HeapFree(GetProcessHeap(), 0, data.fileName); + if (data.fileName != data.importSrc.u.pwszFileName) + HeapFree(GetProcessHeap(), 0, data.fileName); if (data.freeSource && data.importSrc.dwSubjectChoice == CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_STORE) CertCloseStore(data.importSrc.u.hCertStore, 0);

15 years, 8 months

[dchapyshev] 40845: - Sync headers with Wine 1.1.21

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat May 9 13:16:59 2009 New Revision: 40845 URL: http://svn.reactos.org/svn/reactos?rev=40845&view=rev Log: - Sync headers with Wine 1.1.21 Modified: trunk/reactos/include/psdk/gdiplusflat.h trunk/reactos/include/psdk/gdiplusimaging.h trunk/reactos/include/psdk/msctf.idl trunk/reactos/include/psdk/pdh.h Modified: trunk/reactos/include/psdk/gdiplusflat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusflat.h… ============================================================================== --- trunk/reactos/include/psdk/gdiplusflat.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusflat.h [iso-8859-1] Sat May 9 13:16:59 2009 @@ -82,6 +82,7 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontA(HDC,GDIPCONST LOGFONTA*,GpFont**); GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC,GDIPCONST LOGFONTW*,GpFont**); GpStatus WINGDIPAPI GdipDeleteFont(GpFont*); +GpStatus WINGDIPAPI GdipGetLogFontA(GpFont*,GpGraphics*,LOGFONTA*); GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*); GpStatus WINGDIPAPI GdipGetFamily(GpFont*, GpFontFamily**); GpStatus WINGDIPAPI GdipGetFontUnit(GpFont*, Unit*); @@ -92,6 +93,7 @@ GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont*, REAL, REAL*); /* FontCollection */ +GpStatus WINGDIPAPI GdipNewInstalledFontCollection(GpFontCollection**); GpStatus WINGDIPAPI GdipNewPrivateFontCollection(GpFontCollection**); GpStatus WINGDIPAPI GdipDeletePrivateFontCollection(GpFontCollection**); GpStatus WINGDIPAPI GdipPrivateAddFontFile(GpFontCollection*, GDIPCONST WCHAR*); @@ -326,6 +328,7 @@ GpStatus WINGDIPAPI GdipGetImageItemData(GpImage*,ImageItemData*); GpStatus WINGDIPAPI GdipGetImagePixelFormat(GpImage*,PixelFormat*); GpStatus WINGDIPAPI GdipGetImageRawFormat(GpImage*,GUID*); +GpStatus WINGDIPAPI GdipGetImageThumbnail(GpImage*,UINT,UINT,GpImage**,GetThumbnailImageAbort,VOID*); GpStatus WINGDIPAPI GdipGetImageType(GpImage*,ImageType*); GpStatus WINGDIPAPI GdipGetImageVerticalResolution(GpImage*,REAL*); GpStatus WINGDIPAPI GdipGetImageWidth(GpImage*,UINT*); @@ -337,6 +340,7 @@ GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage*,GDIPCONST GUID*,UINT*); GpStatus WINGDIPAPI GdipImageGetFrameDimensionsCount(GpImage*,UINT*); GpStatus WINGDIPAPI GdipImageGetFrameDimensionsList(GpImage*,GUID*,UINT); +GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage*,RotateFlipType); GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage*,GDIPCONST GUID*,UINT); GpStatus WINGDIPAPI GdipLoadImageFromFile(GDIPCONST WCHAR*,GpImage**); GpStatus WINGDIPAPI GdipLoadImageFromFileICM(GDIPCONST WCHAR*,GpImage**); @@ -380,6 +384,8 @@ GpStatus WINGDIPAPI GdipGetLineWrapMode(GpLineGradient*,GpWrapMode*); GpStatus WINGDIPAPI GdipSetLineBlend(GpLineGradient*,GDIPCONST REAL*, GDIPCONST REAL*,INT); +GpStatus WINGDIPAPI GdipGetLineBlend(GpLineGradient*,REAL*,REAL*,INT); +GpStatus WINGDIPAPI GdipGetLineBlendCount(GpLineGradient*,INT*); GpStatus WINGDIPAPI GdipSetLineColors(GpLineGradient*,ARGB,ARGB); GpStatus WINGDIPAPI GdipSetLineGammaCorrection(GpLineGradient*,BOOL); GpStatus WINGDIPAPI GdipSetLineSigmaBlend(GpLineGradient*,REAL,REAL); Modified: trunk/reactos/include/psdk/gdiplusimaging.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusimagin… ============================================================================== --- trunk/reactos/include/psdk/gdiplusimaging.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusimaging.h [iso-8859-1] Sat May 9 13:16:59 2009 @@ -38,6 +38,33 @@ ImageLockModeUserInputBuf = 4 }; +enum RotateFlipType +{ + RotateNoneFlipNone = 0, + Rotate180FlipXY = RotateNoneFlipNone, + + Rotate90FlipNone = 1, + Rotate270FlipXY = Rotate90FlipNone, + + Rotate180FlipNone = 2, + RotateNoneFlipXY = Rotate180FlipNone, + + Rotate270FlipNone = 3, + Rotate90FlipXY = Rotate270FlipNone, + + RotateNoneFlipX = 4, + Rotate180FlipY = RotateNoneFlipX, + + Rotate90FlipX = 5, + Rotate270FlipY = Rotate90FlipX, + + Rotate180FlipX = 6, + RotateNoneFlipY = Rotate180FlipX, + + Rotate270FlipX = 7, + Rotate90FlipY = Rotate270FlipX +}; + #ifdef __cplusplus class EncoderParameter { @@ -108,6 +135,7 @@ #else /* end of c++ typedefs */ typedef enum ImageLockMode ImageLockMode; +typedef enum RotateFlipType RotateFlipType; typedef struct EncoderParameter { Modified: trunk/reactos/include/psdk/msctf.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msctf.idl?rev… ============================================================================== --- trunk/reactos/include/psdk/msctf.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msctf.idl [iso-8859-1] Sat May 9 13:16:59 2009 @@ -22,6 +22,7 @@ import "textstor.idl"; /* import "ctfutb.idl"; */ #endif +cpp_quote("#include <winuser.h>") /* FIXME: LANGID is defined in winnt.h and mlang.h in the platform SDK */ cpp_quote("#ifndef _WINNT_H") @@ -651,3 +652,55 @@ [in] REFGUID rguid, [out] BOOL *pfEaten); }; + +[ + object, + local, + uuid(8f1b8ad8-0b6b-4874-90c5-bd76011e8f7c), + pointer_default(unique) +] +interface ITfMessagePump : IUnknown +{ + HRESULT PeekMessageA( + [out] LPMSG pMsg, + [in] HWND hwnd, + [in] UINT wMsgFilterMin, + [in] UINT wMsgFilterMax, + [in] UINT wRemoveMsg, + [out] BOOL *pfResult); + + HRESULT GetMessageA( + [out] LPMSG pMsg, + [in] HWND hwnd, + [in] UINT wMsgFilterMin, + [in] UINT wMsgFilterMax, + [out] BOOL *pfResult); + + HRESULT PeekMessageW( + [out] LPMSG pMsg, + [in] HWND hwnd, + [in] UINT wMsgFilterMin, + [in] UINT wMsgFilterMax, + [in] UINT wRemoveMsg, + [out] BOOL *pfResult); + + HRESULT GetMessageW( + [out] LPMSG pMsg, + [in] HWND hwnd, + [in] UINT wMsgFilterMin, + [in] UINT wMsgFilterMax, + [out] BOOL *pfResult); +}; + +[ + object, + local, + uuid(d60a7b49-1b9f-4be2-b702-47e9dc05dec3), + pointer_default(unique) +] +interface ITfClientId : IUnknown +{ + HRESULT GetClientId( + [in] REFCLSID rclsid, + [out] TfClientId *ptid); +}; Modified: trunk/reactos/include/psdk/pdh.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/pdh.h?rev=408… ============================================================================== --- trunk/reactos/include/psdk/pdh.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/pdh.h [iso-8859-1] Sat May 9 13:16:59 2009 @@ -190,6 +190,9 @@ PDH_STATUS WINAPI PdhLookupPerfNameByIndexA(LPCSTR, DWORD, LPSTR, LPDWORD); PDH_STATUS WINAPI PdhLookupPerfNameByIndexW(LPCWSTR, DWORD, LPWSTR, LPDWORD); #define PdhLookupPerfNameByIndex WINELIB_NAME_AW(PdhLookupPerfNameByIndex) +PDH_STATUS WINAPI PdhMakeCounterPathA(PDH_COUNTER_PATH_ELEMENTS_A *, LPSTR, LPDWORD, DWORD); +PDH_STATUS WINAPI PdhMakeCounterPathW(PDH_COUNTER_PATH_ELEMENTS_W *, LPWSTR, LPDWORD, DWORD); +#define PdhMakeCounterPath WINELIB_NAME_AW(PdhMakeCounterPath) PDH_STATUS WINAPI PdhOpenQueryA(LPCSTR, DWORD_PTR, PDH_HQUERY *); PDH_STATUS WINAPI PdhOpenQueryW(LPCWSTR, DWORD_PTR, PDH_HQUERY *); #define PdhOpenQuery WINELIB_NAME_AW(PdhOpenQuery)

15 years, 8 months

[dchapyshev] 40844: - Sync Tahoma with Wine 1.1.21

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat May 9 11:18:23 2009 New Revision: 40844 URL: http://svn.reactos.org/svn/reactos?rev=40844&view=rev Log: - Sync Tahoma with Wine 1.1.21 Modified: trunk/reactos/media/fonts/tahoma.ttf trunk/reactos/media/fonts/tahomabd.ttf Modified: trunk/reactos/media/fonts/tahoma.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/tahoma.ttf?rev… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/tahomabd.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/tahomabd.ttf?r… ============================================================================== Binary files - no diff available.

15 years, 8 months

[dreimer] 40843: remove the hax from the ps file too.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sat May 9 04:42:55 2009 New Revision: 40843 URL: http://svn.reactos.org/svn/reactos?rev=40843&view=rev Log: remove the hax from the ps file too. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Sat May 9 04:42:55 2009 @@ -110,5 +110,3 @@ $ENV:ROSBE_TARGET_CFLAGS = $null $ENV:ROSBE_TARGET_CXXFLAGS = $null } - -$ENV:LIBRARY_PATH = "$_ROSBE_HOST_MINGWPATH\lib;$_ROSBE_HOST_MINGWPATH\lib\gcc\mingw32\$_ROSBE_GCCVERSION" Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Sat May 9 04:42:55 2009 @@ -111,4 +111,4 @@ set ROSBE_HOST_CXXFLAGS= set ROSBE_TARGET_CFLAGS= set ROSBE_TARGET_CXXFLAGS= -) +)

15 years, 8 months

[cfinck] 40842: - Bump version to 1.4.2 to keep consistent with RosBE-Windows - Correct toolchain target in the Readme files

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat May 9 02:57:46 2009 New Revision: 40842 URL: http://svn.reactos.org/svn/reactos?rev=40842&view=rev Log: - Bump version to 1.4.2 to keep consistent with RosBE-Windows - Correct toolchain target in the Readme files Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/README trunk/tools/RosBE/RosBE-Unix/Base-i386/README.odt trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/README URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/README [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/README [iso-8859-1] Sat May 9 02:57:46 2009 @@ -1,5 +1,5 @@ ReactOS Build Environment - Version 1.4.1 for Unix-based operating systems + Version 1.4.2 for Unix-based operating systems Base package and i386 build tools by Colin Finck (mail(a)colinfinck.de) @@ -104,13 +104,13 @@ components: * GNU Binutils v2.19.51-20090127 (snapshot) - compiled for i386-pc-mingw32 + compiled for mingw32 patched with: - binutils-2.18.50.10-15-2007-snapshot-hpoussin.patch (http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Patches/binutils-2.18.…) * GCC, The GNU Compiler Collection v4.1.3-20071015 (snapshot) - compiled for i386-pc-mingw32 + compiled for mingw32 patched with: - GCC-v4.1-r129382-prerelease-w3seek.patch (http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Patches/GCC-v4.1-r1293…) Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh [iso-8859-1] Sat May 9 02:57:46 2009 @@ -7,9 +7,9 @@ # Released under GNU GPL v2 or any later version. # Constants -ROSBE_VERSION="1.4.1" +ROSBE_VERSION="1.4.2" TARGET_ARCH="i386" -KNOWN_ROSBE_VERSIONS="0.3.6 1.1 1.4 1.4.1" +KNOWN_ROSBE_VERSIONS="0.3.6 1.1 1.4 1.4.2" DEFAULT_INSTALL_DIR="/usr/local/RosBE" NEEDED_TOOLS="bison flex gcc g++ grep makeinfo" # GNU Make has a special check @@ -202,7 +202,7 @@ ;; "1.4") - # Updated components from 1.4 to 1.4.1 + # Updated components from 1.4 to 1.4.2 process_getincludes=true esac fi

15 years, 8 months

[cfinck] 40841: - Finally get rid of the LIBRARY_PATH, HOST_CFLAGS, HOST_CPPFLAGS, TARGET_CFLAGS, TARGET_CPPFLAGS hacks in "rosbe-gcc-env.cmd" - Update Changelog and Readme The Mingw32 Runtime DLL isn't needed by any of our tools, so it has been removed. This also means, we're again consistent with RosBE-Unix on the Runtime version number (3.13).

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat May 9 02:48:20 2009 New Revision: 40841 URL: http://svn.reactos.org/svn/reactos?rev=40841&view=rev Log: - Finally get rid of the LIBRARY_PATH, HOST_CFLAGS, HOST_CPPFLAGS, TARGET_CFLAGS, TARGET_CPPFLAGS hacks in "rosbe-gcc-env.cmd" - Update Changelog and Readme The Mingw32 Runtime DLL isn't needed by any of our tools, so it has been removed. This also means, we're again consistent with RosBE-Unix on the Runtime version number (3.13). Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/README.odt trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Sat May 9 02:48:20 2009 @@ -5,7 +5,8 @@ Required for kjk's rbuild work. (Colin Finck) - Fixes for the Uninstall Routine to keep most settings, if wished, on a update. (Daniel Reimer) - Remove some stupid setlocals. (Daniel Reimer) -- New Built GCC which supports the recent variable changes (Colin Finck) +- New binutils and GCC builds optimized for i686 and with proper relative include directories (Colin Finck) +- Remove unneeded components such as the MingW32 Runtime DLL (Colin Finck) - Make it possible to set different settings for any arch in RosBE. (Daniel Reimer, Timo Kreuzer) Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Sat May 9 02:48:20 2009 @@ -111,12 +111,4 @@ set ROSBE_HOST_CXXFLAGS= set ROSBE_TARGET_CFLAGS= set ROSBE_TARGET_CXXFLAGS= -) - -set LIBRARY_PATH=%_ROSBE_HOST_MINGWPATH%\lib;%_ROSBE_HOST_MINGWPATH%\lib\gcc\mingw32\%_ROSBE_GCCVERSION% - -:: HAX !!!! -set HOST_CFLAGS=%ROSBE_HOST_CFLAGS% -set HOST_CPPFLAGS=%ROSBE_HOST_CXXFLAGS% -set TARGET_CFLAGS=%ROSBE_TARGET_CFLAGS% -set TARGET_CPPFLAGS=%ROSBE_TARGET_CXXFLAGS% +)

15 years, 8 months

[cfinck] 40840: The ReactOS Makefile only detects GCCs built for "mingw32" while MSYS autodetects "i686-pc-mingw32". I could fix that in the Makefile, but then compatibility with older revisions would still be broken. Also this little detection inside the Makefile could prevent some people from attempting to use their own, incompatible GCC versions. Therefore I've added --build, --host and --target values to the toolchain's configure scripts and set them all to "mingw32" to make sure that they a

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat May 9 02:06:49 2009 New Revision: 40840 URL: http://svn.reactos.org/svn/reactos?rev=40840&view=rev Log: The ReactOS Makefile only detects GCCs built for "mingw32" while MSYS autodetects "i686-pc-mingw32". I could fix that in the Makefile, but then compatibility with older revisions would still be broken. Also this little detection inside the Makefile could prevent some people from attempting to use their own, incompatible GCC versions. Therefore I've added --build, --host and --target values to the toolchain's configure scripts and set them all to "mingw32" to make sure that they aren't doing any cross-compiling attempts. i686 optimizations for the built compiler were manually applied with -march=i686 in CFLAGS and CXXFLAGS. (which *doesn't* mean ROS itself will need an i686 onwards CPU from now on) Modified: trunk/tools/RosBE/RosBE-Windows/Compiling a working GNU toolchain under Windows.odt trunk/tools/RosBE/RosBE-Windows/buildtoolchain.sh Modified: trunk/tools/RosBE/RosBE-Windows/Compiling a working GNU toolchain under Windows.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Compilin… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE/RosBE-Windows/buildtoolchain.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/buildtoo… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/buildtoolchain.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/buildtoolchain.sh [iso-8859-1] Sat May 9 02:06:49 2009 @@ -17,12 +17,24 @@ # # Constants # +CFLAGS="-march=i686 -O2" +CXXFLAGS="$CFLAGS" INSTALLDIR="/c/buildtoolchain/mingw" +LDFLAGS="-s" MINGWDIR="/mingw" NEEDED_TOOLS="bison flex gcc g++ grep make makeinfo" -TARGET="i686-pc-mingw32" +TARGET="mingw32" TEMPDIR="/c/buildtoolchain" WIN32_INSTALLDIR="c:/buildtoolchain/mingw" + +# Make sure we build an entirely native compiler, since MSYS might report subtle differences (i.e. "i686-pc-mingw32" instead of "mingw32") +BUILD="$TARGET" +HOST="$TARGET" + +# The following variables need to be accessed by Make and its subprocesses. +export CFLAGS +export CXXFLAGS +export LDFLAGS # # Functions @@ -178,11 +190,11 @@ echo -n "Configuring binutils... " mkdir "binutils-build" cd "binutils-build" - ../binutils/configure --prefix="$INSTALLDIR" --disable-nls --disable-shared >& "$TEMPDIR/build.log" + ../binutils/configure --prefix="$INSTALLDIR" --build="$BUILD" --host="$HOST" --target="$TARGET" --disable-nls --disable-shared >& "$TEMPDIR/build.log" check_run echo -n "Building binutils... " - make CFLAGS="-O2 -fno-exceptions" LDFLAGS="-s" >& "$TEMPDIR/build.log" + make >& "$TEMPDIR/build.log" check_run echo -n "Installing binutils... " @@ -208,14 +220,14 @@ mkdir "gcc-build" cd "gcc-build" - ../gcc/configure --prefix="$WIN32_INSTALLDIR" --with-ld=/bin/ld \ + ../gcc/configure --prefix="$WIN32_INSTALLDIR" --build="$BUILD" --host="$HOST" --target="$TARGET" --with-ld=/bin/ld \ --enable-languages=c,c++ --enable-checking=release \ --enable-threads=win32 --disable-win32-registry --disable-nls \ --disable-shared >& "$TEMPDIR/build.log" check_run echo -n "Building gcc... " - make CFLAGS="-O2" CXXFLAGS="-O2" LDFLAGS="-s" >& "$TEMPDIR/build.log" + make >& "$TEMPDIR/build.log" check_run echo -n "Installing gcc... "

15 years, 8 months

[janderwald] 40839: - Add IID_IAllocatorMXF guid - Add undef macro (hint Stefan) - Thanks Usurp for telling

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri May 8 18:39:33 2009 New Revision: 40839 URL: http://svn.reactos.org/svn/reactos?rev=40839&view=rev Log: - Add IID_IAllocatorMXF guid - Add undef macro (hint Stefan) - Thanks Usurp for telling Modified: trunk/reactos/include/ddk/dmusicks.h trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/include/ddk/dmusicks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dmusicks.h?rev… ============================================================================== --- trunk/reactos/include/ddk/dmusicks.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/dmusicks.h [iso-8859-1] Fri May 8 18:39:33 2009 @@ -246,4 +246,9 @@ typedef IMiniportDMus *PMINIPORTDMUS; #undef INTERFACE +#define STATIC_IID_IAllocatorMXF\ + 0xa5f0d62c, 0xb30f, 0x11d2, 0xb7, 0xa3, 0x00, 0x60, 0x08, 0x33, 0x16, 0xc1 +DEFINE_GUIDSTRUCT("a5f0d62c-b30f-11d2-b7a3-0060083316c1", IID_IAllocatorMXF); +#define IID_IAllocatorMXF DEFINE_GUIDNAMED(IID_IAllocatorMXF) + #endif Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Fri May 8 18:39:33 2009 @@ -2032,6 +2032,7 @@ typedef IPortClsVersion *PPORTCLSVERSION; +#undef INTERFACE /* =============================================================== IDmaOperations Interface

15 years, 8 months

[mjmartin] 40838: - MmMapViewOfSection: Segment size must be a multiple of page size, so round ViewSize up to next page size. OllyDbg now shows loaded dll's in memory and can step into dlls.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Fri May 8 18:12:12 2009 New Revision: 40838 URL: http://svn.reactos.org/svn/reactos?rev=40838&view=rev Log: - MmMapViewOfSection: Segment size must be a multiple of page size, so round ViewSize up to next page size. OllyDbg now shows loaded dll's in memory and can step into dlls. Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Fri May 8 18:12:12 2009 @@ -4690,6 +4690,8 @@ (*ViewSize) = Section->MaximumSize.u.LowPart - ViewOffset; } + *ViewSize = PAGE_ROUND_UP(*ViewSize); + MmLockSectionSegment(Section->Segment); Status = MmMapViewOfSegment(AddressSpace, Section,

15 years, 8 months

← Newer
1
...
38
39
40
41
42
43
44
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2009