Ros-diffs

ros-diffs@reactos.org

81390 discussions

[winesync] 31774: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: winesync Date: Mon Jan 14 15:43:19 2008 New Revision: 31774 URL: http://svn.reactos.org/svn/reactos?rev=31774&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/comdlg32/colordlg.c trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild trunk/reactos/dll/win32/comdlg32/filedlg.c trunk/reactos/dll/win32/comdlg32/filedlg31.c trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c trunk/reactos/dll/win32/comdlg32/finddlg32.c trunk/reactos/dll/win32/comdlg32/fontdlg.c trunk/reactos/dll/win32/comdlg32/printdlg.c Modified: trunk/reactos/dll/win32/comdlg32/colordlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/colordl… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/colordlg.c (original) +++ trunk/reactos/dll/win32/comdlg32/colordlg.c Mon Jan 14 15:43:19 2008 @@ -337,24 +337,29 @@ ClientToScreen(hDlg, &point); hwnd = GetDlgItem( hDlg, dlgitem ); GetWindowRect(hwnd, &rect); - if (PtInRect(&rect, point)) - { - GetClientRect(hwnd, &rect); - ScreenToClient(hwnd, &point); - - x = (long) point.x * MAXHORI; - x /= rect.right; - y = (long) (rect.bottom - point.y) * MAXVERT; - y /= rect.bottom; - - if (hori) - *hori = x; - if (vert) - *vert = y; - return 1; - } - else + + if (!PtInRect(&rect, point)) return 0; + + GetClientRect(hwnd, &rect); + ScreenToClient(hwnd, &point); + + x = (long) point.x * MAXHORI; + x /= rect.right; + y = (long) (rect.bottom - point.y) * MAXVERT; + y /= rect.bottom; + + if (x < 0) x = 0; + if (y < 0) y = 0; + if (x > MAXHORI) x = MAXHORI; + if (y > MAXVERT) y = MAXVERT; + + if (hori) + *hori = x; + if (vert) + *vert = y; + + return 1; } /*********************************************************************** * CC_MouseCheckResultWindow [internal] @@ -436,16 +441,8 @@ hBrush = CreateSolidBrush(cr); if (hBrush) { - hBrush = SelectObject(hdc, hBrush) ; - Rectangle(hdc, rect.left, rect.top, rect.right/2, rect.bottom); - DeleteObject ( SelectObject(hdc, hBrush) ) ; - hBrush = CreateSolidBrush( GetNearestColor(hdc, cr) ); - if (hBrush) - { - hBrush = SelectObject(hdc, hBrush) ; - Rectangle(hdc, rect.right/2-1, rect.top, rect.right, rect.bottom); - DeleteObject(SelectObject(hdc, hBrush)) ; - } + FillRect(hdc, &rect, hBrush); + DrawEdge(hdc, &rect, BDR_SUNKENOUTER, BF_RECT); } ReleaseDC(hwnd, hdc); } @@ -458,7 +455,7 @@ { HDC hDC; long temp; - int w = LOWORD(GetDialogBaseUnits()); + int w = LOWORD(GetDialogBaseUnits()) / 2; POINT points[3]; int height; int oben; @@ -479,6 +476,7 @@ oben = points[0].y; /* | \ | */ /* | \| */ temp = (long)height * (long)y; + points[0].x += 1; points[0].y = oben + height - temp / (long)MAXVERT; points[1].y = points[0].y + w; points[2].y = points[0].y - w; @@ -491,7 +489,11 @@ lpp->old3angle.right = points[1].x + 1; lpp->old3angle.top = points[2].y - 1; lpp->old3angle.bottom= points[1].y + 1; + + hbr = SelectObject(hDC, GetStockObject(BLACK_BRUSH)); Polygon(hDC, points, 3); + SelectObject(hDC, hbr); + ReleaseDC(hDlg, hDC); } } @@ -503,7 +505,8 @@ void CC_PaintCross( HWND hDlg, int x, int y) { HDC hDC; - int w = GetDialogBaseUnits(); + int w = GetDialogBaseUnits() - 1; + int wc = GetDialogBaseUnits() * 3 / 4; HWND hwnd = GetDlgItem(hDlg, 0x2c6); LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp ); RECT rect; @@ -515,8 +518,7 @@ GetClientRect(hwnd, &rect); hDC = GetDC(hwnd); SelectClipRgn( hDC, CreateRectRgnIndirect(&rect)); - hPen = CreatePen(PS_SOLID, 2, 0xffffff); /* -white- color */ - hPen = SelectObject(hDC, hPen); + point.x = ((long)rect.right * (long)x) / (long)MAXHORI; point.y = rect.bottom - ((long)rect.bottom * (long)y) / (long)MAXVERT; if ( lpp->oldcross.left != lpp->oldcross.right ) @@ -529,11 +531,18 @@ lpp->oldcross.top = point.y - w - 1; lpp->oldcross.bottom = point.y + w + 1; + hPen = CreatePen(PS_SOLID, 3, 0x000000); /* -black- color */ + hPen = SelectObject(hDC, hPen); MoveToEx(hDC, point.x - w, point.y, &p); + LineTo(hDC, point.x - wc, point.y); + MoveToEx(hDC, point.x + wc, point.y, &p); LineTo(hDC, point.x + w, point.y); MoveToEx(hDC, point.x, point.y - w, &p); + LineTo(hDC, point.x, point.y - wc); + MoveToEx(hDC, point.x, point.y + wc, &p); LineTo(hDC, point.x, point.y + w); - DeleteObject( SelectObject(hDC, hPen)) ; + DeleteObject( SelectObject(hDC, hPen)); + ReleaseDC(hwnd, hDC); } } @@ -642,7 +651,7 @@ rect.bottom = rect.top; } GetClientRect(hwnd, &rect); - FrameRect(hDC, &rect, GetStockObject(BLACK_BRUSH) ); + DrawEdge(hDC, &rect, BDR_SUNKENOUTER, BF_RECT); ReleaseDC(hwnd, hDC); } } @@ -730,7 +739,7 @@ static void CC_PaintPredefColorArray( HWND hDlg, int rows, int cols) { HWND hwnd = GetDlgItem(hDlg, 0x2d0); - RECT rect; + RECT rect, blockrect; HDC hdc; HBRUSH hBrush; int dx, dy, i, j, k; @@ -753,14 +762,17 @@ hBrush = CreateSolidBrush(predefcolors[j][i]); if (hBrush) { - hBrush = SelectObject(hdc, hBrush); - Rectangle(hdc, rect.left, rect.top, - rect.left + dx - DISTANCE, rect.top + dy - DISTANCE); - rect.left = rect.left + dx; - DeleteObject(SelectObject(hdc, hBrush)) ; + blockrect.left = rect.left; + blockrect.top = rect.top; + blockrect.right = rect.left + dx - DISTANCE; + blockrect.bottom = rect.top + dy - DISTANCE; + FillRect(hdc, &blockrect, hBrush); + DrawEdge(hdc, &blockrect, BDR_SUNKEN, BF_RECT); + DeleteObject(hBrush); } + rect.left += dx; } - rect.top = rect.top + dy; + rect.top += dy; rect.left = k; } ReleaseDC(hwnd, hdc); @@ -774,7 +786,7 @@ void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, const COLORREF *lpcr ) { HWND hwnd = GetDlgItem(hDlg, 0x2d1); - RECT rect; + RECT rect, blockrect; HDC hdc; HBRUSH hBrush; int dx, dy, i, j, k; @@ -799,14 +811,17 @@ hBrush = CreateSolidBrush(lpcr[i+j*cols]); if (hBrush) { - hBrush = SelectObject(hdc, hBrush) ; - Rectangle(hdc, rect.left, rect.top, - rect.left + dx - DISTANCE, rect.top + dy - DISTANCE); - rect.left = rect.left + dx; - DeleteObject( SelectObject(hdc, hBrush) ) ; + blockrect.left = rect.left; + blockrect.top = rect.top; + blockrect.right = rect.left + dx - DISTANCE; + blockrect.bottom = rect.top + dy - DISTANCE; + FillRect(hdc, &blockrect, hBrush); + DrawEdge(hdc, &blockrect, BDR_SUNKEN, BF_RECT); + DeleteObject(hBrush); } + rect.left += dx; } - rect.top = rect.top + dy; + rect.top += dy; rect.left = k; } ReleaseDC(hwnd, hdc); @@ -814,7 +829,6 @@ if (lpp->hwndFocus == hwnd) CC_DrawCurrentFocusRect(lpp); } - /*********************************************************************** @@ -1075,10 +1089,10 @@ CC_PaintPredefColorArray(hDlg, 6, 8); CC_PaintUserColorArray(hDlg, 2, 8, lpp->lpcc->lpCustColors); CC_PaintLumBar(hDlg, lpp->h, lpp->s); - CC_PaintCross(hDlg, lpp->h, lpp->s); CC_PaintTriangle(hDlg, lpp->l); CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); CC_PaintColorGraph(hDlg); + CC_PaintCross(hDlg, lpp->h, lpp->s); EndPaint(hDlg, &ps); return TRUE; @@ -1346,7 +1360,7 @@ lpcc->lpCustColors = lpChCol->lpCustColors; lpcc->Flags = lpChCol->Flags; lpcc->lCustData = lpChCol->lCustData; - lpcc->lpfnHook = (LPCCHOOKPROC) lpChCol->lpfnHook; + lpcc->lpfnHook = lpChCol->lpfnHook; if ((lpcc->Flags & CC_ENABLETEMPLATE) && (lpChCol->lpTemplateName)) { if (HIWORD(lpChCol->lpTemplateName)) { INT len = MultiByteToWideChar( CP_ACP, 0, lpChCol->lpTemplateName, -1, NULL, 0); Modified: trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/comdlg3… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild (original) +++ trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild Mon Jan 14 15:43:19 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" allowwarnings="true"> <importlibrary definition="comdlg32.spec.def" /> <include base="comdlg32">.</include> @@ -30,3 +31,4 @@ <file>rsrc.rc</file> <file>comdlg32.spec</file> </module> +</group> 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 (original) +++ trunk/reactos/dll/win32/comdlg32/filedlg.c Mon Jan 14 15:43:19 2008 @@ -2140,7 +2140,6 @@ if(lstrlenW(lpstrPathAndFile) < fodInfos->ofnInfos->nMaxFile - ((fodInfos->ofnInfos->Flags & OFN_ALLOWMULTISELECT) ? 1 : 0)) { - LPWSTR lpszTemp; /* fill destination buffer */ if (fodInfos->ofnInfos->lpstrFile) @@ -2164,13 +2163,31 @@ } } - /* set filename offset */ - lpszTemp = PathFindFileNameW(lpstrPathAndFile); - fodInfos->ofnInfos->nFileOffset = (lpszTemp - lpstrPathAndFile); - - /* set extension offset */ - lpszTemp = PathFindExtensionW(lpstrPathAndFile); - fodInfos->ofnInfos->nFileExtension = (*lpszTemp) ? (lpszTemp - lpstrPathAndFile) + 1 : 0; + if(fodInfos->unicode) + { + LPWSTR lpszTemp; + + /* set filename offset */ + lpszTemp = PathFindFileNameW(lpstrPathAndFile); + fodInfos->ofnInfos->nFileOffset = (lpszTemp - lpstrPathAndFile); + + /* set extension offset */ + lpszTemp = PathFindExtensionW(lpstrPathAndFile); + fodInfos->ofnInfos->nFileExtension = (*lpszTemp) ? (lpszTemp - lpstrPathAndFile) + 1 : 0; + } + else + { + LPSTR lpszTemp; + LPOPENFILENAMEA ofn = (LPOPENFILENAMEA)fodInfos->ofnInfos; + + /* set filename offset */ + lpszTemp = PathFindFileNameA(ofn->lpstrFile); + fodInfos->ofnInfos->nFileOffset = (lpszTemp - ofn->lpstrFile); + + /* set extension offset */ + lpszTemp = PathFindExtensionA(ofn->lpstrFile); + fodInfos->ofnInfos->nFileExtension = (*lpszTemp) ? (lpszTemp - ofn->lpstrFile) + 1 : 0; + } /* set the lpstrFileTitle */ if(fodInfos->ofnInfos->lpstrFileTitle) @@ -3658,12 +3675,20 @@ if (priv->ofnA) { + LPSTR lpszTemp; if (ofnW->nMaxFile && !WideCharToMultiByte( CP_ACP, 0, ofnW->lpstrFile, -1, priv->ofnA->lpstrFile, ofnW->nMaxFile, NULL, NULL )) priv->ofnA->lpstrFile[ofnW->nMaxFile-1] = 0; - priv->ofnA->nFileOffset = ofnW->nFileOffset; - priv->ofnA->nFileExtension = ofnW->nFileExtension; + + /* offsets are not guarenteed to be the same in WCHAR to MULTIBYTE conversion */ + /* set filename offset */ + lpszTemp = PathFindFileNameA(priv->ofnA->lpstrFile); + priv->ofnA->nFileOffset = (lpszTemp - priv->ofnA->lpstrFile); + + /* set extension offset */ + lpszTemp = PathFindExtensionA(priv->ofnA->lpstrFile); + priv->ofnA->nFileExtension = (*lpszTemp) ? (lpszTemp - priv->ofnA->lpstrFile) + 1 : 0; } } Modified: trunk/reactos/dll/win32/comdlg32/filedlg31.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlg31.c (original) +++ trunk/reactos/dll/win32/comdlg32/filedlg31.c Mon Jan 14 15:43:19 2008 @@ -113,59 +113,8 @@ } /*********************************************************************** - * FD31_ScanDir [internal] - */ -static BOOL FD31_ScanDir(HWND hWnd, LPCWSTR newPath) -{ - WCHAR buffer[BUFFILE]; - HWND hdlg, hdlgDir; - LRESULT lRet = TRUE; - HCURSOR hCursorWait, oldCursor; - - TRACE("Trying to change to %s\n", debugstr_w(newPath)); - if ( newPath[0] && !SetCurrentDirectoryW( newPath )) - return FALSE; - lstrcpynW(buffer, newPath, sizeof(buffer)/sizeof(WCHAR)); - - /* get the list of spec files */ - GetDlgItemTextW(hWnd, edt1, buffer, sizeof(buffer)/sizeof(WCHAR)); - - hCursorWait = LoadCursorA(0, (LPSTR)IDC_WAIT); - oldCursor = SetCursor(hCursorWait); - - /* list of files */ - if ((hdlg = GetDlgItem(hWnd, lst1)) != 0) { - WCHAR* scptr; /* ptr on semi-colon */ - WCHAR* filter = buffer; - - TRACE("Using filter %s\n", debugstr_w(filter)); - SendMessageW(hdlg, LB_RESETCONTENT, 0, 0); - while (filter) { - scptr = strchrW(filter, ';'); - if (scptr) *scptr = 0; - while (*filter == ' ') filter++; - TRACE("Using file spec %s\n", debugstr_w(filter)); - if (SendMessageW(hdlg, LB_DIR, 0, (LPARAM)filter) == LB_ERR) - return FALSE; - if (scptr) *scptr = ';'; - filter = (scptr) ? (scptr + 1) : 0; - } - } - - /* list of directories */ - strcpyW(buffer, FILE_star); - - if ((hdlgDir = GetDlgItem(hWnd, lst2)) != 0) { - lRet = DlgDirListW(hWnd, buffer, lst2, stc1, DDL_EXCLUSIVE | DDL_DIRECTORY); - } - SetCursor(oldCursor); - return lRet; -} - -/*********************************************************************** * FD31_GetFileType [internal] */ - static LPCWSTR FD31_GetFileType(LPCWSTR cfptr, LPCWSTR fptr, const WORD index) { int n, i; @@ -187,6 +136,55 @@ fptr += lstrlenW(fptr) + 1; } return FILE_star; /* FIXME */ +} + +/*********************************************************************** + * FD31_ScanDir [internal] + */ +static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath) +{ + WCHAR buffer[BUFFILE]; + HWND hdlg, hdlgDir; + LRESULT lRet = TRUE; + HCURSOR hCursorWait, oldCursor; + + TRACE("Trying to change to %s\n", debugstr_w(newPath)); + if ( newPath[0] && !SetCurrentDirectoryW( newPath )) + return FALSE; + + /* get the list of spec files */ + lstrcpynW(buffer, FD31_GetFileType(ofn->lpstrCustomFilter, + ofn->lpstrFilter, ofn->nFilterIndex - 1), BUFFILE); + + hCursorWait = LoadCursorA(0, (LPSTR)IDC_WAIT); + oldCursor = SetCursor(hCursorWait); + + /* list of files */ + if ((hdlg = GetDlgItem(hWnd, lst1)) != 0) { + WCHAR* scptr; /* ptr on semi-colon */ + WCHAR* filter = buffer; + + TRACE("Using filter %s\n", debugstr_w(filter)); + SendMessageW(hdlg, LB_RESETCONTENT, 0, 0); + while (filter) { + scptr = strchrW(filter, ';'); + if (scptr) *scptr = 0; + while (*filter == ' ') filter++; + TRACE("Using file spec %s\n", debugstr_w(filter)); + SendMessageW(hdlg, LB_DIR, 0, (LPARAM)filter); + if (scptr) *scptr = ';'; + filter = (scptr) ? (scptr + 1) : 0; + } + } + + /* list of directories */ + strcpyW(buffer, FILE_star); + + if ((hdlgDir = GetDlgItem(hWnd, lst2)) != 0) { + lRet = DlgDirListW(hWnd, buffer, lst2, stc1, DDL_EXCLUSIVE | DDL_DIRECTORY); + } + SetCursor(oldCursor); + return lRet; } /*********************************************************************** @@ -375,7 +373,7 @@ } strcatW(tmpstr, FILE_bslash); - FD31_ScanDir(hWnd, tmpstr); + FD31_ScanDir(lfs->ofnW, hWnd, tmpstr); /* notify the app */ if (lfs->hook) { @@ -450,7 +448,7 @@ TRACE("path=%s, tmpstr2=%s\n", debugstr_w(path), debugstr_w(tmpstr2)); SetDlgItemTextW( hWnd, edt1, tmpstr2 ); - FD31_ScanDir(hWnd, path); + FD31_ScanDir(lfs->ofnW, hWnd, path); return (lfs->ofnW->Flags & OFN_NOVALIDATE) ? TRUE : FALSE; } @@ -462,7 +460,7 @@ strcatW(path, FILE_bslash); /* if ScanDir succeeds, we have changed the directory */ - if (FD31_ScanDir(hWnd, path)) + if (FD31_ScanDir(lfs->ofnW, hWnd, path)) return FALSE; /* and path is not a valid file name */ /* if not, this must be a filename */ @@ -477,7 +475,7 @@ lstrcpynW(tmpstr2, pBeginFileName + 1, sizeof(tmpstr2)/sizeof(WCHAR) ); /* Should we MessageBox() if this fails? */ - if (!FD31_ScanDir(hWnd, path)) + if (!FD31_ScanDir(lfs->ofnW, hWnd, path)) { return FALSE; } @@ -531,7 +529,7 @@ FD31_UpdateFileTitle(lfs); if (lfs->hook) { - lRet = (BOOL)FD31_CallWindowProc(lfs, lfs->fileokstring, + lRet = FD31_CallWindowProc(lfs, lfs->fileokstring, 0, lfs->lParam ); if (lRet) { @@ -543,7 +541,7 @@ { if (ofnW->lpstrFile) { - LPWSTR str = (LPWSTR)ofnW->lpstrFile; + LPWSTR str = ofnW->lpstrFile; LPWSTR ptr = strrchrW(str, '\\'); str[lstrlenW(str) + 1] = '\0'; *ptr = 0; @@ -590,7 +588,6 @@ return TRUE; pstr = (LPWSTR)SendDlgItemMessageW(lfs->hwnd, cmb1, CB_GETITEMDATA, lRet, 0); TRACE("Selected filter : %s\n", debugstr_w(pstr)); - SetDlgItemTextW( lfs->hwnd, edt1, pstr ); return FD31_Validate( lfs, NULL, cmb1, lRet, TRUE ); } @@ -871,11 +868,19 @@ if (ofn->nFilterIndex == 0 && ofn->lpstrCustomFilter == NULL) ofn->nFilterIndex = 1; SendDlgItemMessageW(hWnd, cmb1, CB_SETCURSEL, ofn->nFilterIndex - 1, 0); - lstrcpynW(tmpstr, FD31_GetFileType(ofn->lpstrCustomFilter, + if (ofn->lpstrFile && ofn->lpstrFile[0]) + { + TRACE( "SetText of edt1 to %s\n", debugstr_w(ofn->lpstrFile) ); + SetDlgItemTextW( hWnd, edt1, ofn->lpstrFile ); + } + else + { + lstrcpynW(tmpstr, FD31_GetFileType(ofn->lpstrCustomFilter, ofn->lpstrFilter, ofn->nFilterIndex - 1),BUFFILE); - TRACE("nFilterIndex = %d, SetText of edt1 to %s\n", + TRACE("nFilterIndex = %d, SetText of edt1 to %s\n", ofn->nFilterIndex, debugstr_w(tmpstr)); - SetDlgItemTextW( hWnd, edt1, tmpstr ); + SetDlgItemTextW( hWnd, edt1, tmpstr ); + } /* get drive list */ *tmpstr = 0; DlgDirListComboBoxW(hWnd, tmpstr, cmb2, 0, DDL_DRIVES | DDL_EXCLUSIVE); @@ -896,9 +901,9 @@ } else *tmpstr = 0; - if (!FD31_ScanDir(hWnd, tmpstr)) { + if (!FD31_ScanDir(ofn, hWnd, tmpstr)) { *tmpstr = 0; - if (!FD31_ScanDir(hWnd, tmpstr)) + if (!FD31_ScanDir(ofn, hWnd, tmpstr)) WARN("Couldn't read initial directory %s!\n", debugstr_w(tmpstr)); } /* select current drive in combo 2, omit missing drives */ @@ -919,7 +924,7 @@ if (ofn->Flags & OFN_HIDEREADONLY) ShowWindow(GetDlgItem(hWnd, chx1), SW_HIDE); if (lfs->hook) - return (BOOL) FD31_CallWindowProc(lfs, WM_INITDIALOG, wParam, lfs->lParam); + return FD31_CallWindowProc(lfs, WM_INITDIALOG, wParam, lfs->lParam); return TRUE; } 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 (original) +++ trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c Mon Jan 14 15:43:19 2008 @@ -117,11 +117,11 @@ FE(SBSP_INITIATEDBYHLINKFRAME), }; #undef FE - DPRINTF("SBSP Flags: %08x =", uflags); + TRACE("SBSP Flags: %08x =", uflags); for (i = 0; i < (sizeof(flags) / sizeof(flags[0])); i++) if (flags[i].mask & uflags) - DPRINTF("%s ", flags[i].name); - DPRINTF("\n"); + TRACE("%s ", flags[i].name); + TRACE("\n"); } } @@ -375,8 +375,7 @@ return hRes; } /* create an absolute pidl */ - pidlTmp = COMDLG32_PIDL_ILCombine(fodInfos->ShellInfos.pidlAbsCurrent, - (LPCITEMIDLIST)pidl); + pidlTmp = COMDLG32_PIDL_ILCombine(fodInfos->ShellInfos.pidlAbsCurrent, pidl); } else if(wFlags & SBSP_PARENT) { @@ -388,7 +387,7 @@ else /* SBSP_ABSOLUTE is 0x0000 */ { /* An absolute pidl (relative from the desktop) */ - pidlTmp = COMDLG32_PIDL_ILClone((LPCITEMIDLIST)pidl); + pidlTmp = COMDLG32_PIDL_ILClone(pidl); psfTmp = GetShellFolderFromPidl(pidlTmp); } Modified: trunk/reactos/dll/win32/comdlg32/finddlg32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/finddlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/finddlg32.c (original) +++ trunk/reactos/dll/win32/comdlg32/finddlg32.c Mon Jan 14 15:43:19 2008 @@ -382,7 +382,7 @@ HRSRC htemplate; if(pdata->fr.Flags & FR_ENABLETEMPLATE) { - hmod = (HMODULE)pdata->fr.hInstance; + hmod = pdata->fr.hInstance; if(pdata->fr.Flags & FR_WINE_UNICODE) { htemplate = FindResourceW(hmod, (LPCWSTR)pdata->fr.lpTemplateName, (LPWSTR)RT_DIALOG); Modified: trunk/reactos/dll/win32/comdlg32/fontdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/fontdlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/fontdlg.c (original) +++ trunk/reactos/dll/win32/comdlg32/fontdlg.c Mon Jan 14 15:43:19 2008 @@ -223,7 +223,7 @@ /*********************************************************************** * ChooseFontA (COMDLG32.@) * - * See ChosseFontW. + * See ChooseFontW. */ BOOL WINAPI ChooseFontA(LPCHOOSEFONTA lpChFont) { Modified: trunk/reactos/dll/win32/comdlg32/printdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/printdl… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/printdlg.c (original) +++ trunk/reactos/dll/win32/comdlg32/printdlg.c Mon Jan 14 15:43:19 2008 @@ -2340,6 +2340,7 @@ typedef struct { LPPAGESETUPDLGW dlga; PRINTDLGW pdlg; + PAGESETUPDLGW curdlg; /* Current dialog state */ } PageSetupDataW; @@ -2683,6 +2684,46 @@ return TRUE; } +static void PRINTDLG_PS_SetOrientationW(HWND hDlg, PageSetupDataW* pda) +{ + WCHAR PaperName[64]; + + GetDlgItemTextW(hDlg, cmb2, PaperName, sizeof(PaperName)/sizeof(WCHAR)); + PRINTDLG_PaperSizeW(&pda->pdlg, PaperName, &pda->curdlg.ptPaperSize); + pda->curdlg.ptPaperSize.x = _c_10mm2size((LPPAGESETUPDLGA)pda->dlga, pda->curdlg.ptPaperSize.x); + pda->curdlg.ptPaperSize.y = _c_10mm2size((LPPAGESETUPDLGA)pda->dlga, pda->curdlg.ptPaperSize.y); + + if(IsDlgButtonChecked(hDlg, rad2)) + { + DWORD tmp = pda->curdlg.ptPaperSize.x; + pda->curdlg.ptPaperSize.x = pda->curdlg.ptPaperSize.y; + pda->curdlg.ptPaperSize.y = tmp; + } +} + +static void PRINTDLG_PS_UpdatePrintDlgW(PageSetupDataW* pda, HWND hDlg) +{ + DEVMODEW* dm; + DWORD sel; + + dm = GlobalLock(pda->pdlg.hDevMode); + + if(!dm) + return; + + if(pda->curdlg.ptPaperSize.y > pda->curdlg.ptPaperSize.x) + dm->u1.s1.dmOrientation = DMORIENT_PORTRAIT; + else + dm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE; + + sel = SendDlgItemMessageW(hDlg, cmb2, CB_GETCURSEL, 0, 0); + + if(sel != CB_ERR) + dm->u1.s1.dmPaperSize = SendDlgItemMessageW(hDlg, cmb2, CB_GETITEMDATA, sel, 0); + + GlobalUnlock(pda->pdlg.hDevMode); +} + static BOOL PRINTDLG_PS_ChangePrinterW(HWND hDlg, PageSetupDataW *pda) { DEVNAMES *dn; @@ -2695,8 +2736,18 @@ portname = ((WCHAR*)dn)+dn->wOutputOffset; PRINTDLG_SetUpPaperComboBoxW(hDlg,cmb2,devname,portname,dm); PRINTDLG_SetUpPaperComboBoxW(hDlg,cmb3,devname,portname,dm); + + /* Landscape orientation */ + if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE) + CheckRadioButton(hDlg, rad1, rad2, rad2); + else /* this is default if papersize is not set */ + CheckRadioButton(hDlg, rad1, rad2, rad1); + GlobalUnlock(pda->pdlg.hDevNames); GlobalUnlock(pda->pdlg.hDevMode); + + PRINTDLG_PS_SetOrientationW(hDlg, pda); + return TRUE; } @@ -2791,21 +2842,30 @@ } return TRUE; case rad1: - if (pda->curdlg.ptPaperSize.x > pda->curdlg.ptPaperSize.y){ - DWORD tmp = pda->curdlg.ptPaperSize.x; - pda->curdlg.ptPaperSize.x = pda->curdlg.ptPaperSize.y; - pda->curdlg.ptPaperSize.y = tmp; - } + case rad2: + if((id == rad1 && pda->curdlg.ptPaperSize.x > pda->curdlg.ptPaperSize.y) || + (id == rad2 && pda->curdlg.ptPaperSize.y > pda->curdlg.ptPaperSize.x)) + { + char TmpText[25]; + char TmpText2[25]; + DWORD tmp = pda->curdlg.ptPaperSize.x; + + pda->curdlg.ptPaperSize.x = pda->curdlg.ptPaperSize.y; + pda->curdlg.ptPaperSize.y = tmp; + + GetDlgItemTextA(hDlg, edt4, TmpText, sizeof(TmpText)); + GetDlgItemTextA(hDlg, edt5, TmpText2, sizeof(TmpText2)); + SetDlgItemTextA(hDlg, edt5, TmpText); + SetDlgItemTextA(hDlg, edt4, TmpText2); + + GetDlgItemTextA(hDlg, edt6, TmpText, sizeof(TmpText)); + GetDlgItemTextA(hDlg, edt7, TmpText2, sizeof(TmpText2)); + SetDlgItemTextA(hDlg, edt7, TmpText); + SetDlgItemTextA(hDlg, edt6, TmpText2); + PRINTDLG_PS_ChangePaperPrev(pda); + } break; - case rad2: - if (pda->curdlg.ptPaperSize.y > pda->curdlg.ptPaperSize.x){ - DWORD tmp = pda->curdlg.ptPaperSize.x; - pda->curdlg.ptPaperSize.x = pda->curdlg.ptPaperSize.y; - pda->curdlg.ptPaperSize.y = tmp; - } - PRINTDLG_PS_ChangePaperPrev(pda); - break; case cmb1: /* Printer combo */ if(msg == CBN_SELCHANGE){ char crPrinterName[256]; @@ -2890,10 +2950,10 @@ GETVAL(id, pda->curdlg.rtMargin.left); break; case edt5: - GETVAL(id, pda->curdlg.rtMargin.right); + GETVAL(id, pda->curdlg.rtMargin.top); break; case edt6: - GETVAL(id, pda->curdlg.rtMargin.top); + GETVAL(id, pda->curdlg.rtMargin.right); break; case edt7: GETVAL(id, pda->curdlg.rtMargin.bottom); @@ -2921,9 +2981,34 @@ EndDialog(hDlg, FALSE); return FALSE ; + case rad1: + case rad2: + if((LOWORD(wParam) == rad1 && pda->curdlg.ptPaperSize.x > pda->curdlg.ptPaperSize.y) || + (LOWORD(wParam) == rad2 && pda->curdlg.ptPaperSize.y > pda->curdlg.ptPaperSize.x)) + { + WCHAR tmpText[25]; + WCHAR tmpText2[25]; + DWORD tmp = pda->curdlg.ptPaperSize.y; + + pda->curdlg.ptPaperSize.y = pda->curdlg.ptPaperSize.x; + pda->curdlg.ptPaperSize.x = tmp; + + GetDlgItemTextW(hDlg, edt4, tmpText, sizeof(tmpText)/sizeof(WCHAR)); + GetDlgItemTextW(hDlg, edt5, tmpText2, sizeof(tmpText2)/sizeof(WCHAR)); + SetDlgItemTextW(hDlg, edt5, tmpText); + SetDlgItemTextW(hDlg, edt4, tmpText2); + + GetDlgItemTextW(hDlg, edt6, tmpText, sizeof(tmpText)/sizeof(WCHAR)); + GetDlgItemTextW(hDlg, edt7, tmpText2, sizeof(tmpText2)/sizeof(WCHAR)); + SetDlgItemTextW(hDlg, edt7, tmpText); + SetDlgItemTextW(hDlg, edt6, tmpText2); + } + break; + case psh3: { pda->pdlg.Flags = 0; pda->pdlg.hwndOwner = hDlg; + PRINTDLG_PS_UpdatePrintDlgW(pda, hDlg); if (PrintDlgW(&(pda->pdlg))) PRINTDLG_PS_ChangePrinterW(hDlg,pda); return TRUE; @@ -3069,12 +3154,12 @@ scalx = rcClient.right / (double)pda->curdlg.ptPaperSize.x; scaly = rcClient.bottom / (double)pda->curdlg.ptPaperSize.y; rcMargin = rcClient; - - rcMargin.left += (LONG)pda->curdlg.rtMargin.left * scalx; - rcMargin.top += (LONG)pda->curdlg.rtMargin.top * scalx; - rcMargin.right -= (LONG)pda->curdlg.rtMargin.right * scaly; - rcMargin.bottom -= (LONG)pda->curdlg.rtMargin.bottom * scaly; - + + rcMargin.left += pda->curdlg.rtMargin.left * scalx; + rcMargin.top += pda->curdlg.rtMargin.top * scalx; + rcMargin.right -= pda->curdlg.rtMargin.right * scaly; + rcMargin.bottom -= pda->curdlg.rtMargin.bottom * scaly; + /* if the space is too small then we make sure to not draw anything */ rcMargin.left = min(rcMargin.left, rcMargin.right); rcMargin.top = min(rcMargin.top, rcMargin.bottom); @@ -3268,12 +3353,12 @@ { '_', '_', 'W', 'I', 'N', 'E', '_', 'P', 'A', 'G', 'E', 'S', 'E', 'T', 'U', 'P', 'D', 'L', 'G', 'D', 'A', 'T', 'A', 0 }; PageSetupDataW *pda; - LPDEVMODEW dm; BOOL res = FALSE; if (uMsg==WM_INITDIALOG) { res = TRUE; pda = (PageSetupDataW*)lParam; + memcpy(&pda->curdlg, pda, sizeof(pda->curdlg)); SetPropW(hDlg, __WINE_PAGESETUPDLGDATA, pda); if (pda->dlga->Flags & PSD_ENABLEPAGESETUPHOOK) { res = pda->dlga->lpfnPageSetupHook(hDlg,uMsg,wParam,(LPARAM)pda->dlga); @@ -3295,16 +3380,7 @@ EnableWindow(GetDlgItem(hDlg, edt7), FALSE); } - if(pda->dlga->hDevMode) - { - dm = GlobalLock(pda->dlga->hDevMode); - /* Landscape orientation */ - if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE) - CheckRadioButton(hDlg, rad1, rad2, rad2); - else /* this is default if papersize is not set */ - CheckRadioButton(hDlg, rad1, rad2, rad1); - GlobalUnlock(pda->dlga->hDevMode); - } + PRINTDLG_PS_ChangePrinterW(hDlg,pda); if (pda->dlga->Flags & PSD_DISABLEORIENTATION) { EnableWindow(GetDlgItem(hDlg,rad1),FALSE); @@ -3331,7 +3407,7 @@ SetDlgItemTextW(hDlg,edt6,str); SetDlgItemTextW(hDlg,edt7,str); } - PRINTDLG_PS_ChangePrinterW(hDlg,pda); + if (pda->dlga->Flags & PSD_DISABLEPAPER) { EnableWindow(GetDlgItem(hDlg,cmb2),FALSE); EnableWindow(GetDlgItem(hDlg,cmb3),FALSE);

1 0

[winesync] 31773: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: winesync Date: Mon Jan 14 15:40:24 2008 New Revision: 31773 URL: http://svn.reactos.org/svn/reactos?rev=31773&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/commctrl.c trunk/reactos/dll/win32/comctl32/datetime.c trunk/reactos/dll/win32/comctl32/header.c trunk/reactos/dll/win32/comctl32/ipaddress.c trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/monthcal.c trunk/reactos/dll/win32/comctl32/pager.c trunk/reactos/dll/win32/comctl32/propsheet.c trunk/reactos/dll/win32/comctl32/rebar.c trunk/reactos/dll/win32/comctl32/status.c trunk/reactos/dll/win32/comctl32/syslink.c trunk/reactos/dll/win32/comctl32/tab.c trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/dll/win32/comctl32/tooltips.c trunk/reactos/dll/win32/comctl32/trackbar.c trunk/reactos/dll/win32/comctl32/treeview.c trunk/reactos/dll/win32/comctl32/updown.c Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.rbuild (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.rbuild Mon Jan 14 15:40:24 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="DllInstall" /> <importlibrary definition="comctl32.spec.def" /> @@ -54,3 +55,4 @@ <file>rsrc.rc</file> <file>comctl32.spec</file> </module> +</group> Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Mon Jan 14 15:40:24 2008 @@ -86,7 +86,7 @@ =================================================================== --- tooltips.c (revision 25790) +++ tooltips.c (working copy) -@@ -2440,7 +2440,34 @@ +@@ -2433,7 +2433,34 @@ TOOLTIPS_NotifyFormat (HWND hwnd, WPARAM wParam, LPARAM lParam) { FIXME ("hwnd=%p wParam=%lx lParam=%lx\n", hwnd, wParam, lParam); @@ -125,7 +125,7 @@ =================================================================== --- treeview.c (revision 27134) +++ treeview.c (working copy) -@@ -2844,8 +2844,6 @@ +@@ -2834,8 +2834,6 @@ } } 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 (original) +++ trunk/reactos/dll/win32/comctl32/commctrl.c Mon Jan 14 15:40:24 2008 @@ -207,7 +207,7 @@ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); - COMCTL32_hModule = (HMODULE)hinstDLL; + COMCTL32_hModule = hinstDLL; /* add global subclassing atom (used by 'tooltip' and 'updown') */ COMCTL32_wSubclass = (LPWSTR)(DWORD_PTR)GlobalAddAtomW (strCC32SubclassInfo); @@ -715,7 +715,7 @@ * * NOTES * Probaly all versions of comctl32 initializes the Win95 controls in DllMain - * during DLL initializaiton. Starting from comctl32 v5.82 all the controls + * during DLL initialization. Starting from comctl32 v5.82 all the controls * are initialized there. We follow this behaviour and this function is just * a dummy. * @@ -885,7 +885,7 @@ return 0; RtlMoveMemory (lpBitmapInfo, lpBitmap, nSize); - pColorTable = (RGBQUAD*)(((LPBYTE)lpBitmapInfo)+(UINT)lpBitmapInfo->biSize); + pColorTable = (RGBQUAD*)(((LPBYTE)lpBitmapInfo) + lpBitmapInfo->biSize); for (iColor = 0; iColor < nColorTableSize; iColor++) { for (i = 0; i < iMaps; i++) { @@ -907,8 +907,8 @@ } } } - nWidth = (INT)lpBitmapInfo->biWidth; - nHeight = (INT)lpBitmapInfo->biHeight; + nWidth = lpBitmapInfo->biWidth; + nHeight = lpBitmapInfo->biHeight; hdcScreen = GetDC (NULL); hbm = CreateCompatibleBitmap (hdcScreen, nWidth, nHeight); if (hbm) { Modified: trunk/reactos/dll/win32/comctl32/datetime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/datetim… ============================================================================== --- trunk/reactos/dll/win32/comctl32/datetime.c (original) +++ trunk/reactos/dll/win32/comctl32/datetime.c Mon Jan 14 15:40:24 2008 @@ -1072,7 +1072,7 @@ TRACE("got focus from %p\n", lostFocus); /* if monthcal is open and it loses focus, close monthcal */ - if (infoPtr->hMonthCal && (lostFocus == infoPtr->hMonthCal) && \ + if (infoPtr->hMonthCal && (lostFocus == infoPtr->hMonthCal) && IsWindowVisible(infoPtr->hMonthCal)) { ShowWindow(infoPtr->hMonthCal, SW_HIDE); @@ -1108,7 +1108,7 @@ MONTHCAL_CopyTime (&infoPtr->date, &dtdtc.st); return (BOOL) SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)dtdtc.nmhdr.idFrom, (LPARAM)&dtdtc); + dtdtc.nmhdr.idFrom, (LPARAM)&dtdtc); } @@ -1123,7 +1123,7 @@ nmhdr.code = code; return (BOOL) SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr); + nmhdr.idFrom, (LPARAM)&nmhdr); } static LRESULT 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 (original) +++ trunk/reactos/dll/win32/comctl32/header.c Mon Jan 14 15:40:24 2008 @@ -783,7 +783,7 @@ nmhdr->code = code; return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmhdr->idFrom, (LPARAM)nmhdr); + nmhdr->idFrom, (LPARAM)nmhdr); } static BOOL @@ -909,9 +909,7 @@ dispInfo.lParam = lpItem->lParam; TRACE("Sending HDN_GETDISPINFO%c\n", infoPtr->nNotifyFormat == NFR_UNICODE?'W':'A'); - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM) dispInfo.hdr.idFrom, - (LPARAM) &dispInfo); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, dispInfo.hdr.idFrom, (LPARAM)&dispInfo); TRACE("SendMessage returns(mask:0x%x,str:%s,lParam:%p)\n", dispInfo.mask, Modified: trunk/reactos/dll/win32/comctl32/ipaddress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/ipaddre… ============================================================================== --- trunk/reactos/dll/win32/comctl32/ipaddress.c (original) +++ trunk/reactos/dll/win32/comctl32/ipaddress.c Mon Jan 14 15:40:24 2008 @@ -100,8 +100,7 @@ nmip.iField = field; nmip.iValue = value; - SendMessageW (infoPtr->Notify, WM_NOTIFY, - (WPARAM)nmip.hdr.idFrom, (LPARAM)&nmip); + SendMessageW (infoPtr->Notify, WM_NOTIFY, nmip.hdr.idFrom, (LPARAM)&nmip); TRACE("<-- %d\n", nmip.iValue); Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/listview.c (original) +++ trunk/reactos/dll/win32/comctl32/listview.c Mon Jan 14 15:40:24 2008 @@ -735,8 +735,7 @@ pnmh->hwndFrom = infoPtr->hwndSelf; pnmh->idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); pnmh->code = code; - result = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)pnmh->idFrom, (LPARAM)pnmh); + result = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, pnmh->idFrom, (LPARAM)pnmh); TRACE(" <= %ld\n", result); Modified: trunk/reactos/dll/win32/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/monthca… ============================================================================== --- trunk/reactos/dll/win32/comctl32/monthcal.c (original) +++ trunk/reactos/dll/win32/comctl32/monthcal.c Mon Jan 14 15:40:24 2008 @@ -1305,8 +1305,7 @@ nmds.cDayState = infoPtr->monthRange; nmds.prgDayState = Alloc(infoPtr->monthRange * sizeof(MONTHDAYSTATE)); - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmds.nmhdr.idFrom, (LPARAM)&nmds); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmds.nmhdr.idFrom, (LPARAM)&nmds); for(i=0; i<infoPtr->monthRange; i++) infoPtr->monthdayState[i] = nmds.prgDayState[i]; } @@ -1336,8 +1335,7 @@ nmds.prgDayState = Alloc (infoPtr->monthRange * sizeof(MONTHDAYSTATE)); - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmds.nmhdr.idFrom, (LPARAM)&nmds); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmds.nmhdr.idFrom, (LPARAM)&nmds); for(i=0; i<infoPtr->monthRange; i++) infoPtr->monthdayState[i] = nmds.prgDayState[i]; } @@ -1490,10 +1488,10 @@ nmsc.nmhdr.code = MCN_SELCHANGE; MONTHCAL_CopyTime(&infoPtr->minSel, &nmsc.stSelStart); MONTHCAL_CopyTime(&infoPtr->maxSel, &nmsc.stSelEnd); - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, (WPARAM)nmsc.nmhdr.idFrom, (LPARAM)&nmsc); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmsc.nmhdr.idFrom, (LPARAM)&nmsc); nmsc.nmhdr.code = MCN_SELECT; - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, (WPARAM)nmsc.nmhdr.idFrom,(LPARAM)&nmsc); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmsc.nmhdr.idFrom, (LPARAM)&nmsc); return 0; } if(hit == MCHT_CALENDARDATE) { @@ -1511,8 +1509,7 @@ MONTHCAL_CopyTime(&infoPtr->minSel,&nmsc.stSelStart); MONTHCAL_CopyTime(&infoPtr->maxSel,&nmsc.stSelEnd); - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmsc.nmhdr.idFrom,(LPARAM)&nmsc); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmsc.nmhdr.idFrom, (LPARAM)&nmsc); /* redraw both old and new days if the selected day changed */ @@ -1577,7 +1574,7 @@ nmhdr.code = NM_RELEASEDCAPTURE; TRACE("Sent notification from %p to %p\n", infoPtr->hwndSelf, infoPtr->hwndNotify); - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmhdr.idFrom, (LPARAM)&nmhdr); /* redraw if necessary */ if(redraw) InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); @@ -1589,7 +1586,7 @@ MONTHCAL_CopyTime(&infoPtr->minSel, &nmsc.stSelStart); MONTHCAL_CopyTime(&infoPtr->maxSel, &nmsc.stSelEnd); - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, (WPARAM)nmsc.nmhdr.idFrom, (LPARAM)&nmsc); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmsc.nmhdr.idFrom, (LPARAM)&nmsc); } return 0; Modified: trunk/reactos/dll/win32/comctl32/pager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/pager.c… ============================================================================== --- trunk/reactos/dll/win32/comctl32/pager.c (original) +++ trunk/reactos/dll/win32/comctl32/pager.c Mon Jan 14 15:40:24 2008 @@ -352,8 +352,7 @@ nmpgcs.dwFlag = getWidth ? PGF_CALCWIDTH : PGF_CALCHEIGHT; nmpgcs.iWidth = getWidth ? *size : 0; nmpgcs.iHeight = getWidth ? 0 : *size; - SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmpgcs.hdr.idFrom, (LPARAM)&nmpgcs); + SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, nmpgcs.hdr.idFrom, (LPARAM)&nmpgcs); *size = getWidth ? nmpgcs.iWidth : nmpgcs.iHeight; @@ -763,8 +762,7 @@ } nmpgScroll.iScroll -= 2*infoPtr->nButtonSize; - SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmpgScroll.hdr.idFrom, (LPARAM)&nmpgScroll); + SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, nmpgScroll.hdr.idFrom, (LPARAM)&nmpgScroll); TRACE("[%p] PGN_SCROLL returns iScroll=%d\n", infoPtr->hwndSelf, nmpgScroll.iScroll); @@ -1076,8 +1074,7 @@ nmhdr.hwndFrom = infoPtr->hwndSelf; nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); nmhdr.code = NM_RELEASEDCAPTURE; - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmhdr.idFrom, (LPARAM)&nmhdr); } if (IsWindow(infoPtr->hwndSelf)) KillTimer(infoPtr->hwndSelf, TIMERID1); Modified: trunk/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/propshe… ============================================================================== --- trunk/reactos/dll/win32/comctl32/propsheet.c (original) +++ trunk/reactos/dll/win32/comctl32/propsheet.c Mon Jan 14 15:40:24 2008 @@ -522,7 +522,7 @@ p += 2; break; default: - p += lstrlenW( (LPCWSTR)p ) + 1; + p += lstrlenW( p ) + 1; break; } @@ -536,14 +536,14 @@ p += 2; break; default: - p += lstrlenW( (LPCWSTR)p ) + 1; + p += lstrlenW( p ) + 1; break; } /* Extract the caption */ - psInfo->proppage[index].pszText = (LPCWSTR)p; - TRACE("Tab %d %s\n",index,debugstr_w((LPCWSTR)p)); - p += lstrlenW((LPCWSTR)p) + 1; + psInfo->proppage[index].pszText = p; + TRACE("Tab %d %s\n",index,debugstr_w( p )); + p += lstrlenW( p ) + 1; if (dwFlags & PSP_USETITLE) { @@ -632,7 +632,7 @@ return -1; } - if(!(template = (LPVOID)LoadResource(COMCTL32_hModule, hRes))) + if(!(template = LoadResource(COMCTL32_hModule, hRes))) return -1; /* @@ -1288,8 +1288,8 @@ p += 2; break; default: - TRACE("menu %s\n",debugstr_w((LPCWSTR)p)); - p += lstrlenW( (LPCWSTR)p ) + 1; + TRACE("menu %s\n",debugstr_w( p )); + p += lstrlenW( p ) + 1; break; } @@ -1303,22 +1303,22 @@ p += 2; /* 0xffff plus predefined window class ordinal value */ break; default: - TRACE("class %s\n",debugstr_w((LPCWSTR)p)); - p += lstrlenW( (LPCWSTR)p ) + 1; + TRACE("class %s\n",debugstr_w( p )); + p += lstrlenW( p ) + 1; break; } /* title */ - TRACE("title %s\n",debugstr_w((LPCWSTR)p)); - p += lstrlenW((LPCWSTR)p) + 1; + TRACE("title %s\n",debugstr_w( p )); + p += lstrlenW( p ) + 1; /* font, if DS_SETFONT set */ if ((DS_SETFONT & ((istemplateex)? ((const MyDLGTEMPLATEEX*)pTemplate)->style : pTemplate->style))) { p+=(istemplateex)?3:1; - TRACE("font %s\n",debugstr_w((LPCWSTR)p)); - p += lstrlenW( (LPCWSTR)p ) + 1; /* the font name */ + TRACE("font %s\n",debugstr_w( p )); + p += lstrlenW( p ) + 1; /* the font name */ } /* now process the DLGITEMTEMPLATE(EX) structs (plus custom data) @@ -1342,8 +1342,8 @@ p += 2; break; default: - TRACE("class %s\n",debugstr_w((LPCWSTR)p)); - p += lstrlenW( (LPCWSTR)p ) + 1; + TRACE("class %s\n",debugstr_w( p )); + p += lstrlenW( p ) + 1; break; } @@ -1358,8 +1358,8 @@ p += 2; break; default: - TRACE("text %s\n",debugstr_w((LPCWSTR)p)); - p += lstrlenW( (LPCWSTR)p ) + 1; + TRACE("text %s\n",debugstr_w( p )); + p += lstrlenW( p ) + 1; break; } p += *p / sizeof(WORD) + 1; /* Skip extra data */ Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rebar.c (original) +++ trunk/reactos/dll/win32/comctl32/rebar.c Mon Jan 14 15:40:24 2008 @@ -511,7 +511,7 @@ TRACE("window %p, code=%08x, via %s\n", parent, code, (infoPtr->bUnicode)?"Unicode":"ANSI"); - return SendMessageW(parent, WM_NOTIFY, (WPARAM)nmhdr->idFrom, (LPARAM)nmhdr); + return SendMessageW(parent, WM_NOTIFY, nmhdr->idFrom, (LPARAM)nmhdr); } static INT Modified: trunk/reactos/dll/win32/comctl32/status.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/status.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/status.c (original) +++ trunk/reactos/dll/win32/comctl32/status.c Mon Jan 14 15:40:24 2008 @@ -1019,8 +1019,7 @@ nmttc.hdr.code = NM_TOOLTIPSCREATED; nmttc.hwndToolTips = infoPtr->hwndToolTip; - SendMessageW (lpCreate->hwndParent, WM_NOTIFY, - (WPARAM)nmttc.hdr.idFrom, (LPARAM)&nmttc); + SendMessageW (lpCreate->hwndParent, WM_NOTIFY, nmttc.hdr.idFrom, (LPARAM)&nmttc); } } Modified: trunk/reactos/dll/win32/comctl32/syslink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/syslink… ============================================================================== --- trunk/reactos/dll/win32/comctl32/syslink.c (original) +++ trunk/reactos/dll/win32/comctl32/syslink.c Mon Jan 14 15:40:24 2008 @@ -1314,7 +1314,7 @@ nml.item.szUrl[0] = 0; } - return SendMessageW(infoPtr->Notify, WM_NOTIFY, (WPARAM)nml.hdr.idFrom, (LPARAM)&nml); + return SendMessageW(infoPtr->Notify, WM_NOTIFY, nml.hdr.idFrom, (LPARAM)&nml); } /*********************************************************************** Modified: trunk/reactos/dll/win32/comctl32/tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tab.c?r… ============================================================================== --- trunk/reactos/dll/win32/comctl32/tab.c (original) +++ trunk/reactos/dll/win32/comctl32/tab.c Mon Jan 14 15:40:24 2008 @@ -178,7 +178,7 @@ nmhdr.code = code; return (BOOL) SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM) nmhdr.idFrom, (LPARAM) &nmhdr); + nmhdr.idFrom, (LPARAM) &nmhdr); } static void 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 (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c Mon Jan 14 15:40:24 2008 @@ -341,8 +341,7 @@ TRACE("to window %p, code=%08x, %s\n", infoPtr->hwndNotify, code, (infoPtr->bUnicode) ? "via Unicode" : "via ANSI"); - return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmhdr->idFrom, (LPARAM)nmhdr); + return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmhdr->idFrom, (LPARAM)nmhdr); } /*********************************************************************** @@ -3918,7 +3917,7 @@ { TBADDBITMAP tbab; tbab.hInst = (HINSTANCE)lParam; - tbab.nID = (UINT_PTR)wParam; + tbab.nID = wParam; TRACE("hwnd = %p, hInst = %p, nID = %lu\n", hwnd, tbab.hInst, tbab.nID); @@ -4231,7 +4230,7 @@ if (!res) { nmtbr.pData = Alloc(dwSize); - nmtbr.cbData = (UINT)dwSize; + nmtbr.cbData = dwSize; if (!nmtbr.pData) res = ERROR_OUTOFMEMORY; } if (!res) @@ -6374,7 +6373,7 @@ /* last resort: send notification on to app */ /* FIXME: find out what is really used here */ - return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, (WPARAM)lpnmtdi->hdr.idFrom, (LPARAM)lpnmtdi); + return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, lpnmtdi->hdr.idFrom, (LPARAM)lpnmtdi); } Modified: trunk/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tooltip… ============================================================================== --- trunk/reactos/dll/win32/comctl32/tooltips.c (original) +++ trunk/reactos/dll/win32/comctl32/tooltips.c Mon Jan 14 15:40:24 2008 @@ -320,8 +320,7 @@ ttnmdi.lParam = toolPtr->lParam; TRACE("hdr.idFrom = %lx\n", ttnmdi.hdr.idFrom); - SendMessageW(toolPtr->hwnd, WM_NOTIFY, - (WPARAM)toolPtr->uId, (LPARAM)&ttnmdi); + SendMessageW(toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&ttnmdi); if (IS_INTRESOURCE(ttnmdi.lpszText)) { LoadStringW(ttnmdi.hinst, LOWORD(ttnmdi.lpszText), @@ -351,8 +350,7 @@ /* FIXME: Unsure if SETITEM should save the value or not */ if (infoPtr->szTipText[0] == 0x00) { - SendMessageW(GetParent(toolPtr->hwnd), WM_NOTIFY, - (WPARAM)toolPtr->uId, (LPARAM)&ttnmdi); + SendMessageW(GetParent(toolPtr->hwnd), WM_NOTIFY, toolPtr->uId, (LPARAM)&ttnmdi); if (IS_INTRESOURCE(ttnmdi.lpszText)) { LoadStringW(ttnmdi.hinst, LOWORD(ttnmdi.lpszText), @@ -378,8 +376,7 @@ ttnmdi.lParam = toolPtr->lParam; TRACE("hdr.idFrom = %lx\n", ttnmdi.hdr.idFrom); - SendMessageW(toolPtr->hwnd, WM_NOTIFY, - (WPARAM)toolPtr->uId, (LPARAM)&ttnmdi); + SendMessageW(toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&ttnmdi); if (IS_INTRESOURCE(ttnmdi.lpszText)) { LoadStringW(ttnmdi.hinst, LOWORD(ttnmdi.lpszText), @@ -409,8 +406,7 @@ /* FIXME: Unsure if SETITEM should save the value or not */ if (infoPtr->szTipText[0] == 0x00) { - SendMessageW(GetParent(toolPtr->hwnd), WM_NOTIFY, - (WPARAM)toolPtr->uId, (LPARAM)&ttnmdi); + SendMessageW(GetParent(toolPtr->hwnd), WM_NOTIFY, toolPtr->uId, (LPARAM)&ttnmdi); if (IS_INTRESOURCE(ttnmdi.lpszText)) { LoadStringW(ttnmdi.hinst, LOWORD(ttnmdi.lpszText), @@ -563,8 +559,7 @@ hdr.hwndFrom = hwnd; hdr.idFrom = toolPtr->uId; hdr.code = TTN_SHOW; - SendMessageW (toolPtr->hwnd, WM_NOTIFY, - (WPARAM)toolPtr->uId, (LPARAM)&hdr); + SendMessageW (toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&hdr); TRACE("%s\n", debugstr_w(infoPtr->szTipText)); @@ -792,8 +787,7 @@ hdr.hwndFrom = hwnd; hdr.idFrom = toolPtr->uId; hdr.code = TTN_POP; - SendMessageW (toolPtr->hwnd, WM_NOTIFY, - (WPARAM)toolPtr->uId, (LPARAM)&hdr); + SendMessageW (toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&hdr); infoPtr->nCurrentTool = -1; @@ -825,8 +819,7 @@ hdr.hwndFrom = hwnd; hdr.idFrom = toolPtr->uId; hdr.code = TTN_POP; - SendMessageW (toolPtr->hwnd, WM_NOTIFY, - (WPARAM)toolPtr->uId, (LPARAM)&hdr); + SendMessageW (toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&hdr); SetWindowPos (hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOZORDER | SWP_HIDEWINDOW | SWP_NOACTIVATE); @@ -1922,7 +1915,7 @@ { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); LPCSTR pszTitle = (LPCSTR)lParam; - UINT_PTR uTitleIcon = (UINT_PTR)wParam; + UINT_PTR uTitleIcon = wParam; UINT size; TRACE("hwnd = %p, title = %s, icon = %p\n", hwnd, debugstr_a(pszTitle), @@ -1955,7 +1948,7 @@ { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); LPCWSTR pszTitle = (LPCWSTR)lParam; - UINT_PTR uTitleIcon = (UINT_PTR)wParam; + UINT_PTR uTitleIcon = wParam; UINT size; TRACE("hwnd = %p, title = %s, icon = %p\n", hwnd, debugstr_w(pszTitle), Modified: trunk/reactos/dll/win32/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/trackba… ============================================================================== --- trunk/reactos/dll/win32/comctl32/trackbar.c (original) +++ trunk/reactos/dll/win32/comctl32/trackbar.c Mon Jan 14 15:40:24 2008 @@ -119,8 +119,7 @@ pnmh->hwndFrom = infoPtr->hwndSelf; pnmh->idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); pnmh->code = code; - result = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)pnmh->idFrom, (LPARAM)pnmh); + result = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, pnmh->idFrom, (LPARAM)pnmh); TRACE(" <= %ld\n", result); Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/treeview.c (original) +++ trunk/reactos/dll/win32/comctl32/treeview.c Mon Jan 14 15:40:24 2008 @@ -518,8 +518,7 @@ nmhdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); nmhdr.code = get_notifycode(infoPtr, code); - return (BOOL)TREEVIEW_SendRealNotify(infoPtr, - (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr); + return (BOOL)TREEVIEW_SendRealNotify(infoPtr, nmhdr.idFrom, (LPARAM)&nmhdr); } static VOID @@ -582,9 +581,7 @@ nmhdr.ptDrag.x = 0; nmhdr.ptDrag.y = 0; - ret = (BOOL)TREEVIEW_SendRealNotify(infoPtr, - (WPARAM)nmhdr.hdr.idFrom, - (LPARAM)&nmhdr); + ret = (BOOL)TREEVIEW_SendRealNotify(infoPtr, nmhdr.hdr.idFrom, (LPARAM)&nmhdr); if (!infoPtr->bNtfUnicode) { Free(nmhdr.itemOld.pszText); @@ -614,9 +611,7 @@ nmhdr.ptDrag.x = pt.x; nmhdr.ptDrag.y = pt.y; - return (BOOL)TREEVIEW_SendRealNotify(infoPtr, - (WPARAM)nmhdr.hdr.idFrom, - (LPARAM)&nmhdr); + return (BOOL)TREEVIEW_SendRealNotify(infoPtr, nmhdr.hdr.idFrom, (LPARAM)&nmhdr); } @@ -644,9 +639,7 @@ nmcdhdr.clrTextBk = infoPtr->clrBk; nmcdhdr.iLevel = 0; - return (BOOL)TREEVIEW_SendRealNotify(infoPtr, - (WPARAM)nmcd->hdr.idFrom, - (LPARAM)&nmcdhdr); + return (BOOL)TREEVIEW_SendRealNotify(infoPtr, nmcd->hdr.idFrom, (LPARAM)&nmcdhdr); } @@ -691,11 +684,9 @@ nmcd->dwDrawStage, nmcd->hdc, nmcd->dwItemSpec, nmcd->uItemState, nmcd->lItemlParam); - retval = TREEVIEW_SendRealNotify(infoPtr, - (WPARAM)nmcd->hdr.idFrom, - (LPARAM)nmcdhdr); - - return (BOOL)retval; + retval = TREEVIEW_SendRealNotify(infoPtr, nmcd->hdr.idFrom, (LPARAM)nmcdhdr); + + return retval; } static BOOL @@ -750,8 +741,7 @@ if (mask & TVIF_TEXT) wineItem->textWidth = 0; - TREEVIEW_SendRealNotify(infoPtr, - (WPARAM)callback.hdr.idFrom, (LPARAM)&callback); + TREEVIEW_SendRealNotify(infoPtr, callback.hdr.idFrom, (LPARAM)&callback); /* It may have changed due to a call to SetItem. */ mask &= wineItem->callbackMask; @@ -3782,8 +3772,7 @@ tvdi.item.cchTextMax = 0; } - bCommit = (BOOL)TREEVIEW_SendRealNotify(infoPtr, - (WPARAM)tvdi.hdr.idFrom, (LPARAM)&tvdi); + bCommit = (BOOL)TREEVIEW_SendRealNotify(infoPtr, tvdi.hdr.idFrom, (LPARAM)&tvdi); if (!bCancel && bCommit) /* Apply the changes */ { Modified: trunk/reactos/dll/win32/comctl32/updown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/updown.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/updown.c (original) +++ trunk/reactos/dll/win32/comctl32/updown.c Mon Jan 14 15:40:24 2008 @@ -627,7 +627,7 @@ ni.hdr.hwndFrom = infoPtr->Self; ni.hdr.idFrom = GetWindowLongPtrW (infoPtr->Self, GWLP_ID); ni.hdr.code = UDN_DELTAPOS; - if (!SendMessageW(infoPtr->Notify, WM_NOTIFY, (WPARAM)ni.hdr.idFrom, (LPARAM)&ni)) { + if (!SendMessageW(infoPtr->Notify, WM_NOTIFY, ni.hdr.idFrom, (LPARAM)&ni)) { /* Parent said: OK to adjust */ /* Now adjust value with (maybe new) delta */

1 0

[fireball] 31772: - Fix a bug in %SystemRoot% substitution branch.
by fireball＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: fireball Date: Mon Jan 14 15:31:35 2008 New Revision: 31772 URL: http://svn.reactos.org/svn/reactos?rev=31772&view=rev Log: - Fix a bug in %SystemRoot% substitution branch. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c (original) +++ trunk/reactos/base/system/services/rpcserver.c Mon Jan 14 15:31:35 2008 @@ -1294,7 +1294,7 @@ if (dwStartType == SERVICE_BOOT_START) wcscpy(*lpCanonName, L"\\SystemRoot\\"); - wcscat(*lpCanonName, lpServiceName); + wcscat(*lpCanonName, lpServiceName + 13); DPRINT("Canonicalized name %S\n", *lpCanonName); return NO_ERROR;

1 0

[winesync] 31771: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: winesync Date: Mon Jan 14 15:29:35 2008 New Revision: 31771 URL: http://svn.reactos.org/svn/reactos?rev=31771&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/cabinet/cabinet.h trunk/reactos/dll/win32/cabinet/cabinet.rbuild trunk/reactos/dll/win32/cabinet/cabinet_main.c trunk/reactos/dll/win32/cabinet/fci.c trunk/reactos/dll/win32/cabinet/fdi.c Modified: trunk/reactos/dll/win32/cabinet/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet.… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet.h (original) +++ trunk/reactos/dll/win32/cabinet/cabinet.h Mon Jan 14 15:29:35 2008 @@ -403,11 +403,11 @@ #define FDI_INT_MAGIC 0xfdfdfd05 #define REALLY_IS_FCI(hfci) ( \ - (((void *) hfci) != NULL) && \ + ((hfci) != NULL) && \ (PFCI_INT(hfci)->FCI_Intmagic == FCI_INT_MAGIC) ) #define REALLY_IS_FDI(hfdi) ( \ - (((void *) hfdi) != NULL) && \ + ((hfdi) != NULL) && \ (PFDI_INT(hfdi)->FDI_Intmagic == FDI_INT_MAGIC) ) /* Modified: trunk/reactos/dll/win32/cabinet/cabinet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet.… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet.rbuild (original) +++ trunk/reactos/dll/win32/cabinet/cabinet.rbuild Mon Jan 14 15:29:35 2008 @@ -1,6 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="cabinet" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_CABINET}" installbase="system32" installname="cabinet.dll" allowwarnings="true"> +<group> +<module name="cabinet" type="win32dll" baseaddress="${BASEADDRESS_CABINET}" installbase="system32" installname="cabinet.dll" allowwarnings="true" entrypoint="0"> <importlibrary definition="cabinet.spec.def" /> <include base="cabinet">.</include> <include base="ReactOS">include/reactos/wine</include> @@ -16,3 +17,4 @@ <file>cabinet.rc</file> <file>cabinet.spec</file> </module> +</group> Modified: trunk/reactos/dll/win32/cabinet/cabinet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet_… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet_main.c (original) +++ trunk/reactos/dll/win32/cabinet/cabinet_main.c Mon Jan 14 15:29:35 2008 @@ -229,7 +229,11 @@ file_in_list(pDestination->FileList, pfdin->psz1, &node); if (node && !node->DoExtract) + { + HeapFree(GetProcessHeap(), 0, szFullPath); + HeapFree(GetProcessHeap(), 0, szDirectory); return 0; + } /* create the destination directory if it doesn't exist */ if (GetFileAttributesA(szDirectory) == INVALID_FILE_ATTRIBUTES) Modified: trunk/reactos/dll/win32/cabinet/fci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fci.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fci.c (original) +++ trunk/reactos/dll/win32/cabinet/fci.c Mon Jan 14 15:29:35 2008 @@ -188,7 +188,7 @@ return NULL; } - if (!((hfci = ((HFCI) (*pfnalloc)(sizeof(FCI_Int)))))) { + if (!((hfci = (*pfnalloc)(sizeof(FCI_Int))))) { perf->erfOper = FCIERR_ALLOC_FAIL; perf->erfType = ERROR_NOT_ENOUGH_MEMORY; perf->fError = TRUE; Modified: trunk/reactos/dll/win32/cabinet/fdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fdi.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fdi.c (original) +++ trunk/reactos/dll/win32/cabinet/fdi.c Mon Jan 14 15:29:35 2008 @@ -377,7 +377,7 @@ return NULL; } - if (!((rv = ((HFDI) (*pfnalloc)(sizeof(FDI_Int)))))) { + if (!((rv = (*pfnalloc)(sizeof(FDI_Int))))) { perf->erfOper = FDIERROR_ALLOC_FAIL; perf->erfType = ERROR_NOT_ENOUGH_MEMORY; perf->fError = TRUE; @@ -461,7 +461,7 @@ } /* otherwise, set the stream to just after the string and return */ - PFDI_SEEK(hfdi, hf, base + ((cab_off_t) strlen((char *) buf)) + 1, SEEK_SET); + PFDI_SEEK(hfdi, hf, base + strlen((char *)buf) + 1, SEEK_SET); return (char *) buf; } @@ -1138,7 +1138,7 @@ for(;;) { ZIPNEEDBITS((cab_ULONG)bl) - if((e = (t = tl + ((cab_ULONG)b & ml))->e) > 16) + if((e = (t = tl + (b & ml))->e) > 16) do { if (e == 99) @@ -1146,7 +1146,7 @@ ZIPDUMPBITS(t->b) e -= 16; ZIPNEEDBITS(e) - } while ((e = (t = t->v.t + ((cab_ULONG)b & Zipmask[e]))->e) > 16); + } while ((e = (t = t->v.t + (b & Zipmask[e]))->e) > 16); ZIPDUMPBITS(t->b) if (e == 16) /* then it's a literal */ CAB(outbuf)[w++] = (cab_UBYTE)t->v.n; @@ -1158,22 +1158,22 @@ /* get length of block to copy */ ZIPNEEDBITS(e) - n = t->v.n + ((cab_ULONG)b & Zipmask[e]); + n = t->v.n + (b & Zipmask[e]); ZIPDUMPBITS(e); /* decode distance of block to copy */ ZIPNEEDBITS((cab_ULONG)bd) - if ((e = (t = td + ((cab_ULONG)b & md))->e) > 16) + if ((e = (t = td + (b & md))->e) > 16) do { if (e == 99) return 1; ZIPDUMPBITS(t->b) e -= 16; ZIPNEEDBITS(e) - } while ((e = (t = t->v.t + ((cab_ULONG)b & Zipmask[e]))->e) > 16); + } while ((e = (t = t->v.t + (b & Zipmask[e]))->e) > 16); ZIPDUMPBITS(t->b) ZIPNEEDBITS(e) - d = w - t->v.n - ((cab_ULONG)b & Zipmask[e]); + d = w - t->v.n - (b & Zipmask[e]); ZIPDUMPBITS(e) do { @@ -1217,10 +1217,10 @@ /* get the length and its complement */ ZIPNEEDBITS(16) - n = ((cab_ULONG)b & 0xffff); + n = (b & 0xffff); ZIPDUMPBITS(16) ZIPNEEDBITS(16) - if (n != (cab_ULONG)((~b) & 0xffff)) + if (n != ((~b) & 0xffff)) return 1; /* error in compressed data */ ZIPDUMPBITS(16) @@ -1312,13 +1312,13 @@ /* read in table lengths */ ZIPNEEDBITS(5) - nl = 257 + ((cab_ULONG)b & 0x1f); /* number of literal/length codes */ + nl = 257 + (b & 0x1f); /* number of literal/length codes */ ZIPDUMPBITS(5) ZIPNEEDBITS(5) - nd = 1 + ((cab_ULONG)b & 0x1f); /* number of distance codes */ + nd = 1 + (b & 0x1f); /* number of distance codes */ ZIPDUMPBITS(5) ZIPNEEDBITS(4) - nb = 4 + ((cab_ULONG)b & 0xf); /* number of bit length codes */ + nb = 4 + (b & 0xf); /* number of bit length codes */ ZIPDUMPBITS(4) if(nl > 288 || nd > 32) return 1; /* bad lengths */ @@ -1327,7 +1327,7 @@ for(j = 0; j < nb; j++) { ZIPNEEDBITS(3) - ll[Zipborder[j]] = (cab_ULONG)b & 7; + ll[Zipborder[j]] = b & 7; ZIPDUMPBITS(3) } for(; j < 19; j++) @@ -1349,7 +1349,7 @@ while((cab_ULONG)i < n) { ZIPNEEDBITS((cab_ULONG)bl) - j = (td = tl + ((cab_ULONG)b & m))->b; + j = (td = tl + (b & m))->b; ZIPDUMPBITS(j) j = td->v.n; if (j < 16) /* length of code in bits (0..15) */ @@ -1357,7 +1357,7 @@ else if (j == 16) /* repeat last length 3 to 6 times */ { ZIPNEEDBITS(2) - j = 3 + ((cab_ULONG)b & 3); + j = 3 + (b & 3); ZIPDUMPBITS(2) if((cab_ULONG)i + j > n) return 1; @@ -1367,7 +1367,7 @@ else if (j == 17) /* 3 to 10 zero length codes */ { ZIPNEEDBITS(3) - j = 3 + ((cab_ULONG)b & 7); + j = 3 + (b & 7); ZIPDUMPBITS(3) if ((cab_ULONG)i + j > n) return 1; @@ -1378,7 +1378,7 @@ else /* j == 18: 11 to 138 zero length codes */ { ZIPNEEDBITS(7) - j = 11 + ((cab_ULONG)b & 0x7f); + j = 11 + (b & 0x7f); ZIPDUMPBITS(7) if ((cab_ULONG)i + j > n) return 1; @@ -1436,7 +1436,7 @@ /* read in block type */ ZIPNEEDBITS(2) - t = (cab_ULONG)b & 3; + t = b & 3; ZIPDUMPBITS(2) /* restore the global bit buffer */

1 0

[winesync] 31770: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: winesync Date: Mon Jan 14 15:26:48 2008 New Revision: 31770 URL: http://svn.reactos.org/svn/reactos?rev=31770&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/avifil32/acmstream.c trunk/reactos/dll/win32/avifil32/api.c trunk/reactos/dll/win32/avifil32/avifil32.rbuild trunk/reactos/dll/win32/avifil32/avifile.c trunk/reactos/dll/win32/avifil32/factory.c Modified: trunk/reactos/dll/win32/avifil32/acmstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/acmstre… ============================================================================== --- trunk/reactos/dll/win32/avifil32/acmstream.c (original) +++ trunk/reactos/dll/win32/avifil32/acmstream.c Mon Jan 14 15:26:48 2008 @@ -729,7 +729,7 @@ This->sInfo.dwQuality = (DWORD)ICQUALITY_DEFAULT; SetRectEmpty(&This->sInfo.rcFrame); - /* convert positions ansd sizes to output format */ + /* convert positions and sizes to output format */ CONVERT_STREAM_to_THIS(&This->sInfo.dwStart); CONVERT_STREAM_to_THIS(&This->sInfo.dwLength); CONVERT_STREAM_to_THIS(&This->sInfo.dwSuggestedBufferSize); Modified: trunk/reactos/dll/win32/avifil32/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/api.c?r… ============================================================================== --- trunk/reactos/dll/win32/avifil32/api.c (original) +++ trunk/reactos/dll/win32/avifil32/api.c Mon Jan 14 15:26:48 2008 @@ -1065,9 +1065,9 @@ HeapFree(GetProcessHeap(), 0, lp); return AVIERR_ERROR; } - for (n = 0;RegEnumKeyW(hKey, n, szFileExt, sizeof(szFileExt)) == S_OK;n++) { + for (n = 0;RegEnumKeyW(hKey, n, szFileExt, sizeof(szFileExt)/sizeof(szFileExt[0])) == S_OK;n++) { /* get CLSID to extension */ - size = sizeof(szValue)/sizeof(szValue[0]); + size = sizeof(szValue); if (RegQueryValueW(hKey, szFileExt, szValue, &size) != S_OK) break; @@ -1116,7 +1116,7 @@ for (n = 0; n <= count; n++) { /* first the description */ if (n != 0) { - size = sizeof(szValue)/sizeof(szValue[0]); + size = sizeof(szValue); if (RegQueryValueW(hKey, lp[n].szClsid, szValue, &size) == S_OK) { size = lstrlenW(szValue); lstrcpynW(szFilter, szValue, cbFilter); @@ -1509,7 +1509,7 @@ HeapFree(GetProcessHeap(), 0, pSavedOptions); } - return (BOOL)ret; + return ret; } /*********************************************************************** Modified: trunk/reactos/dll/win32/avifil32/avifil32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifil3… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifil32.rbuild (original) +++ trunk/reactos/dll/win32/avifil32/avifil32.rbuild Mon Jan 14 15:26:48 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="avifil32" type="win32dll" baseaddress="${BASEADDRESS_AVIFIL32}" installbase="system32" installname="avifil32.dll" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="avifil32.spec.def" /> @@ -32,3 +33,4 @@ <file>rsrc.rc</file> <file>avifil32.spec</file> </module> +</group> Modified: trunk/reactos/dll/win32/avifil32/avifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile.c (original) +++ trunk/reactos/dll/win32/avifil32/avifile.c Mon Jan 14 15:26:48 2008 @@ -1795,7 +1795,7 @@ if (str == NULL) return AVIERR_MEMORY; - if (mmioRead(This->hmmio, (HPSTR)str, ck.cksize) != ck.cksize) + if (mmioRead(This->hmmio, str, ck.cksize) != ck.cksize) { HeapFree(GetProcessHeap(), 0, str); return AVIERR_FILEREAD; @@ -2249,7 +2249,7 @@ WideCharToMultiByte(CP_ACP, 0, pStream->sInfo.szName, -1, str, ck.cksize, NULL, NULL); - if (mmioWrite(This->hmmio, (HPSTR)str, ck.cksize) != ck.cksize) { + if (mmioWrite(This->hmmio, str, ck.cksize) != ck.cksize) { HeapFree(GetProcessHeap(), 0, str); return AVIERR_FILEWRITE; } Modified: trunk/reactos/dll/win32/avifil32/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/factory… ============================================================================== --- trunk/reactos/dll/win32/avifil32/factory.c (original) +++ trunk/reactos/dll/win32/avifil32/factory.c Mon Jan 14 15:26:48 2008 @@ -209,7 +209,7 @@ switch (fdwReason) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDll); - AVIFILE_hModule = (HMODULE)hInstDll; + AVIFILE_hModule = hInstDll; break; case DLL_PROCESS_DETACH: break;

1 0

[hpoussin] 31769: Autosyncing with Wine HEAD
by hpoussin＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: hpoussin Date: Mon Jan 14 15:20:56 2008 New Revision: 31769 URL: http://svn.reactos.org/svn/reactos?rev=31769&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/advpack/advpack.rbuild Modified: trunk/reactos/dll/win32/advpack/advpack.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack.… ============================================================================== --- trunk/reactos/dll/win32/advpack/advpack.rbuild (original) +++ trunk/reactos/dll/win32/advpack/advpack.rbuild Mon Jan 14 15:20:56 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="advpack" type="win32dll" baseaddress="${BASEADDRESS_ADVPACK}" installbase="system32" installname="advpack.dll" allowwarnings="true"> <importlibrary definition="advpack.spec.def" /> <include base="advpack">.</include> @@ -11,7 +12,6 @@ <library>ole32</library> <library>setupapi</library> <library>version</library> - <library>user32</library> <library>advapi32</library> <library>kernel32</library> <library>ntdll</library> @@ -21,3 +21,4 @@ <file>reg.c</file> <file>advpack.spec</file> </module> +</group>

1 0

[fireball] 31768: - Implement canonicalizing the service binary path properly, handling all possible cases (instead of a memory-overwriting hack Christoph noticed yesterday).
by fireball＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: fireball Date: Mon Jan 14 14:46:14 2008 New Revision: 31768 URL: http://svn.reactos.org/svn/reactos?rev=31768&view=rev Log: - Implement canonicalizing the service binary path properly, handling all possible cases (instead of a memory-overwriting hack Christoph noticed yesterday). Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c (original) +++ trunk/reactos/base/system/services/rpcserver.c Mon Jan 14 14:46:14 2008 @@ -993,6 +993,380 @@ DPRINT("ScmrChangeServiceConfigW() done (Error %lu)\n", dwError); return dwError; +} + +/* Create a path suitable for the bootloader out of the full path */ +DWORD +ScmConvertToBootPathName(wchar_t *CanonName, wchar_t **RelativeName) +{ + DWORD ServiceNameLen, BufferSize, ExpandedLen; + WCHAR Dest; + WCHAR *Expanded; + UNICODE_STRING NtPathName, SystemRoot, LinkTarget; + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; + HANDLE SymbolicLinkHandle; + + DPRINT("ScmConvertToBootPathName %S\n", CanonName); + + ServiceNameLen = wcslen(CanonName); + /* First check, if it's already good */ + if (ServiceNameLen > 12 && + !wcsnicmp(L"\\SystemRoot\\", CanonName, 12)) + { + *RelativeName = LocalAlloc(LMEM_ZEROINIT, ServiceNameLen * sizeof(WCHAR) + sizeof(WCHAR)); + + if (*RelativeName == NULL) + { + DPRINT1("Error allocating memory for boot driver name!\n"); + return ERROR_NOT_ENOUGH_MEMORY; + } + + /* Copy it */ + wcscpy(*RelativeName, CanonName); + + DPRINT1("Bootdriver name %S\n", *RelativeName); + return ERROR_SUCCESS; + } + + /* If it has %SystemRoot% prefix, substitute it to \System*/ + if (ServiceNameLen > 13 && + !wcsnicmp(L"%SystemRoot%\\", CanonName, 13)) + { + /* There is no +sizeof(wchar_t) because the name is less by 1 wchar */ + *RelativeName = LocalAlloc(LMEM_ZEROINIT, ServiceNameLen * sizeof(WCHAR)); + + if (*RelativeName == NULL) + { + DPRINT1("Error allocating memory for boot driver name!\n"); + return ERROR_NOT_ENOUGH_MEMORY; + } + + /* Copy it */ + wcscpy(*RelativeName, L"\\SystemRoot\\"); + wcscat(*RelativeName, CanonName + 13); + + DPRINT1("Bootdriver name %S\n", *RelativeName); + return ERROR_SUCCESS; + } + + /* Get buffer size needed for expanding env strings */ + BufferSize = ExpandEnvironmentStringsW(L"%SystemRoot%\\", &Dest, 1); + + if (BufferSize <= 1) + { + DPRINT1("Error during a call to ExpandEnvironmentStringsW()\n"); + return ERROR_INVALID_ENVIRONMENT; + } + + /* Allocate memory, since the size is known now */ + Expanded = LocalAlloc(LMEM_ZEROINIT, BufferSize * sizeof(WCHAR) + sizeof(WCHAR)); + if (!Expanded) + { + DPRINT1("Error allocating memory for boot driver name!\n"); + return ERROR_NOT_ENOUGH_MEMORY; + } + + /* Expand it */ + if (ExpandEnvironmentStringsW(L"%SystemRoot%\\", Expanded, BufferSize) > + BufferSize) + { + DPRINT1("Error during a call to ExpandEnvironmentStringsW()\n"); + LocalFree(Expanded); + return ERROR_NOT_ENOUGH_MEMORY; + } + + /* Convert to NY-style path */ + if (!RtlDosPathNameToNtPathName_U(Expanded, &NtPathName, NULL, NULL)) + { + DPRINT1("Error during a call to RtlDosPathNameToNtPathName_U()\n"); + return ERROR_INVALID_ENVIRONMENT; + } + + DPRINT("Converted to NT-style %wZ\n", &NtPathName); + + /* No need to keep the dos-path anymore */ + LocalFree(Expanded); + + /* Copy it to the allocated place */ + Expanded = LocalAlloc(LMEM_ZEROINIT, NtPathName.Length + sizeof(WCHAR)); + if (!Expanded) + { + DPRINT1("Error allocating memory for boot driver name!\n"); + return ERROR_NOT_ENOUGH_MEMORY; + } + + ExpandedLen = NtPathName.Length / sizeof(WCHAR); + wcsncpy(Expanded, NtPathName.Buffer, ExpandedLen); + Expanded[ExpandedLen] = 0; + + if (ServiceNameLen > ExpandedLen && + !wcsnicmp(Expanded, CanonName, ExpandedLen)) + { + /* Only \SystemRoot\ is missing */ + *RelativeName = LocalAlloc(LMEM_ZEROINIT, + (ServiceNameLen - ExpandedLen) * sizeof(WCHAR) + 13*sizeof(WCHAR)); + + if (*RelativeName == NULL) + { + DPRINT1("Error allocating memory for boot driver name!\n"); + LocalFree(Expanded); + return ERROR_NOT_ENOUGH_MEMORY; + } + + wcscpy(*RelativeName, L"\\SystemRoot\\"); + wcscat(*RelativeName, CanonName + ExpandedLen); + + RtlFreeUnicodeString(&NtPathName); + return ERROR_SUCCESS; + } + + /* The most complex case starts here */ + RtlInitUnicodeString(&SystemRoot, L"\\SystemRoot"); + InitializeObjectAttributes(&ObjectAttributes, + &SystemRoot, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + /* Open this symlink */ + Status = NtOpenSymbolicLinkObject(&SymbolicLinkHandle, SYMBOLIC_LINK_QUERY, &ObjectAttributes); + + if (NT_SUCCESS(Status)) + { + LinkTarget.Length = 0; + LinkTarget.MaximumLength = 0; + + DPRINT("Opened symbolic link object\n"); + + Status = NtQuerySymbolicLinkObject(SymbolicLinkHandle, &LinkTarget, &BufferSize); + if (NT_SUCCESS(Status) || Status == STATUS_BUFFER_TOO_SMALL) + { + /* Check if required buffer size is sane */ + if (BufferSize > 0xFFFD) + { + DPRINT1("Too large buffer required\n"); + *RelativeName = 0; + + if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle); + LocalFree(Expanded); + return ERROR_NOT_ENOUGH_MEMORY; + } + + /* Alloc the string */ + LinkTarget.Buffer = LocalAlloc(LMEM_ZEROINIT, BufferSize + sizeof(WCHAR)); + if (!LinkTarget.Buffer) + { + DPRINT1("Unable to alloc buffer\n"); + if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle); + LocalFree(Expanded); + return ERROR_NOT_ENOUGH_MEMORY; + } + + /* Do a real query now */ + LinkTarget.Length = BufferSize; + LinkTarget.MaximumLength = LinkTarget.Length + sizeof(WCHAR); + + Status = NtQuerySymbolicLinkObject(SymbolicLinkHandle, &LinkTarget, &BufferSize); + if (NT_SUCCESS(Status)) + { + DPRINT("LinkTarget: %wZ\n", &LinkTarget); + + ExpandedLen = LinkTarget.Length / sizeof(WCHAR); + if ((ServiceNameLen > ExpandedLen) && + !wcsnicmp(LinkTarget.Buffer, CanonName, ExpandedLen)) + { + *RelativeName = LocalAlloc(LMEM_ZEROINIT, + (ServiceNameLen - ExpandedLen) * sizeof(WCHAR) + 13*sizeof(WCHAR)); + + if (*RelativeName == NULL) + { + DPRINT1("Unable to alloc buffer\n"); + if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle); + LocalFree(Expanded); + RtlFreeUnicodeString(&NtPathName); + return ERROR_NOT_ENOUGH_MEMORY; + } + + /* Copy it over, substituting the first part + with SystemRoot */ + wcscpy(*RelativeName, L"\\SystemRoot\\"); + wcscat(*RelativeName, CanonName+ExpandedLen+1); + + /* Cleanup */ + if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle); + LocalFree(Expanded); + RtlFreeUnicodeString(&NtPathName); + + /* Return success */ + return ERROR_SUCCESS; + } + else + { + if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle); + LocalFree(Expanded); + RtlFreeUnicodeString(&NtPathName); + return ERROR_INVALID_PARAMETER; + } + } + else + { + DPRINT1("Error, Status = %08X\n", Status); + if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle); + LocalFree(Expanded); + RtlFreeUnicodeString(&NtPathName); + return ERROR_INVALID_PARAMETER; + } + } + else + { + DPRINT1("Error, Status = %08X\n", Status); + if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle); + LocalFree(Expanded); + RtlFreeUnicodeString(&NtPathName); + return ERROR_INVALID_PARAMETER; + } + } + else + { + DPRINT1("Error, Status = %08X\n", Status); + LocalFree(Expanded); + return ERROR_INVALID_PARAMETER; + } + + /* Failure */ + *RelativeName = NULL; + return ERROR_INVALID_PARAMETER; +} + +DWORD +ScmCanonDriverImagePath(DWORD dwStartType, + wchar_t *lpServiceName, + wchar_t **lpCanonName) +{ + DWORD ServiceNameLen, Result; + UNICODE_STRING NtServiceName; + WCHAR *RelativeName; + WCHAR *SourceName = lpServiceName; + + /* Calculate the length of the service's name */ + ServiceNameLen = wcslen(lpServiceName); + + /* 12 is wcslen(L"\\SystemRoot\\") */ + if (ServiceNameLen > 12 && + !wcsnicmp(L"\\SystemRoot\\", lpServiceName, 12)) + { + /* SystemRoot prefix is already included */ + + *lpCanonName = LocalAlloc(LMEM_ZEROINIT, ServiceNameLen * sizeof(WCHAR) + sizeof(WCHAR)); + + if (*lpCanonName == NULL) + { + DPRINT1("Error allocating memory for canonized service name!\n"); + return ERROR_NOT_ENOUGH_MEMORY; + } + + /* If it's a boot-time driver, it must be systemroot relative */ + if (dwStartType == SERVICE_BOOT_START) + SourceName += 12; + + /* Copy it */ + wcscpy(*lpCanonName, SourceName); + + DPRINT("Canonicalized name %S\n", *lpCanonName); + return NO_ERROR; + } + + /* Check if it has %SystemRoot% (len=13) */ + if (ServiceNameLen > 13 && + !wcsnicmp(L"%SystemRoot%\\", lpServiceName, 13)) + { + /* Substitute %SystemRoot% with \\SystemRoot\\ */ + *lpCanonName = LocalAlloc(LMEM_ZEROINIT, ServiceNameLen * sizeof(WCHAR) + sizeof(WCHAR)); + + if (*lpCanonName == NULL) + { + DPRINT1("Error allocating memory for canonized service name!\n"); + return ERROR_NOT_ENOUGH_MEMORY; + } + + /* If it's a boot-time driver, it must be systemroot relative */ + if (dwStartType == SERVICE_BOOT_START) + wcscpy(*lpCanonName, L"\\SystemRoot\\"); + + wcscat(*lpCanonName, lpServiceName); + + DPRINT("Canonicalized name %S\n", *lpCanonName); + return NO_ERROR; + } + + /* Check if it's a relative path name */ + if (lpServiceName[0] != L'\\' && lpServiceName[1] != L':') + { + *lpCanonName = LocalAlloc(LMEM_ZEROINIT, ServiceNameLen * sizeof(WCHAR) + sizeof(WCHAR)); + + if (*lpCanonName == NULL) + { + DPRINT1("Error allocating memory for canonized service name!\n"); + return ERROR_NOT_ENOUGH_MEMORY; + } + + /* Just copy it over without changing */ + wcscpy(*lpCanonName, lpServiceName); + + return NO_ERROR; + } + + /* It seems to be a DOS path, convert it */ + if (!RtlDosPathNameToNtPathName_U(lpServiceName, &NtServiceName, NULL, NULL)) + { + DPRINT1("RtlDosPathNameToNtPathName_U() failed!\n"); + return ERROR_INVALID_PARAMETER; + } + + *lpCanonName = LocalAlloc(LMEM_ZEROINIT, NtServiceName.Length + sizeof(WCHAR)); + + if (*lpCanonName == NULL) + { + DPRINT1("Error allocating memory for canonized service name!\n"); + RtlFreeUnicodeString(&NtServiceName); + return ERROR_NOT_ENOUGH_MEMORY; + } + + /* Copy the string */ + wcsncpy(*lpCanonName, NtServiceName.Buffer, NtServiceName.Length / sizeof(WCHAR)); + + /* The unicode string is not needed anymore */ + RtlFreeUnicodeString(&NtServiceName); + + if (dwStartType != SERVICE_BOOT_START) + { + DPRINT("Canonicalized name %S\n", *lpCanonName); + return NO_ERROR; + } + + /* The service is boot-started, so must be relative */ + Result = ScmConvertToBootPathName(*lpCanonName, &RelativeName); + if (Result) + { + /* There is a problem, free name and return */ + LocalFree(*lpCanonName); + DPRINT1("Error converting named!\n"); + return Result; + } + + ASSERT(RelativeName); + + /* Copy that string */ + wcscpy(*lpCanonName, RelativeName + 12); + + /* Free the allocated buffer */ + LocalFree(RelativeName); + + DPRINT("Canonicalized name %S\n", *lpCanonName); + + /* Success */ + return NO_ERROR; } @@ -1058,24 +1432,12 @@ if (dwServiceType & SERVICE_DRIVER) { - lpImagePath = (WCHAR*) HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - (wcslen(lpBinaryPathName) + 5) * sizeof(WCHAR)); - if (lpImagePath == NULL) - { - dwError = ERROR_NOT_ENOUGH_MEMORY; + dwError = ScmCanonDriverImagePath(dwStartType, + lpBinaryPathName, + &lpImagePath); + + if (dwError != ERROR_SUCCESS) goto done; - } - - if (lpBinaryPathName[1] == L':') - { - wcscpy(lpImagePath, L"\\??\\"); - wcscat(lpImagePath, lpBinaryPathName); - } - else - { - wcscpy(lpImagePath, lpBinaryPathName); - } } /* Allocate a new service entry */

1 0

[weiden] 31767: Add more definitions
by weiden＠svn.reactos.org 13 Jan '08

13 Jan '08

Author: weiden Date: Mon Jan 14 01:44:07 2008 New Revision: 31767 URL: http://svn.reactos.org/svn/reactos?rev=31767&view=rev Log: Add more definitions Modified: trunk/reactos/include/reactos/wine/rpcfc.h Modified: trunk/reactos/include/reactos/wine/rpcfc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/rpcfc… ============================================================================== --- trunk/reactos/include/reactos/wine/rpcfc.h (original) +++ trunk/reactos/include/reactos/wine/rpcfc.h Mon Jan 14 01:44:07 2008 @@ -204,4 +204,10 @@ #define USER_MARSHAL_POINTER 0xc0 #define USER_MARSHAL_IID 0x20 +/* context handle flags */ +#define NDR_CONTEXT_HANDLE_CANNOT_BE_NULL 0x01 +#define NDR_CONTEXT_HANDLE_SERIALIZE 0x02 +#define NDR_CONTEXT_HANDLE_NO_SERIALIZE 0x04 +#define NDR_STRICT_CONTEXT_HANDLE 0x08 + #endif /* __WINE_RPCFC_H */

1 0

[spetreolle] 31766: french translation for devmgr thanks to amine48rz for dialogs
by spetreolle＠svn.reactos.org 13 Jan '08

13 Jan '08

Author: spetreolle Date: Sun Jan 13 23:41:28 2008 New Revision: 31766 URL: http://svn.reactos.org/svn/reactos?rev=31766&view=rev Log: french translation for devmgr thanks to amine48rz for dialogs Added: trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc (with props) Modified: trunk/reactos/dll/win32/devmgr/devmgr.rc Modified: trunk/reactos/dll/win32/devmgr/devmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgr.rc… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgr.rc (original) +++ trunk/reactos/dll/win32/devmgr/devmgr.rc Sun Jan 13 23:41:28 2008 @@ -16,6 +16,7 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" +#include "lang/fr-FR.rc" #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" Added: trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc (added) +++ trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc Sun Jan 13 23:41:28 2008 @@ -1,0 +1,170 @@ +// French language resource file (Sylvain Petreolle) + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_NAME "Nom" + IDS_TYPE "Type" + IDS_MANUFACTURER "Fabricant: %1" + IDS_LOCATION "Emplacement: %1" + IDS_STATUS "Etat: %1" + IDS_UNKNOWN "Inconnu" + IDS_LOCATIONSTR "Emplacement %1!u! (%2)" + IDS_DEVCODE " (Code %1!u!)" + IDS_DEVCODE2 " (Code %2!u!)" + IDS_ENABLEDEVICE "Utiliser ce périphérique (activé)" + IDS_DISABLEDEVICE "Ne pas utiliser ce matériel (désactivé)" + IDS_UNKNOWNDEVICE "Matériel inconnu" + IDS_NODRIVERLOADED "Aucun driver n'est installé pour ce matériel." + IDS_DEVONPARENT "sur %1" + IDS_TROUBLESHOOTDEV "&Dépannage..." + IDS_ENABLEDEV "A&ctiver le matériel" + IDS_REINSTALLDRV "Ré&installer le Driver" + IDS_PROPERTIES "&Propriétés" + IDS_UPDATEDRV "Mettre à jour le Driver..." + IDS_REBOOT "&Redémarrer l'ordinateur..." + IDS_NOTAVAILABLE "Non disponible" + IDS_NOTDIGITALLYSIGNED "Non signé numériquement" + IDS_NODRIVERS "Aucun fichier n'est requis ou n'a été chargé pour ce matériel." +END + +STRINGTABLE +BEGIN + IDS_DEV_NO_PROBLEM "Ce périphérique fonctionne correctement." + IDS_DEV_NOT_CONFIGURED "Ce périphérique n'est pas configuré correctement." + IDS_DEV_DEVLOADER_FAILED "ReactOS n'a pu charger le pilote de ce périphérique car l'ordinateur signale deux types de bus $1." + IDS_DEV_DEVLOADER_FAILED2 "Le(s) chargeur(s) de périphérique $1 pour ce périphérique n'ont pu charger le driver." + IDS_DEV_OUT_OF_MEMORY "Le pilote de ce périphérique peut être mauvais, ou votre système peut être à court de mémoire ou d'autres ressources." + IDS_DEV_ENTRY_IS_WRONG_TYPE "Ce périphérique ne fonctionne pas correctement parce qu'un des pilotes de ce périphérique peut être mauvais, ou votre base de registres peut être mauvaise." + IDS_DEV_LACKED_ARBITRATOR "Le pilote de ce périphérique a demandé une ressource que ReactOS ne sait pas prendre en compte." + IDS_DEV_BOOT_CONFIG_CONFLICT "Un autre périphérique utilise les resources nécéssaire à ce périphérique." + IDS_DEV_FAILED_FILTER "Les pilotes de ce périphérique doivent etre réinstallés." + IDS_DEV_DEVLOADER_NOT_FOUND "Ce périphérique ne fonctionne pas correctement parce que ReactOS ne peut charger le fichier $1 qui charge les pilotes de ce périphérique." + IDS_DEV_DEVLOADER_NOT_FOUND2 "Ce périphérique ne fonctionne pas correctement parce que le fichier $1 qui charge les pilotes de ce périphérique est mauvais." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Erreur du périphérique: Essayez de changer le driver du périphérique. Si cela ne fonctionne pas, voyez la documentation du matériel." + IDS_DEV_INVALID_DATA "Ce périphérique ne fonctionne pas correctement parce que le BIOS de votre ordinateur rapporte incorrectement les ressources de ce périphérique." + IDS_DEV_INVALID_DATA2 "Ce périphérique ne fonctionne pas correctement parce que le BIOS de votre ordinateur rapporte incorrectement les ressources de ce périphérique. " + IDS_DEV_FAILED_START "Ce périphérique est soit non présent, ne fonctionnant pas correctement, ou n'a pas tous les pilotes installés." + IDS_DEV_LIAR "ReactOS a arrêté de fonctionner en essayant de démarrer ce périphérique, et n'essayera donc plus de le démarrer de nouveau." + IDS_DEV_NORMAL_CONFLICT "Ce périphérique nze peut trouver de ressources $1 à utiliser." + IDS_DEV_NOT_VERIFIED "Ce périphérique est soit non présent, ne fonctionnant pas correctement, ou n'a pas tous les pilotes installés." + IDS_DEV_NEED_RESTART "Ce périphérique ne peut fonctionner correctement tant que vous n'aurez pas redémarré votre ordinateur." + IDS_DEV_REENUMERATION "Ce périphérique cause un conflit de ressource." + IDS_DEV_PARTIAL_LOG_CONF "ReactOS n'a pu identifier toutes les ressources utilisées par ce périphérique." + IDS_DEV_UNKNOWN_RESOURCE "Le fichier d'information du pilote $1 indique à ce périphérique enfant d'utiliser une ressource que le périphérique parent n'a ou ne reconnait pas." + IDS_DEV_REINSTALL "Les pilotes de ce périphérique doivent être réinstallés." + IDS_DEV_REGISTRY "Votre base de registres peut être mauvaise." + IDS_DEV_WILL_BE_REMOVED "ReactOS est en train de supprimer ce périphérique." + IDS_DEV_DISABLED "Ce périphérique n'est pas démarré." + IDS_DEV_DISABLED2 "Ce périphérique est désactivé." + IDS_DEV_DEVLOADER_NOT_READY "Les chargeurs de ce périphérique ne peuvent charger les drivers requis." + IDS_DEV_DEVLOADER_NOT_READY2 "Cet écran fonctionne correctement." + IDS_DEV_DEVLOADER_NOT_READY3 "Les chargeurs de ce périphérique ne peuvent charger les drivers requis." + IDS_DEV_DEVICE_NOT_THERE "Ce périphérique est soit non présent, soit ne fonctionne pas correctement, ou n'a pas tous les pilotes installés." + IDS_DEV_MOVED "ReactOS est en train de mettre en place ce périphérique." + IDS_DEV_TOO_EARLY "ReactOS est en train de mettre en place ce périphérique." + IDS_DEV_NO_VALID_LOG_CONF "ReactOS can\'t specify the resources for this device." + IDS_DEV_FAILED_INSTALL "Les pilotes de ce périphérique ne sont pas installés." + IDS_DEV_HARDWARE_DISABLED "Ce périphérique est désactivé car le BIOS n'a pas donné de ressources à ce périphérique." + IDS_DEV_CANT_SHARE_IRQ "Ce périphérique utilise une Interruption Matérielle (IRQ) qui est utilisée par un autre périphérique et ne peut être partagé.\nVous devez changer les réglages en conflit ou enlever le driver en mode-réel causant le conflit." + IDS_DEV_FAILED_ADD "Ce périphérique ne fonctionne pas correctement parce que $1 ne fonctionne pas correctement." + IDS_DEV_DISABLED_SERVICE "ReactOS ne peut installer les pioltes pour ce périphérique car il ne peut accéder au lecteur ou à l'emplacement réseau contenant les fichiers d'installation." + IDS_DEV_TRANSLATION_FAILED "Ce périphérique ne répond pas à son pilote." + IDS_DEV_NO_SOFTCONFIG "ReactOS ne peut déterminer les réglages de ce périphérique. Consultez la documentation accompagnant ce périphérique et utilisez la pages des Resources pour modifier la configuration." + IDS_DEV_BIOS_TABLE "Le firmware de votre ordinateur n'inclut pas assez d'information pour configurer et utiliser correctement ce périphérique. \nPour utiliser ce périphérique, contactez le fabricant de votre ordinateur afin d'obtenir une mise a jour du firmware ou du BIOS." + IDS_DEV_IRQ_TRANSLATION_FAILED "Ce périphérique demande une Interruption PCI mais est configuré pour une Interruption ISA (ou vice versa). \nVeuillez utiliser le programme système d'installation de l'ordinateur pour reconfigurer les interruptions de ce périphérique." + IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS ne peut initialiser le pilote de ce matériel." + IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS ne peut charger le pilote de ce matériel parce qu'une instance précédente de ce pilote est toujours en mémoire." + IDS_DEV_DRIVER_FAILED_LOAD "ReactOS ne peut charger le pilote de ce matériel. Le pilote peut être corrompu ou manquant." + IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ReactOS ne peut accéder à ce matériel parce que la clé de registre de son service est manquante ou incorrectement inscrite." + IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS a chargé avec succès le pilote pour ce matériel mais n'a pu trouver le périphérique matériel." + IDS_DEV_DUPLICATE_DEVICE "ReactOS ne peut charger le pilote pour ce périphérique matériel parce qu'un matériel en double tourne déjà dans le système." + IDS_DEV_FAILED_POST_START "ReactOS a arrêté ce périphérique car il a signalé des problèmes." + IDS_DEV_HALTED "Une application ou un service a arrêté ce périphérique matériel." + IDS_DEV_PHANTOM "Ce périphérique matériel n'est pas connecté à l'ordinateur actuellement." + IDS_DEV_SYSTEM_SHUTDOWN "ReactOS ne peut accéder à ce matériel parce que le système est en train de s'arrêter." + IDS_DEV_HELD_FOR_EJECT "ReactOS ne peut utiliser ce matériel parce qu'il a été préparé pour être enlevé, mais n'a pas encore été enlevé de l'ordinateur." + IDS_DEV_DRIVER_BLOCKED "Le logiciel de ce périphérique a été empéché de démarrer car il est connu pour avoir des problèmes avec ReactOS. Contactez the vendeur pour obtenir un nouveau driver." + IDS_DEV_REGISTRY_TOO_LARGE "ReactOS ne peut démarrer de nouveaux matériels parce que la base de registres es trop grande (dépasse la taille limite de la base)." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS n'a pu changer les réglages de ce périphérique." +END + +IDD_HARDWARE DIALOG DISCARDABLE 0, 0, 300, 400 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Périphériques:",IDC_DEVICES,7,6,196,10 + CONTROL "",IDC_LV_DEVICES,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,16,196,50 + GROUPBOX "Propriétés des Périphériques",IDC_PROPERTIESGROUP,7,76,196,105 + LTEXT "",IDC_MANUFACTURER,14,88,183,10,SS_ENDELLIPSIS + LTEXT "",IDC_LOCATION,14,100,183,10,SS_ENDELLIPSIS + LTEXT "",IDC_STATUS,14,112,183,30 + PUSHBUTTON "&Dépannage...",IDC_TROUBLESHOOT,85,140,54,14, + BS_PUSHBUTTON | WS_CHILD | WS_DISABLED | WS_TABSTOP + PUSHBUTTON "P&ropriétés",IDC_PROPERTIES,146,140,50,14 +END + +IDD_DEVICEGENERAL DIALOG DISCARDABLE 0, 0, 252, 218 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Général" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Type de matériel:", -1, 37, 39, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVTYPE, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Fabricant:", -1, 37, 53, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVMANUFACTURER, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Emplacement:", -1, 37, 67, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVLOCATION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + GROUPBOX "Etat du matériel", IDC_DEVSTATUSGROUP, 7, 83, 238, 100 + EDITTEXT IDC_DEVSTATUS, 14, 96, 224, 61, NOT WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL + PUSHBUTTON "&Dépannage...", IDC_DEVPROBLEM, 148, 163, 90, 15 + LTEXT "&Utilisation du matériel:", IDC_DEVUSAGELABEL, 7, 188, 222, 8, WS_DISABLED + COMBOBOX IDC_DEVUSAGE, 7, 198, 239, 40, CBS_DROPDOWNLIST | WS_VSCROLL | WS_DISABLED +END + +IDD_DEVICEDRIVER DIALOG DISCARDABLE 0, 0, 252, 218 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Pilote" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Fournisseur:", -1, 37, 39, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DRVPROVIDER, 120, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Date du Pilote:", -1, 37, 53, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DRVDATE, 120, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Version du Pilote:", -1, 37, 67, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DRVVERSION, 120, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Signature numérique:", -1, 37, 81, 80, 8, SS_NOPREFIX + EDITTEXT IDC_DIGITALSIGNER, 120, 81, 126, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + PUSHBUTTON "&Détails...", IDC_DRIVERDETAILS, 7, 106, 70, 15 + LTEXT "Voir les détails à propos des fichiers du Pilote.", -1, 91, 110, 154, 17, SS_NOPREFIX +END + +IDD_DRIVERDETAILS DIALOG DISCARDABLE 0, 0, 224, 250 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Fichiers du Pilote" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "&Fichiers:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERFILES, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LTEXT "Fournisseur:", -1, 14, 134, 50, 8 + LTEXT "", IDC_FILEPROVIDER, 66, 134, 155, 8 + LTEXT "Version:", -1, 14, 150, 50, 8 + LTEXT "", IDC_FILEVERSION, 66, 150, 155, 8 + LTEXT "Copyright:", -1, 14, 166, 50, 8 + LTEXT "", IDC_FILECOPYRIGHT, 66, 166, 155, 8 + LTEXT "Signature numérique:", -1, 14, 182, 80, 8 + LTEXT "", IDC_DIGITALSIGNER, 96, 182, 125, 8 + PUSHBUTTON "OK", IDOK, 167, 228, 50, 14 +END + Propchange: trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain

1 0

[cfinck] 31765: - Change the comment about the build tag for releases in "version.h" - Update Thunderbird 1.5 to 1.5.0.14 in "downloader.xml"
by cfinck＠svn.reactos.org 13 Jan '08

13 Jan '08

Author: cfinck Date: Sun Jan 13 22:45:24 2008 New Revision: 31765 URL: http://svn.reactos.org/svn/reactos?rev=31765&view=rev Log: - Change the comment about the build tag for releases in "version.h" - Update Thunderbird 1.5 to 1.5.0.14 in "downloader.xml" Modified: trunk/reactos/include/reactos/version.h trunk/rosapps/downloader/downloader.xml Modified: trunk/reactos/include/reactos/version.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/version.h?… ============================================================================== --- trunk/reactos/include/reactos/version.h (original) +++ trunk/reactos/include/reactos/version.h Sun Jan 13 22:45:24 2008 @@ -21,7 +21,7 @@ #define KERNEL_VERSION_MINOR 4 #define KERNEL_VERSION_PATCH_LEVEL 0 -/* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"RELEASE" */ +/* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"" (for the release) */ #define KERNEL_VERSION_BUILD_TYPE L"SVN" Modified: trunk/rosapps/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/downloader.xml?… ============================================================================== --- trunk/rosapps/downloader/downloader.xml (original) +++ trunk/rosapps/downloader/downloader.xml Sun Jan 13 22:45:24 2008 @@ -17,9 +17,9 @@ <application name="Thunderbird 1.5"> <regname>Mozilla Thunderbird (1.5)</regname> <licence>MPL/GPL/LGPL</licence> - <version>1.5.0.13</version> + <version>1.5.0.14</version> <description>The most popular and one of the best free Mail Clients out there.</description> - <location>http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/1.5.0.13/win32/…</location> + <location>http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/1.5.0.14/win32/…</location> </application> <application name="Thunderbird 2.0"> <regname>Mozilla Thunderbird (2.0.0.9)</regname>

1 0

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