Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 42681: - Sync oleacc, oleaut32, olesvr32 with Wine 1.1.27
by dchapyshev＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: dchapyshev Date: Sat Aug 15 11:29:45 2009 New Revision: 42681 URL: http://svn.reactos.org/svn/reactos?rev=42681&view=rev Log: - Sync oleacc, oleaut32, olesvr32 with Wine 1.1.27 Modified: trunk/reactos/dll/win32/oleacc/main.c trunk/reactos/dll/win32/oleacc/oleacc.spec trunk/reactos/dll/win32/oleaut32/olefont.c trunk/reactos/dll/win32/oleaut32/olepicture.c trunk/reactos/dll/win32/oleaut32/resource.h trunk/reactos/dll/win32/oleaut32/typelib.c trunk/reactos/dll/win32/oleaut32/typelib2.c trunk/reactos/dll/win32/oleaut32/usrmarshal.c trunk/reactos/dll/win32/oleaut32/variant.c trunk/reactos/dll/win32/oleaut32/vartype.c trunk/reactos/dll/win32/olesvr32/olesvr32.spec trunk/reactos/dll/win32/olesvr32/olesvr_main.c Modified: trunk/reactos/dll/win32/oleacc/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/oleacc/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/main.c [iso-8859-1] Sat Aug 15 11:29:45 2009 @@ -37,6 +37,12 @@ { FIXME("%p %d %s %p\n", hwnd, idObject, debugstr_guid( riidInterface ), ppvObject ); + return E_NOTIMPL; +} + +HRESULT WINAPI ObjectFromLresult( LRESULT result, REFIID riid, WPARAM wParam, void **ppObject ) +{ + FIXME("%ld %s %ld %p\n", result, debugstr_guid(riid), wParam, ppObject ); return E_NOTIMPL; } Modified: trunk/reactos/dll/win32/oleacc/oleacc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc.sp… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/oleacc.spec [iso-8859-1] Sat Aug 15 11:29:45 2009 @@ -16,5 +16,5 @@ @ stub IID_IAccessibleHandler @ stub LIBID_Accessibility @ stdcall LresultFromObject(ptr long ptr) -@ stub ObjectFromLresult +@ stdcall ObjectFromLresult(long ptr long ptr) @ stub WindowFromAccessibleObject Modified: trunk/reactos/dll/win32/oleaut32/olefont.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/olefont… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/olefont.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/olefont.c [iso-8859-1] Sat Aug 15 11:29:45 2009 @@ -132,8 +132,8 @@ /* * Size ratio */ - long cyLogical; - long cyHimetric; + LONG cyLogical; + LONG cyHimetric; IConnectionPoint *pPropertyNotifyCP; IConnectionPoint *pFontEventsCP; Modified: trunk/reactos/dll/win32/oleaut32/olepicture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/olepict… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/olepicture.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/olepicture.c [iso-8859-1] Sat Aug 15 11:29:45 2009 @@ -52,7 +52,10 @@ #define UINT8 JPEG_UINT8 #define UINT16 JPEG_UINT16 #define boolean jpeg_boolean +#undef HAVE_STDLIB_H # include <jpeglib.h> +#undef HAVE_STDLIB_H +#define HAVE_STDLIB_H 1 #undef UINT8 #undef UINT16 #undef boolean @@ -1229,7 +1232,6 @@ if (pixel == (transparent & 0x000000FFU)) monoPointer[j >> 3] |= 1 << (7 - (j & 7)); } } - hdcref = GetDC(0); hTempMask = CreateDIBitmap( hdcref, &bmi->bmiHeader, @@ -1238,7 +1240,6 @@ bmi, DIB_RGB_COLORS ); - DeleteDC(hdcref); bmi->bmiHeader.biHeight = -bmi->bmiHeader.biHeight; This->hbmMask = CreateBitmap(bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, 1, 1, NULL); @@ -1263,7 +1264,7 @@ DeleteObject(hTempMask); } - DeleteDC(hdcref); + ReleaseDC(0, hdcref); This->desc.picType = PICTYPE_BITMAP; OLEPictureImpl_SetBitmap(This); DGifCloseFile(gif); @@ -1366,7 +1367,7 @@ (BITMAPINFO*)&bmi, DIB_RGB_COLORS ); - DeleteDC(hdcref); + ReleaseDC(0, hdcref); This->desc.picType = PICTYPE_BITMAP; OLEPictureImpl_SetBitmap(This); HeapFree(GetProcessHeap(),0,bits); @@ -1395,7 +1396,7 @@ bi, DIB_RGB_COLORS ); - DeleteDC(hdcref); + ReleaseDC(0, hdcref); if (This->desc.u.bmp.hbitmap == 0) return E_FAIL; This->desc.picType = PICTYPE_BITMAP; Modified: trunk/reactos/dll/win32/oleaut32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/resourc… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/resource.h [iso-8859-1] Sat Aug 15 11:29:45 2009 @@ -19,6 +19,8 @@ */ #ifndef WINE_OLEAUT32_RESOURCE_H #define WINE_OLEAUT32_RESOURCE_H + +#include <windef.h> /* Localised boolean text */ #define IDS_TRUE 100 Modified: trunk/reactos/dll/win32/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/typelib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/typelib.c [iso-8859-1] Sat Aug 15 11:29:45 2009 @@ -938,7 +938,7 @@ BSTR DocString; BSTR HelpFile; BSTR HelpStringDll; - unsigned long dwHelpContext; + DWORD dwHelpContext; int TypeInfoCount; /* nr of typeinfo's in librarry */ struct tagITypeInfoImpl *pTypeInfo; /* linked list of type info data */ int ctCustData; /* number of items in cust data list */ @@ -1058,8 +1058,8 @@ BSTR Name; BSTR DocString; BSTR DllName; - unsigned long dwHelpContext; - unsigned long dwHelpStringContext; + DWORD dwHelpContext; + DWORD dwHelpStringContext; /* functions */ TLBFuncDesc * funclist; /* linked list with function descriptions */ @@ -2872,13 +2872,7 @@ /* TLIBATTR fields */ MSFT_ReadGuid(&pTypeLibImpl->LibAttr.guid, tlbHeader.posguid, &cx); - /* pTypeLibImpl->LibAttr.lcid = tlbHeader.lcid;*/ - /* Windows seems to have zero here, is this correct? */ - if(SUBLANGID(tlbHeader.lcid) == SUBLANG_NEUTRAL) - pTypeLibImpl->LibAttr.lcid = MAKELCID(MAKELANGID(PRIMARYLANGID(tlbHeader.lcid),0),0); - else - pTypeLibImpl->LibAttr.lcid = 0; - + pTypeLibImpl->LibAttr.lcid = tlbHeader.lcid2; pTypeLibImpl->LibAttr.syskind = tlbHeader.varflags & 0x0f; /* check the mask */ pTypeLibImpl->LibAttr.wMajorVerNum = LOWORD(tlbHeader.version); pTypeLibImpl->LibAttr.wMinorVerNum = HIWORD(tlbHeader.version); Modified: trunk/reactos/dll/win32/oleaut32/typelib2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/typelib2.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/typelib2.c [iso-8859-1] Sat Aug 15 11:29:45 2009 @@ -760,7 +760,7 @@ if (offset == -1) return offset; *((unsigned short *)&This->typelib_segment_data[MSFT_SEG_CUSTDATA][offset]) = VT_UI4; - *((unsigned long *)&This->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+2]) = V_UI4(pVarVal); + *((unsigned int *)&This->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+2]) = V_UI4(pVarVal); break; default: @@ -3204,7 +3204,10 @@ /****************************************************************************** * ICreateTypeLib2_SetLcid {OLEAUT32} * - * See ICreateTypeLib_SetLcid. + * Sets both the lcid and lcid2 members in the header to lcid. + * + * As a special case if lcid == LOCALE_NEUTRAL (0), then the first header lcid + * is set to US English while the second one is set to 0. */ static HRESULT WINAPI ICreateTypeLib2_fnSetLcid(ICreateTypeLib2 * iface, LCID lcid) { @@ -3213,6 +3216,8 @@ TRACE("(%p,%d)\n", iface, lcid); This->typelib_header.lcid = This->typelib_header.lcid2 = lcid; + + if(lcid == LOCALE_NEUTRAL) This->typelib_header.lcid = MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US); return S_OK; } Modified: trunk/reactos/dll/win32/oleaut32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/usrmars… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/usrmarshal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/usrmarshal.c [iso-8859-1] Sat Aug 15 11:29:45 2009 @@ -232,7 +232,7 @@ case VT_DECIMAL: return sizeof(DECIMAL); case VT_BSTR: - return sizeof(BSTR); + return sizeof(ULONG); case VT_VARIANT: return sizeof(VARIANT); case VT_UNKNOWN: @@ -764,7 +764,7 @@ HRESULT hr; size += sizeof(ULONG); - size += FIELD_OFFSET(struct _wireSAFEARRAY, uArrayStructs); + size += 2 * sizeof(USHORT) + 2 * sizeof(ULONG); sftype = SAFEARRAY_GetUnionType(psa); size += sizeof(ULONG); @@ -850,23 +850,23 @@ VARTYPE vt; SAFEARRAY *psa = *ppsa; ULONG ulCellCount = SAFEARRAY_GetCellCount(psa); - wireSAFEARRAY wiresa; SF_TYPE sftype; GUID guid; *(ULONG *)Buffer = psa->cDims; Buffer += sizeof(ULONG); - wiresa = (wireSAFEARRAY)Buffer; - wiresa->cDims = psa->cDims; - wiresa->fFeatures = psa->fFeatures; - wiresa->cbElements = psa->cbElements; + *(USHORT *)Buffer = psa->cDims; + Buffer += sizeof(USHORT); + *(USHORT *)Buffer = psa->fFeatures; + Buffer += sizeof(USHORT); + *(ULONG *)Buffer = psa->cbElements; + Buffer += sizeof(ULONG); hr = SafeArrayGetVartype(psa, &vt); if (FAILED(hr)) vt = 0; - wiresa->cLocks = (USHORT)psa->cLocks | (vt << 16); - - Buffer += FIELD_OFFSET(struct _wireSAFEARRAY, uArrayStructs); + *(ULONG *)Buffer = (USHORT)psa->cLocks | (vt << 16); + Buffer += sizeof(ULONG); sftype = SAFEARRAY_GetUnionType(psa); *(ULONG *)Buffer = sftype; @@ -987,7 +987,7 @@ Buffer += sizeof(ULONG); wiresa = (wireSAFEARRAY)Buffer; - Buffer += FIELD_OFFSET(struct _wireSAFEARRAY, uArrayStructs); + Buffer += 2 * sizeof(USHORT) + 2 * sizeof(ULONG); if (cDims != wiresa->cDims) RpcRaiseException(RPC_S_INVALID_BOUND); Modified: trunk/reactos/dll/win32/oleaut32/variant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/variant… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/variant.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/variant.c [iso-8859-1] Sat Aug 15 11:29:45 2009 @@ -588,7 +588,7 @@ * * RETURNS * Success: S_OK. Any previous value in pVarg is freed and its type is set to VT_EMPTY. - * Failure: DISP_E_BADVARTYPE, if the variant is a not a valid variant type. + * Failure: DISP_E_BADVARTYPE, if the variant is not a valid variant type. */ HRESULT WINAPI VariantClear(VARIANTARG* pVarg) { @@ -5571,7 +5571,9 @@ V_VT(result) = VT_I8; V_I8(result) = V_I8(&lv) % V_I8(&rv); - TRACE("V_I8(left) == %ld, V_I8(right) == %ld, V_I8(result) == %ld\n", (long)V_I8(&lv), (long)V_I8(&rv), (long)V_I8(result)); + TRACE("V_I8(left) == %s, V_I8(right) == %s, V_I8(result) == %s\n", + wine_dbgstr_longlong(V_I8(&lv)), wine_dbgstr_longlong(V_I8(&rv)), + wine_dbgstr_longlong(V_I8(result))); /* convert left and right to the destination type */ rc = VariantChangeType(result, result, 0, resT); Modified: trunk/reactos/dll/win32/oleaut32/vartype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/vartype… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/vartype.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/vartype.c [iso-8859-1] Sat Aug 15 11:29:45 2009 @@ -5787,6 +5787,16 @@ { HRESULT hRet; DECIMAL result; + + if (!pDecLeft || !pDecRight) + return VARCMP_NULL; + + if ((!(DEC_SIGN(pDecLeft) & DECIMAL_NEG)) && (DEC_SIGN(pDecRight) & DECIMAL_NEG) && + (DEC_HI32(pDecLeft) | DEC_MID32(pDecLeft) | DEC_LO32(pDecLeft))) + return VARCMP_GT; + else if ((DEC_SIGN(pDecLeft) & DECIMAL_NEG) && (!(DEC_SIGN(pDecRight) & DECIMAL_NEG)) && + (DEC_HI32(pDecLeft) | DEC_MID32(pDecLeft) | DEC_LO32(pDecLeft))) + return VARCMP_LT; /* Subtract right from left, and compare the result to 0 */ hRet = VarDecSub(pDecLeft, pDecRight, &result); Modified: trunk/reactos/dll/win32/olesvr32/olesvr32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olesvr32/olesvr3… ============================================================================== --- trunk/reactos/dll/win32/olesvr32/olesvr32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/olesvr32/olesvr32.spec [iso-8859-1] Sat Aug 15 11:29:45 2009 @@ -1,6 +1,6 @@ 1 stub WEP 2 stdcall OleRegisterServer(str ptr ptr long long) - 3 stub OleRevokeServer + 3 stdcall OleRevokeServer(long) 4 stdcall OleBlockServer(long) 5 stdcall OleUnblockServer(long ptr) 6 stdcall OleRegisterServerDoc(ptr str ptr ptr) Modified: trunk/reactos/dll/win32/olesvr32/olesvr_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olesvr32/olesvr_… ============================================================================== --- trunk/reactos/dll/win32/olesvr32/olesvr_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/olesvr32/olesvr_main.c [iso-8859-1] Sat Aug 15 11:29:45 2009 @@ -210,3 +210,13 @@ FIXME("(%d): stub.\n", hDoc); return OLE_OK; } + +/****************************************************************************** + * OleRevokeServer [OLESVR32.3] + * + */ +OLESTATUS WINAPI OleRevokeServer(LHSERVER hServer) +{ + FIXME("(%d): stub.\n", hServer); + return OLE_OK; +}

1 0

[dchapyshev] 42680: - Add Russian translation
by dchapyshev＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: dchapyshev Date: Sat Aug 15 11:25:32 2009 New Revision: 42680 URL: http://svn.reactos.org/svn/reactos?rev=42680&view=rev Log: - Add Russian translation Added: trunk/reactos/base/applications/rapps/lang/ru-RU.rc (with props) Modified: trunk/reactos/base/applications/rapps/rsrc.rc Added: trunk/reactos/base/applications/rapps/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ru-RU.rc (added) +++ trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] Sat Aug 15 11:25:32 2009 @@ -1,0 +1,167 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDR_MAINMENU MENU +BEGIN + POPUP "&Ôàéë" + BEGIN + MENUITEM "&Ïàðàìåòðû", ID_SETTINGS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Âûõîä", ID_EXIT + END + POPUP "&Ïðîãðàììû" + BEGIN + MENUITEM "&Óñòàíîâèòü", ID_INSTALL + MENUITEM "&Óäàëèòü", ID_UNINSTALL + MENUITEM "&Èçìåíèòü", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Îáíîâèòü", ID_REFRESH + END + POPUP "Ñïðàâêà" + BEGIN + MENUITEM "Ñîäåðæàíèå", ID_HELP, GRAYED + MENUITEM "Î ïðîãðàììå", ID_ABOUT + END +END + +IDR_LINKMENU MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Îòêðûòü ññûëêó â áðàóçåðå", ID_OPEN_LINK + MENUITEM "&Êîïèðîâàòü ññûëêó â áóôåð", ID_COPY_LINK + END +END + +IDR_APPLICATIONMENU MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Óñòàíîâèòü", ID_INSTALL + MENUITEM "&Óäàëèòü", ID_UNINSTALL + MENUITEM "&Èçìåíèòü", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Îáíîâèòü", ID_REFRESH + END +END + +IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE 0, 0, 386, 231 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ïàðàìåòðû" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "OK", IDOK, 255, 212, 60, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 320, 212, 60, 14 +END + +IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE 0, 0, 386, 231 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ñêà÷àòü è óñòàíîâèòü" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "OK", IDOK, 255, 212, 60, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 320, 212, 60, 14 +END + +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +CAPTION "Çàãðóçêà..." +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 + LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "Îòìåíà", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +END + +IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +CAPTION "Î ïðîãðàììå" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ìåíåäæåð ïðèëîæåíèé ReactOS\nÀâòîðñêèå ïðàâà (C) 2009\nÄìèòðèé ×àïûøåâ (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + PUSHBUTTON "Çàêðûòü", IDOK, 133, 46, 50, 14 + ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_INSTALL "Óñòàíîâèòü" + IDS_TOOLTIP_UNINSTALL "Óäàëèòü" + IDS_TOOLTIP_MODIFY "Èçìåíèòü" + IDS_TOOLTIP_SETTINGS "Ïàðàìåòðû" + IDS_TOOLTIP_REFRESH "Îáíîâèòü" + IDS_TOOLTIP_EXIT "Âûõîä" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_NAME "Íàçâàíèå" + IDS_APP_INST_VERSION "Âåðñèÿ" + IDS_APP_DESCRIPTION "Îïèñàíèå" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INFO_VERSION "\nÂåðñèÿ: " + IDS_INFO_DESCRIPTION "\nÎïèñàíèå: " + IDS_INFO_PUBLISHER "\nÈçäàòåëü: " + IDS_INFO_HELPLINK "\nÑñûëêà ïîääåðæêè: " + IDS_INFO_HELPPHONE "\nÒåëåôîí ïîääåðæêè: " + IDS_INFO_README "\nÔàéë ""Readme"": " + IDS_INFO_REGOWNER "\nÇàðåãèñòðèðîâàííûé âëàäåëåö: " + IDS_INFO_PRODUCTID "\nÊîä ïðîäóêòà: " + IDS_INFO_CONTACT "\nÊîíòàêò: " + IDS_INFO_UPDATEINFO "\nÈíôîðìàöèÿ îá îáíîâëåíèÿõ: " + IDS_INFO_INFOABOUT "\nÈíôîðìàöèÿ î ïðîãðàììå: " + IDS_INFO_COMMENTS "\nÊîììåíòàðèè: " + IDS_INFO_INSTLOCATION "\nÓñòàíîâëåíî èç: " + IDS_INFO_INSTALLSRC "\nÈñòî÷íèê óñòàíîâêè: " + IDS_INFO_UNINSTALLSTR "\nÑòðîêà äëÿ óäàëåíèÿ: " + IDS_INFO_MODIFYPATH "\nÑòðîêà äëÿ èçìåíåíèÿ: " + IDS_INFO_INSTALLDATE "\nÄàòà óñòàíîâêè: " +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_AINFO_VERSION "\nÂåðñèÿ: " + IDS_AINFO_DESCRIPTION "\nÎïèñàíèå: " + IDS_AINFO_SIZE "\nÐàçìåð: " + IDS_AINFO_URLSITE "\nÄîìàøíÿÿ ñòðàíèöà: " + IDS_AINFO_LICENCE "\nËèöåíçèÿ: " +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CAT_AUDIO "Àóäèî" + IDS_CAT_DEVEL "Ðàçðàáîòêà" + IDS_CAT_DRIVERS "Äðàéâåðû" + IDS_CAT_EDU "Îáðàçîâàíèå" + IDS_CAT_ENGINEER "Èíæåíåðíûå" + IDS_CAT_FINANCE "Ôèíàíñû" + IDS_CAT_GAMES "Èãðû è ðàçâëå÷åíèÿ" + IDS_CAT_GRAPHICS "Ãðàôèêà" + IDS_CAT_INTERNET "Èíòåðíåò è ñåòü" + IDS_CAT_LIBS "Áèáëèîòåêè" + IDS_CAT_OFFICE "Îôèñ" + IDS_CAT_OTHER "Ðàçíîå" + IDS_CAT_SCIENCE "Íàóêà" + IDS_CAT_TOOLS "Èíñòðóìåíòû" + IDS_CAT_VIDEO "Âèäåî" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "Ìåíåäæåð ïðèëîæåíèé ReactOS" + IDS_SEARCH_TEXT "Ïîèñê..." + IDS_INSTALL "Óñòàíîâèòü" + IDS_UNINSTALL "Óäàëèòü" + IDS_MODIFY "Èçìåíèòü" + IDS_APPS_COUNT "Êîëè÷åñòâî: %d" + IDS_WELCOME_TITLE "Äîáðî ïîæàëîâàòü â ""Ìåíåäæåð ïðèëîæåíèé ReactOS""!\n\n" + IDS_WELCOME_TEXT "Âûáåðèòå êàòåãîðèÿ ñëåâà è ïðèëîæåíèå äëÿ óñòàíîâêè èëè óäàëåíèÿ.\nÑàéò ReactOS: " + IDS_WELCOME_URL "http://www.reactos.org" + IDS_INSTALLED "Óñòàíîâëåííûå" + IDS_AVAILABLEFORINST "Äîñòóïíî äëÿ óñòàíîâêè" + IDS_UPDATES "Îáíîâëåíèÿ" + IDS_APPLICATIONS "Ïðèëîæåíèÿ" + IDS_DOWNLOAD_FOLDER "Downloads" +END Propchange: trunk/reactos/base/applications/rapps/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/rapps/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/rs… ============================================================================== --- trunk/reactos/base/applications/rapps/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rsrc.rc [iso-8859-1] Sat Aug 15 11:25:32 2009 @@ -1,4 +1,4 @@ #include "lang/en-US.rc" #include "lang/no-NO.rc" -//#include "lang/ru-RU.rc" +#include "lang/ru-RU.rc" #include "lang/uk-UA.rc"

1 0

[fireball] 42679: - Delete lib/sdk/crt/time.
by fireball＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: fireball Date: Sat Aug 15 11:05:18 2009 New Revision: 42679 URL: http://svn.reactos.org/svn/reactos?rev=42679&view=rev Log: - Delete lib/sdk/crt/time. Removed: branches/arwinss/reactos/lib/sdk/crt/time/

1 0

[janderwald] 42678: - Include splitter in build
by janderwald＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: janderwald Date: Sat Aug 15 10:07:06 2009 New Revision: 42678 URL: http://svn.reactos.org/svn/reactos?rev=42678&view=rev Log: - Include splitter in build Modified: trunk/reactos/drivers/wdm/audio/filters/directory.rbuild Modified: trunk/reactos/drivers/wdm/audio/filters/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/directory.rbuild [iso-8859-1] Sat Aug 15 10:07:06 2009 @@ -4,4 +4,7 @@ <directory name="kmixer"> <xi:include href="kmixer/kmixer.rbuild" /> </directory> + <directory name="splitter"> + <xi:include href="splitter/splitter.rbuild" /> + </directory> </group>

1 0

[sginsberg] 42677: - Define _WINE for gdi32, user32, winent and winex11 to be compatible with recent header changes - Properly define RtlNtStatusToDosError in winternl.h so it doesn't conflict with server.h (the inconsistency is not detected by gcc)
by sginsberg＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: sginsberg Date: Sat Aug 15 10:00:02 2009 New Revision: 42677 URL: http://svn.reactos.org/svn/reactos?rev=42677&view=rev Log: - Define _WINE for gdi32, user32, winent and winex11 to be compatible with recent header changes - Properly define RtlNtStatusToDosError in winternl.h so it doesn't conflict with server.h (the inconsistency is not detected by gcc) Modified: branches/arwinss/reactos/dll/win32/gdi32/driver.c branches/arwinss/reactos/dll/win32/gdi32/freetype.c branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild branches/arwinss/reactos/dll/win32/user32/user32.rbuild branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild branches/arwinss/reactos/include/psdk/winternl.h Modified: branches/arwinss/reactos/dll/win32/gdi32/driver.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/driver.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/driver.c [iso-8859-1] Sat Aug 15 10:00:02 2009 @@ -229,7 +229,9 @@ { char buffer[MAX_PATH], libname[32], *name, *next; HMODULE module = 0; +#if 0 HKEY hkey; +#endif if (display_driver) /* already loaded */ { Modified: branches/arwinss/reactos/dll/win32/gdi32/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/freetype.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/freetype.c [iso-8859-1] Sat Aug 15 10:00:02 2009 @@ -160,7 +160,7 @@ static void *ft_handle = NULL; -#define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL +#define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL // FIXME: MSVC does not implement typeof MAKE_FUNCPTR(FT_Vector_Unit); MAKE_FUNCPTR(FT_Done_Face); MAKE_FUNCPTR(FT_Get_Char_Index); @@ -2714,7 +2714,7 @@ return FALSE; } -#define LOAD_FUNCPTR(f) if((p##f = GetProcAddress(ft_handle, #f)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} +#define LOAD_FUNCPTR(f) if((p##f = (PVOID)GetProcAddress(ft_handle, #f)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} LOAD_FUNCPTR(FT_Vector_Unit) LOAD_FUNCPTR(FT_Done_Face) @@ -2742,16 +2742,16 @@ #undef LOAD_FUNCPTR /* Don't warn if these ones are missing */ - pFT_Library_Version = GetProcAddress(ft_handle, "FT_Library_Version"); - pFT_Load_Sfnt_Table = GetProcAddress(ft_handle, "FT_Load_Sfnt_Table"); - pFT_Get_First_Char = GetProcAddress(ft_handle, "FT_Get_First_Char"); - pFT_Get_Next_Char = GetProcAddress(ft_handle, "FT_Get_Next_Char"); - pFT_Get_TrueType_Engine_Type = GetProcAddress(ft_handle, "FT_Get_TrueType_Engine_Type"); + pFT_Library_Version = (PVOID)GetProcAddress(ft_handle, "FT_Library_Version"); + pFT_Load_Sfnt_Table = (PVOID)GetProcAddress(ft_handle, "FT_Load_Sfnt_Table"); + pFT_Get_First_Char = (PVOID)GetProcAddress(ft_handle, "FT_Get_First_Char"); + pFT_Get_Next_Char = (PVOID)GetProcAddress(ft_handle, "FT_Get_Next_Char"); + pFT_Get_TrueType_Engine_Type = (PVOID)GetProcAddress(ft_handle, "FT_Get_TrueType_Engine_Type"); #ifdef HAVE_FREETYPE_FTLCDFIL_H - pFT_Library_SetLcdFilter = GetProcAddress(ft_handle, "FT_Library_SetLcdFilter"); + pFT_Library_SetLcdFilter = (PVOID)GetProcAddress(ft_handle, "FT_Library_SetLcdFilter"); #endif #ifdef HAVE_FREETYPE_FTWINFNT_H - pFT_Get_WinFNT_Header = GetProcAddress(ft_handle, "FT_Get_WinFNT_Header"); + pFT_Get_WinFNT_Header = (PVOID)GetProcAddress(ft_handle, "FT_Get_WinFNT_Header"); #endif if(!GetProcAddress(ft_handle, "FT_Get_Postscript_Name") && !GetProcAddress(ft_handle, "FT_Sqrt64")) { Modified: branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Sat Aug 15 10:00:02 2009 @@ -4,10 +4,11 @@ <include base="ReactOS">include/reactos/wine</include> <include base="ReactOS">dll/3rdparty/freetype/include</include> <define name="_DISABLE_TIDENTS" /> - <define name="WINVER">0x0600</define> - <define name="_WIN32_WINNT">0x0501</define> + <redefine name="WINVER">0x0600</redefine> + <redefine name="_WIN32_WINNT">0x0501</redefine> <define name="LANGPACK" /> <define name="__WINESRC__" /> + <define name="_WINE" /> <library>wine</library> <library>ntdll</library> <library>user32</library> Modified: branches/arwinss/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Sat Aug 15 10:00:02 2009 @@ -5,9 +5,10 @@ <include base="ReactOS">include/reactos/subsys</include> <include base="ReactOS">include/reactos/wine</include> <define name="_DISABLE_TIDENTS" /> - <define name="WINVER">0x0600</define> - <define name="_WIN32_WINNT">0x0600</define> + <redefine name="WINVER">0x0600</redefine> + <redefine name="_WIN32_WINNT">0x0600</redefine> <define name="__WINESRC__" /> + <define name="_WINE" /> <library>wine</library> <library>ntdll</library> <library>gdi32</library> Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild [iso-8859-1] Sat Aug 15 10:00:02 2009 @@ -5,6 +5,7 @@ <define name="WINVER">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__WINESRC__" /> + <define name="_WINE" /> <file>font.c</file> <file>gdidrv.c</file> <file>main.c</file> Modified: branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild [iso-8859-1] Sat Aug 15 10:00:02 2009 @@ -5,6 +5,7 @@ <define name="WINVER">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__WINESRC__" /> + <define name="_WINE" /> <file>bitblt.c</file> <file>bitmap.c</file> <file>brush.c</file> Modified: branches/arwinss/reactos/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/wi… ============================================================================== --- branches/arwinss/reactos/include/psdk/winternl.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/winternl.h [iso-8859-1] Sat Aug 15 10:00:02 2009 @@ -2085,7 +2085,7 @@ DWORD WINAPI RtlNewSecurityObject(DWORD,DWORD,DWORD,DWORD,DWORD,DWORD); PRTL_USER_PROCESS_PARAMETERS WINAPI RtlNormalizeProcessParams(RTL_USER_PROCESS_PARAMETERS*); -ULONG WINAPI RtlNtStatusToDosError(NTSTATUS); +NTSYSAPI ULONG WINAPI RtlNtStatusToDosError(NTSTATUS); ULONG WINAPI RtlNtStatusToDosErrorNoTeb(NTSTATUS); ULONG WINAPI RtlNumberOfSetBits(PCRTL_BITMAP); ULONG WINAPI RtlNumberOfClearBits(PCRTL_BITMAP);

1 0

[dchapyshev] 42676: - Add/update Ukrainian translation by Yevhen Sakara <eresid@gmail.com>
by dchapyshev＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: dchapyshev Date: Sat Aug 15 07:28:45 2009 New Revision: 42676 URL: http://svn.reactos.org/svn/reactos?rev=42676&view=rev Log: - Add/update Ukrainian translation by Yevhen Sakara <eresid(a)gmail.com> Added: trunk/reactos/base/applications/cmdutils/doskey/lang/uk-UA.rc (with props) trunk/reactos/base/applications/rapps/lang/uk-UA.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.rc trunk/reactos/base/applications/mplay32/lang/uk-UA.rc trunk/reactos/base/applications/paint/lang/uk-UA.rc trunk/reactos/base/applications/rapps/rsrc.rc Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.rc [iso-8859-1] Sat Aug 15 07:28:45 2009 @@ -6,3 +6,4 @@ #include <windows.h> #include "doskey.h" #include "lang/en-US.rc" +#include "lang/uk-UA.rc" Added: trunk/reactos/base/applications/cmdutils/doskey/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/lang/uk-UA.rc (added) +++ trunk/reactos/base/applications/cmdutils/doskey/lang/uk-UA.rc [iso-8859-1] Sat Aug 15 07:28:45 2009 @@ -1,0 +1,35 @@ +/* + * PROJECT: ReactOS DOSKey + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/cmdutils/doskey/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for ReactOS DOSKey + * TRANSLATOR: Sakara Yevhen + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_HELP, "Ìåíåäæåð êîìàíäíîãî ðÿäêà äëÿ ðåäàãóâàííÿ íàëàøòóâàíü, ³ñòîð³¿ òà ìàêðîñ³â.\n\ +\n\ +DOSKEY [/INSERT | /OVERSTRIKE] [/EXENAME=exe] [/HISTORY] [/LISTSIZE=size]\n\ + [/REINSTALL] [/MACROS[:exe | :ALL]] [/MACROFILE=file] [macroname=[text]]\n\ +\n\ + /INSERT Äîçâ³ë âêëþ÷åííÿ ðåæèìó.\n\ + /OVERSTRIKE Çàáîðîíà âêëþ÷åííÿ ðåæèìó.\n\ + /EXENAME=exename Âñòàíîâëåííÿ ³ì'ÿ ïðîãðàìè äëÿ ïåðåãëÿäó/çì³íè ³ñòîð³¿\n\ + ³ ìàêðîñ³â. Çíà÷åííÿ çà çàìîâ÷óâàííÿì cmd.exe.\n\ + /HISTORY Â³äîáðàæåííÿ ³ñòîð³¿ êîìàíä.\n\ + /LISTSIZE=size Âñòàíîâëåííÿ ê³ëüêîñò³ êîìàíä çà ³ñòîð³þ áóôåðà.\n\ + /REINSTALL Î÷èùåííÿ ³ñòîð³¿ êîìàíä.\n\ + /MACROS Â³äîáðàæåííÿ ìàêðîñ³ âèçíà÷åíü.\n\ + /MACROS:exename Â³äîáðàæåííÿ ìàêðîñ³ âèçíà÷åíü äëÿ êîíêðåòíî¿ ïðîãðàìè.\n\ + /MACROS:ALL Â³äîáðàæåííÿ ìàêðîñ³ âèçíà÷åíü äëÿ âñ³õ ïðîãðàì.\n\ + /MACROFILE=filename Çàâàíòàæåííÿ ìàêðîñ³ âèçíà÷åíü ç ôàéëó.\n\ + macroname Âèçíà÷åííÿ ³ì'ÿ ìàêðîñó äëÿ ñòâîðåííÿ.\n\ + text Âèçíà÷åííÿ çàì³íè òåêñòó â ìàêðîñ³.\n" + +IDS_INVALID_MACRO_DEF, "Íåä³éñíèé ìàêðîñ âèçíà÷åííÿ: %s\n" + +END Propchange: trunk/reactos/base/applications/cmdutils/doskey/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mplay32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/uk-UA.rc [iso-8859-1] Sat Aug 15 07:28:45 2009 @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS MPlay32 + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/mplay32/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for ReactOS MPlay32 + * TRANSLATOR: Sakara Yevhen + */ + LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT IDR_MAINMENU MENU Modified: trunk/reactos/base/applications/paint/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/uk-UA.rc [iso-8859-1] Sat Aug 15 07:28:45 2009 @@ -1,7 +1,9 @@ /* - * Ukrainian Language resource file - * Translated by: Artem Reznikov - * Last changed: 29-04-2009 + * PROJECT: Paint for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/devmgmt/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for Paint + * TRANSLATOR: Artem Reznikov, Sakara Yevhen */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT @@ -47,7 +49,7 @@ MENUITEM SEPARATOR POPUP "Ìàñøòàá" BEGIN - POPUP "User defined" + POPUP "Êîðèñòóâàëüíèöüêèé" BEGIN MENUITEM "12,5%", IDM_VIEWZOOM125 MENUITEM "25%", IDM_VIEWZOOM25 @@ -58,8 +60,8 @@ MENUITEM "800%", IDM_VIEWZOOM800 END MENUITEM SEPARATOR - MENUITEM "Show grid", IDM_VIEWSHOWGRID - MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE + MENUITEM "Ïîêàçàòè ñ³òêó", IDM_VIEWSHOWGRID + MENUITEM "Ïîêàçàòè â ì³í³àòþð³", IDM_VIEWSHOWMINIATURE END MENUITEM "Íà âåñü åêðàí\tCtrl+F", IDM_VIEWFULLSCREEN END @@ -176,10 +178,10 @@ IDS_PROGRAMNAME, "Paint" IDS_WINDOWTITLE, "%s - Paint" IDS_INFOTITLE, "Paint äëÿ ReactOS" - IDS_INFOTEXT, "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (see www.gnu.org)" + IDS_INFOTEXT, "Paint äëÿ ReactOS äîñòóïíèé çã³äíî ç GNU Lesser General Public License (LGPL) âåðñ³¿ 3 (äèâ³òüñÿ www.gnu.org)" IDS_SAVEPROMPTTEXT, "Çáåðåãòè çì³íè äî %s?" IDS_DEFAULTFILENAME, "Áåç_³ìåí³.bmp" - IDS_MINIATURETITLE, "Miniature" + IDS_MINIATURETITLE, "Ì³í³àòþðà" IDS_TOOLTIP1, "Âèä³ëåííÿ äîâ³ëüíî¿ îáëàñò³" IDS_TOOLTIP2, "Âèä³ëåííÿ" IDS_TOOLTIP3, "Ëàñòèê" Added: trunk/reactos/base/applications/rapps/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/uk-UA.rc (added) +++ trunk/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] Sat Aug 15 07:28:45 2009 @@ -1,0 +1,175 @@ +/* + * PROJECT: ReactOS ReactOS Applications Manager + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/rapps/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for ReactOS ReactOS Applications Manager + * TRANSLATOR: Sakara Yevhen + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDR_MAINMENU MENU +BEGIN + POPUP "&Ôàéë" + BEGIN + MENUITEM "&Íàëàøòóâàííÿ", ID_SETTINGS, GRAYED + MENUITEM SEPARATOR + MENUITEM "Â&èõ³ä", ID_EXIT + END + POPUP "&Ïðîãðàìè" + BEGIN + MENUITEM "&Âñòàíîâèòè", ID_INSTALL + MENUITEM "&Âèäàëèòè",ID_UNINSTALL + MENUITEM "&Çì³íèòè", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Îíîâèòè", ID_REFRESH + END + POPUP "Äîâ³äêà" + BEGIN + MENUITEM "Äîâ³äêà", ID_HELP, GRAYED + MENUITEM "Ïðî ïðîãðàìó...", ID_ABOUT + END +END + +IDR_LINKMENU MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Â³äêðèòè ïîñèëàííÿ â áðàóçåð³", ID_OPEN_LINK + MENUITEM "&Êîï³þâàòè ïîñèëàííÿ â áóôåð îáì³íó", ID_COPY_LINK + END +END + +IDR_APPLICATIONMENU MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Âñòàíîâèòè", ID_INSTALL + MENUITEM "&Âèäàëèòè", ID_UNINSTALL + MENUITEM "&Çì³íèòè", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Îíîâèòè", ID_REFRESH + END +END + +IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE 0, 0, 386, 231 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Íàëàøòóâàííÿ" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Òàê", IDOK, 255, 212, 60, 14 + PUSHBUTTON "Í³", IDCANCEL, 320, 212, 60, 14 +END + +IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE 0, 0, 386, 231 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Çàâàíòàæèòè ³ âñòàíîâèòè" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Òàê", IDOK, 255, 212, 60, 14 + PUSHBUTTON "Í³", IDCANCEL, 320, 212, 60, 14 +END + +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +CAPTION "Çàâàíòàæåííÿ..." +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 + LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "Â³äì³íèòè", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +END + +IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +CAPTION "Ïðî ïðîãðàìó..." +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ìåíåäæåð äîäàòê³â ReactOS\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + PUSHBUTTON "Çàêðèòè", IDOK, 133, 46, 50, 14 + ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_INSTALL "Âñòàíîâèòè" + IDS_TOOLTIP_UNINSTALL "Âèäàëèòè" + IDS_TOOLTIP_MODIFY "Çì³íèòè" + IDS_TOOLTIP_SETTINGS "Íàëàøòóâàííÿ" + IDS_TOOLTIP_REFRESH "Îíîâèòè" + IDS_TOOLTIP_EXIT "Âèõ³ä" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_NAME "²ìÿ" + IDS_APP_INST_VERSION "Âåðñ³ÿ" + IDS_APP_DESCRIPTION "Îïèñ" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INFO_VERSION "\nÂåðñ³ÿ: " + IDS_INFO_DESCRIPTION "\nÎïèñ: " + IDS_INFO_PUBLISHER "\nÂèäàâåöü: " + IDS_INFO_HELPLINK "\nÏîñèëàííÿ ï³äòðèìêè: " + IDS_INFO_HELPPHONE "\nÒåëåôîí ï³äòðèìêè: " + IDS_INFO_README "\n²íôîðìàö³ÿ: " + IDS_INFO_REGOWNER "\nÇàðåºñòðîâàíèé âëàñíèê: " + IDS_INFO_PRODUCTID "\nID ïðîäóêòó: " + IDS_INFO_CONTACT "\nÊîíòàêòíà ³íôîðìàö³ÿ: " + IDS_INFO_UPDATEINFO "\nÎíîâëåííÿ ³íôîðìàö³¿: " + IDS_INFO_INFOABOUT "\nÏðî ³íôîðìàö³ÿ: " + IDS_INFO_COMMENTS "\nÊîìåíòàð³: " + IDS_INFO_INSTLOCATION "\nÂñòàíîâëåííÿ ìîâíèõ ëîêàö³é: " + IDS_INFO_INSTALLSRC "\nÂñòàíîâèòè âèõ³äíèé êîä: " + IDS_INFO_UNINSTALLSTR "\nÂèäàëèòè ðÿäîê: " + IDS_INFO_MODIFYPATH "\nÇì³íèòè øëÿõ: " + IDS_INFO_INSTALLDATE "\nÂñòàíîâèòè äàòó: " +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_AINFO_VERSION "\nÂåðñ³ÿ: " + IDS_AINFO_DESCRIPTION "\nÎïèñ: " + IDS_AINFO_SIZE "\nÐîçì³ð: " + IDS_AINFO_URLSITE "\nÄîìàøíÿ ñòîð³íêà: " + IDS_AINFO_LICENCE "\nË³öåíç³ÿ: " +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CAT_AUDIO "Àóä³î" + IDS_CAT_DEVEL "Ðîçðîáêà" + IDS_CAT_DRIVERS "Äðàéâåðè" + IDS_CAT_EDU "Ðîçâèòîê" + IDS_CAT_ENGINEER "Òåõí³êà" + IDS_CAT_FINANCE "Ô³íàíñè " + IDS_CAT_GAMES "²ãðè òà ðîçâàãè" + IDS_CAT_GRAPHICS "Ãðàô³êà" + IDS_CAT_INTERNET "²íòåðíåò ³ ìåðåæà" + IDS_CAT_LIBS "Á³áë³îòåêè" + IDS_CAT_OFFICE "Îô³ñ" + IDS_CAT_OTHER "²íøå" + IDS_CAT_SCIENCE "Íàóêà" + IDS_CAT_TOOLS "²íñòðóìåíòè" + IDS_CAT_VIDEO "Â³äåî" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "Ìåíåäæåð äîäàòê³â ReactOS" + IDS_SEARCH_TEXT "Ïîøóê..." + IDS_INSTALL "Âñòàíîâèòè" + IDS_UNINSTALL "Âèäàëèòè" + IDS_MODIFY "Çì³íèòè" + IDS_APPS_COUNT "Ê³ëüê³ñòü äîäàòê³â: %d" + IDS_WELCOME_TITLE "Ëàñêàâî ïðîñèìî â Ìåíåäæåð äîäàòê³â ReactOS!\n\n" + IDS_WELCOME_TEXT "Âèáåð³òü êàòåãîð³þ çë³âà, à ïîò³ì âèáåð³òü ïðîãðàìè äëÿ âñòàíîâëåííÿ ÷è âèäàëåííÿ.\nÑòîð³íêà ReactOS: " + IDS_WELCOME_URL "http://www.reactos.org" + IDS_INSTALLED "Âñòàíîâëåíà" + IDS_AVAILABLEFORINST "Äîñòóïí³ äëÿ âñòàíîâëåííÿ" + IDS_UPDATES "Îíîâëåííÿ" + IDS_APPLICATIONS "Äîäàòêè" + IDS_DOWNLOAD_FOLDER "Çàâàíòàæåííÿ" +END Propchange: trunk/reactos/base/applications/rapps/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/rapps/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/rs… ============================================================================== --- trunk/reactos/base/applications/rapps/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rsrc.rc [iso-8859-1] Sat Aug 15 07:28:45 2009 @@ -1,3 +1,4 @@ #include "lang/en-US.rc" #include "lang/no-NO.rc" //#include "lang/ru-RU.rc" +#include "lang/uk-UA.rc"

1 0

[cgutman] 42675: - Actually zero the select events in ZeroEvents - Part 3 of 3 (hopefully :P)
by cgutman＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: cgutman Date: Sat Aug 15 04:48:59 2009 New Revision: 42675 URL: http://svn.reactos.org/svn/reactos?rev=42675&view=rev Log: - Actually zero the select events in ZeroEvents - Part 3 of 3 (hopefully :P) Modified: trunk/reactos/drivers/network/afd/afd/select.c Modified: trunk/reactos/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/se… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] Sat Aug 15 04:48:59 2009 @@ -47,8 +47,10 @@ UINT HandleCount ) { UINT i; - for( i = 0; i < HandleCount; i++ ) + for( i = 0; i < HandleCount; i++ ) { HandleArray[i].Status = 0; + HandleArray[i].Events = 0; + } } @@ -194,9 +196,6 @@ } } - ZeroEvents( PollReq->Handles, - PollReq->HandleCount ); - KeAcquireSpinLock( &DeviceExt->Lock, &OldIrql ); for( i = 0; i < PollReq->HandleCount; i++ ) {

1 0

[cgutman] 42674: - Fix more select bugs related to the disconnect event - Part 2 of x
by cgutman＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: cgutman Date: Sat Aug 15 04:27:02 2009 New Revision: 42674 URL: http://svn.reactos.org/svn/reactos?rev=42674&view=rev Log: - Fix more select bugs related to the disconnect event - Part 2 of x Modified: trunk/reactos/drivers/network/afd/afd/read.c Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sat Aug 15 04:27:02 2009 @@ -29,17 +29,7 @@ static BOOLEAN CantReadMore( PAFD_FCB FCB ) { UINT BytesAvailable = FCB->Recv.Content - FCB->Recv.BytesUsed; - return !BytesAvailable && - (FCB->PollState & (AFD_EVENT_CLOSE | AFD_EVENT_DISCONNECT)); -} - -static VOID HandleEOFOnIrp( PAFD_FCB FCB, NTSTATUS Status, UINT Information ) { - if( !NT_SUCCESS(Status) || - (Status == STATUS_SUCCESS && Information == 0) ) { - AFD_DbgPrint(MID_TRACE,("Looks like an EOF\n")); - FCB->PollState |= AFD_EVENT_DISCONNECT; - PollReeval( FCB->DeviceExt, FCB->FileObject ); - } + return !BytesAvailable; } static NTSTATUS TryToSatisfyRecvRequestFromBuffer( PAFD_FCB FCB, @@ -56,8 +46,7 @@ AFD_DbgPrint(MID_TRACE,("Called, BytesAvailable = %d\n", BytesAvailable)); - if( CantReadMore(FCB) ) return STATUS_SUCCESS; - if( !BytesAvailable ) return STATUS_PENDING; + if( CantReadMore(FCB) ) return STATUS_PENDING; Map = (PAFD_MAPBUF)(RecvReq->BufferArray + RecvReq->BufferCount); @@ -115,7 +104,6 @@ if( Status == STATUS_SUCCESS ) FCB->Recv.Content = FCB->ReceiveIrp.Iosb.Information; - HandleEOFOnIrp( FCB, Status, FCB->ReceiveIrp.Iosb.Information ); } } @@ -132,77 +120,45 @@ AFD_DbgPrint(MID_TRACE,("%x %x\n", FCB, Irp)); - if( CantReadMore( FCB ) ) { - /* Success here means that we got an EOF. Complete a pending read - * with zero bytes if we haven't yet overread, then kill the others. - */ - while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { - NextIrpEntry = - RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]); - NextIrp = - CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); - NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); - RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; - - AFD_DbgPrint(MID_TRACE,("Completing recv %x (%d)\n", NextIrp, - TotalBytesCopied)); - UnlockBuffers( RecvReq->BufferArray, - RecvReq->BufferCount, FALSE ); - Status = NextIrp->IoStatus.Status = - FCB->Overread ? STATUS_END_OF_FILE : STATUS_SUCCESS; - NextIrp->IoStatus.Information = 0; - if( NextIrp == Irp ) RetStatus = Status; - if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); - IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); - FCB->Overread = TRUE; - //FCB->PollState |= AFD_EVENT_DISCONNECT; - PollReeval( FCB->DeviceExt, FCB->FileObject ); - } - } else { - /* Kick the user that receive would be possible now */ - /* XXX Not implemented yet */ - - AFD_DbgPrint(MID_TRACE,("FCB %x Receive data waiting %d\n", - FCB, FCB->Recv.Content)); - /*OskitDumpBuffer( FCB->Recv.Window, FCB->Recv.Content );*/ - - /* Try to clear some requests */ - while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { - NextIrpEntry = - RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]); - NextIrp = - CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); - NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); - RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; - - AFD_DbgPrint(MID_TRACE,("RecvReq @ %x\n", RecvReq)); - - Status = TryToSatisfyRecvRequestFromBuffer - ( FCB, RecvReq, &TotalBytesCopied ); - - if( Status == STATUS_PENDING ) { - AFD_DbgPrint(MID_TRACE,("Ran out of data for %x\n", NextIrp)); - InsertHeadList(&FCB->PendingIrpList[FUNCTION_RECV], - &NextIrp->Tail.Overlay.ListEntry); - break; - } else { - AFD_DbgPrint(MID_TRACE,("Completing recv %x (%d)\n", NextIrp, - TotalBytesCopied)); - UnlockBuffers( RecvReq->BufferArray, - RecvReq->BufferCount, FALSE ); - NextIrp->IoStatus.Status = Status; - NextIrp->IoStatus.Information = TotalBytesCopied; - if( NextIrp == Irp ) { - RetStatus = Status; - RetBytesCopied = TotalBytesCopied; - } - if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); - IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); - } + /* Kick the user that receive would be possible now */ + /* XXX Not implemented yet */ + + AFD_DbgPrint(MID_TRACE,("FCB %x Receive data waiting %d\n", + FCB, FCB->Recv.Content)); + + /* Try to clear some requests */ + while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { + NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]); + NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); + NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); + RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + + AFD_DbgPrint(MID_TRACE,("RecvReq @ %x\n", RecvReq)); + + Status = TryToSatisfyRecvRequestFromBuffer( FCB, RecvReq, &TotalBytesCopied ); + + if( Status == STATUS_PENDING ) { + AFD_DbgPrint(MID_TRACE,("Ran out of data for %x\n", NextIrp)); + InsertHeadList(&FCB->PendingIrpList[FUNCTION_RECV], + &NextIrp->Tail.Overlay.ListEntry); + break; + } else { + AFD_DbgPrint(MID_TRACE,("Completing recv %x (%d)\n", NextIrp, + TotalBytesCopied)); + UnlockBuffers( RecvReq->BufferArray, + RecvReq->BufferCount, FALSE ); + NextIrp->IoStatus.Status = Status; + NextIrp->IoStatus.Information = TotalBytesCopied; + if( NextIrp == Irp ) { + RetStatus = Status; + RetBytesCopied = TotalBytesCopied; } - } - - if( FCB->Recv.Content ) { + if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); + } + } + + if( !CantReadMore(FCB) ) { FCB->PollState |= AFD_EVENT_RECEIVE; } else FCB->PollState &= ~AFD_EVENT_RECEIVE; @@ -264,11 +220,7 @@ return STATUS_INVALID_PARAMETER; } - HandleEOFOnIrp( FCB, Irp->IoStatus.Status, Irp->IoStatus.Information ); - ReceiveActivity( FCB, NULL ); - - PollReeval( FCB->DeviceExt, FCB->FileObject ); SocketStateUnlock( FCB );

1 0

[cgutman] 42673: - Fix several bugs in select code and remove some dead code - Fix a typo - Part 1 of x
by cgutman＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: cgutman Date: Sat Aug 15 04:09:23 2009 New Revision: 42673 URL: http://svn.reactos.org/svn/reactos?rev=42673&view=rev Log: - Fix several bugs in select code and remove some dead code - Fix a typo - Part 1 of x Modified: trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/select.c trunk/reactos/drivers/network/afd/afd/write.c trunk/reactos/drivers/network/afd/include/afd.h Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Sat Aug 15 04:09:23 2009 @@ -63,6 +63,9 @@ if( Status == STATUS_PENDING ) Status = STATUS_SUCCESS; + FCB->PollState |= AFD_EVENT_CONNECT | AFD_EVENT_SEND; + PollReeval( FCB->DeviceExt, FCB->FileObject ); + return Status; } @@ -102,17 +105,12 @@ return STATUS_FILE_CLOSED; } - if( NT_SUCCESS(Irp->IoStatus.Status) ) { - FCB->PollState |= AFD_EVENT_CONNECT | AFD_EVENT_SEND; - AFD_DbgPrint(MID_TRACE,("Going to connected state %d\n", FCB->State)); - FCB->State = SOCKET_STATE_CONNECTED; - } else { - FCB->PollState |= AFD_EVENT_CONNECT_FAIL | AFD_EVENT_RECEIVE; + if( !NT_SUCCESS(Irp->IoStatus.Status) ) { + FCB->PollState |= AFD_EVENT_CONNECT_FAIL; AFD_DbgPrint(MID_TRACE,("Going to bound state\n")); FCB->State = SOCKET_STATE_BOUND; - } - - PollReeval( FCB->DeviceExt, FCB->FileObject ); + PollReeval( FCB->DeviceExt, FCB->FileObject ); + } /* Succeed pending irps on the FUNCTION_CONNECT list */ while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_CONNECT] ) ) { Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Sat Aug 15 04:09:23 2009 @@ -36,11 +36,6 @@ else Status = MakeSocketIntoConnection( FCB ); - if( NT_SUCCESS(Status) ) { - FCB->PollState |= AFD_EVENT_SEND; - PollReeval( DeviceExt, NewFileObject ); - } - return UnlockAndMaybeComplete( FCB, Status, Irp, 0 ); } @@ -192,8 +187,11 @@ /* Trigger a select return if appropriate */ if( !IsListEmpty( &FCB->PendingConnections ) ) { FCB->PollState |= AFD_EVENT_ACCEPT; - PollReeval( FCB->DeviceExt, FCB->FileObject ); - } + } else { + FCB->PollState &= ~AFD_EVENT_ACCEPT; + } + + PollReeval( FCB->DeviceExt, FCB->FileObject ); SocketStateUnlock( FCB ); @@ -296,7 +294,11 @@ AFD_DbgPrint(MID_TRACE,("Completed a wait for accept\n")); - FCB->PollState &= ~AFD_EVENT_ACCEPT; + if ( IsListEmpty( &FCB->PendingConnections ) ) + FCB->PollState &= ~AFD_EVENT_ACCEPT; + else + FCB->PollState |= AFD_EVENT_ACCEPT; + PollReeval( FCB->DeviceExt, FCB->FileObject ); SocketStateUnlock( FCB ); @@ -322,8 +324,6 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - FCB->EventsFired &= ~AFD_EVENT_ACCEPT; - if( FCB->NeedsNewListen ) { AFD_DbgPrint(MID_TRACE,("ADDRESSFILE: %x\n", FCB->AddressFile.Handle)); @@ -412,8 +412,11 @@ if( IsListEmpty( &FCB->PendingConnections ) ) { FCB->PollState &= ~AFD_EVENT_ACCEPT; - PollReeval( FCB->DeviceExt, FCB->FileObject ); - } + } else { + FCB->PollState |= AFD_EVENT_ACCEPT; + } + + PollReeval( FCB->DeviceExt, FCB->FileObject ); SocketStateUnlock( FCB ); return Status; Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Sat Aug 15 04:09:23 2009 @@ -300,6 +300,9 @@ if (ConnInfo) ExFreePool( ConnInfo ); + FCB->PollState |= AFD_EVENT_DISCONNECT; + PollReeval( FCB->DeviceExt, FCB->FileObject ); + return UnlockAndMaybeComplete( FCB, Status, Irp, 0 ); } Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sat Aug 15 04:09:23 2009 @@ -303,9 +303,6 @@ Irp, 0 ); } - FCB->EventsFired &= ~AFD_EVENT_RECEIVE; - PollReeval( FCB->DeviceExt, FCB->FileObject ); - if( !(RecvReq = LockRequest( Irp, IrpSp )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0 ); @@ -332,7 +329,7 @@ Status = ReceiveActivity( FCB, Irp ); - if( Status == STATUS_PENDING && RecvReq->AfdFlags & AFD_IMMEDIATE ) { + if( Status == STATUS_PENDING && (RecvReq->AfdFlags & AFD_IMMEDIATE) ) { AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); Status = STATUS_CANT_WAIT; TotalBytesCopied = 0; @@ -595,8 +592,6 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - FCB->EventsFired &= ~AFD_EVENT_RECEIVE; - /* Check that the socket is bound */ if( FCB->State != SOCKET_STATE_BOUND ) return UnlockAndMaybeComplete @@ -660,10 +655,12 @@ } else if( RecvReq->AfdFlags & AFD_IMMEDIATE ) { AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); Status = STATUS_CANT_WAIT; + FCB->PollState &= ~AFD_EVENT_RECEIVE; PollReeval( FCB->DeviceExt, FCB->FileObject ); UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); return UnlockAndMaybeComplete( FCB, Status, Irp, 0 ); } else { + FCB->PollState &= ~AFD_EVENT_RECEIVE; PollReeval( FCB->DeviceExt, FCB->FileObject ); return LeaveIrpUntilLater( FCB, Irp, FUNCTION_RECV ); } Modified: trunk/reactos/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/se… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] Sat Aug 15 04:09:23 2009 @@ -205,23 +205,16 @@ FileObject = (PFILE_OBJECT)AFD_HANDLES(PollReq)[i].Handle; FCB = FileObject->FsContext; - if( (FCB->PollState & AFD_EVENT_CLOSE) || - (PollReq->Handles[i].Status & AFD_EVENT_CLOSE) ) { - PollReq->Handles[i].Events = 0; - PollReq->Handles[i].Status = AFD_EVENT_CLOSE; - Signalled++; - } else { - AFD_DbgPrint(MID_TRACE, ("AFD: Select Events: ")); - PrintEvents( PollReq->Handles[i].Events ); - AFD_DbgPrint(MID_TRACE,("\n")); - - PollReq->Handles[i].Status = + AFD_DbgPrint(MID_TRACE, ("AFD: Select Events: ")); + PrintEvents( PollReq->Handles[i].Events ); + AFD_DbgPrint(MID_TRACE,("\n")); + + PollReq->Handles[i].Status = PollReq->Handles[i].Events & FCB->PollState; - if( PollReq->Handles[i].Status ) { + if( PollReq->Handles[i].Status ) { AFD_DbgPrint(MID_TRACE,("Signalling %x with %x\n", FCB, FCB->PollState)); Signalled++; - } } } @@ -286,7 +279,6 @@ EventSelectInfo->EventObject, EventSelectInfo->Events)); - FCB->EventSelectTriggers = FCB->EventsFired = 0; if( FCB->EventSelect ) ObDereferenceObject( FCB->EventSelect ); FCB->EventSelect = NULL; @@ -303,8 +295,8 @@ FCB->EventSelect = NULL; else FCB->EventSelectTriggers = EventSelectInfo->Events; - } else /* Work done, cancelling select */ - Status = STATUS_SUCCESS; + } else + Status = STATUS_INVALID_PARAMETER; AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); @@ -370,7 +362,6 @@ PAFD_FCB FCB; KIRQL OldIrql; PAFD_POLL_INFO PollReq; - PKEVENT EventSelect = NULL; AFD_DbgPrint(MID_TRACE,("Called: DeviceExt %x FileObject %x\n", DeviceExt, FileObject)); @@ -383,16 +374,6 @@ if( !FCB ) { KeReleaseSpinLock( &DeviceExt->Lock, OldIrql ); return; - } - - /* Not sure if i can do this at DISPATCH_LEVEL ... try it at passive */ - AFD_DbgPrint(MID_TRACE,("Current State: %x, Events Fired: %x, " - "Select Triggers %x\n", - FCB->PollState, FCB->EventsFired, - FCB->EventSelectTriggers)); - if( FCB->PollState & ~FCB->EventsFired & FCB->EventSelectTriggers ) { - FCB->EventsFired |= FCB->PollState; - EventSelect = FCB->EventSelect; } /* Now signal normal select irps */ @@ -413,8 +394,10 @@ KeReleaseSpinLock( &DeviceExt->Lock, OldIrql ); - AFD_DbgPrint(MID_TRACE,("Setting event %x\n", EventSelect)); - if( EventSelect ) KeSetEvent( EventSelect, IO_NETWORK_INCREMENT, FALSE ); + if( FCB->EventSelect && (FCB->PollState & FCB->EventSelectTriggers) ) { + AFD_DbgPrint(MID_TRACE,("Setting event %x\n", FCB->EventSelect)); + KeSetEvent( FCB->EventSelect, IO_NETWORK_INCREMENT, FALSE ); + } AFD_DbgPrint(MID_TRACE,("Leaving\n")); } Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Sat Aug 15 04:09:23 2009 @@ -223,8 +223,6 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - FCB->EventsFired &= ~AFD_EVENT_SEND; - if( FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS ) { PAFD_SEND_INFO_UDP SendReq; @@ -393,7 +391,6 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - FCB->EventsFired &= ~AFD_EVENT_SEND; FCB->PollState &= ~AFD_EVENT_SEND; PollReeval( FCB->DeviceExt, FCB->FileObject ); Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Sat Aug 15 04:09:23 2009 @@ -196,7 +196,6 @@ KEVENT StateLockedEvent; PKEVENT EventSelect; DWORD EventSelectTriggers; - DWORD EventsFired; UNICODE_STRING TdiDeviceName; PVOID Context; DWORD PollState;

1 0

[tkreuzer] 42672: Fix screwed logic in LIST_FOR_EACH and LIST_FOR_EACH_SAFE. They were 1. using inverse logic and entering the loop when elem was NULL, 2. checking elem, whick is the result of CONTAINING_RECORD on the Flink pointer that should be checked for NULL. Anyway these macros are ugly and shouldn't be used, they only obfuscate the code.
by tkreuzer＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: tkreuzer Date: Sat Aug 15 02:40:09 2009 New Revision: 42672 URL: http://svn.reactos.org/svn/reactos?rev=42672&view=rev Log: Fix screwed logic in LIST_FOR_EACH and LIST_FOR_EACH_SAFE. They were 1. using inverse logic and entering the loop when elem was NULL, 2. checking elem, whick is the result of CONTAINING_RECORD on the Flink pointer that should be checked for NULL. Anyway these macros are ugly and shouldn't be used, they only obfuscate the code. Modified: trunk/reactos/subsystems/win32/win32k/pch.h Modified: trunk/reactos/subsystems/win32/win32k/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/pc… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] Sat Aug 15 02:40:09 2009 @@ -152,13 +152,13 @@ #define LIST_FOR_EACH(elem, list, type, field) \ for ((elem) = CONTAINING_RECORD((list)->Flink, type, field); \ - &(elem)->field != (list) || (elem == NULL); \ + &(elem)->field != (list) && ((&((elem)->field)) != NULL); \ (elem) = CONTAINING_RECORD((elem)->field.Flink, type, field)) #define LIST_FOR_EACH_SAFE(cursor, cursor2, list, type, field) \ for ((cursor) = CONTAINING_RECORD((list)->Flink, type, field), \ (cursor2) = CONTAINING_RECORD((cursor)->field.Flink, type, field); \ - &(cursor)->field != (list) || (cursor == NULL); \ + &(cursor)->field != (list) && ((&((cursor)->field)) != NULL); \ (cursor) = (cursor2), \ (cursor2) = CONTAINING_RECORD((cursor)->field.Flink, type, field))

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