Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 61711: [devcpux] use strsafe functions
by cwittich＠svn.reactos.org 19 Jan '14

19 Jan '14

Author: cwittich Date: Sun Jan 19 19:27:10 2014 New Revision: 61711 URL: http://svn.reactos.org/svn/reactos?rev=61711&view=rev Log: [devcpux] use strsafe functions Modified: trunk/reactos/dll/shellext/devcpux/processor.c Modified: trunk/reactos/dll/shellext/devcpux/processor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/devcpux/proce… ============================================================================== --- trunk/reactos/dll/shellext/devcpux/processor.c [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/devcpux/processor.c [iso-8859-1] Sun Jan 19 19:27:10 2014 @@ -17,6 +17,7 @@ #include <winuser.h> #include <setupapi.h> #include <powrprof.h> +#include <strsafe.h> #include "resource.h" @@ -73,12 +74,12 @@ } void -AddFeature(WCHAR* szFeatures, WCHAR* Feature, BOOL* bFirst) +AddFeature(WCHAR* szFeatures, size_t cbDest, WCHAR* Feature, BOOL* bFirst) { if (!*bFirst) - wcscat(szFeatures, L", "); + StringCbCatW(szFeatures, cbDest, L", "); *bFirst = FALSE; - wcscat(szFeatures, Feature); + StringCbCatW(szFeatures, cbDest, Feature); } INT_PTR @@ -97,28 +98,28 @@ PROCESSOR_POWER_INFORMATION PowerInfo; if (IsProcessorFeaturePresent(PF_MMX_INSTRUCTIONS_AVAILABLE)) - AddFeature(szFeatures, L"MMX", &bFirst); + AddFeature(szFeatures, sizeof(szFeatures), L"MMX", &bFirst); if (IsProcessorFeaturePresent(PF_XMMI_INSTRUCTIONS_AVAILABLE)) - AddFeature(szFeatures, L"SSE", &bFirst); + AddFeature(szFeatures, sizeof(szFeatures), L"SSE", &bFirst); if (IsProcessorFeaturePresent(PF_XMMI64_INSTRUCTIONS_AVAILABLE)) - AddFeature(szFeatures, L"SSE2", &bFirst); + AddFeature(szFeatures, sizeof(szFeatures), L"SSE2", &bFirst); /*if (IsProcessorFeaturePresent(PF_SSE3_INSTRUCTIONS_AVAILABLE)) - AddFeature(szFeatures, L"SSE3", &bFirst); */ + AddFeature(szFeatures, sizeof(szFeatures), L"SSE3", &bFirst); */ if (IsProcessorFeaturePresent(PF_3DNOW_INSTRUCTIONS_AVAILABLE)) - AddFeature(szFeatures, L"3DNOW", &bFirst); + AddFeature(szFeatures, sizeof(szFeatures), L"3DNOW", &bFirst); SetDlgItemTextW(hDlg, IDC_FEATURES, szFeatures); GetSystemInfo(&SystemInfo); - wsprintf(szModel, L"%x", HIBYTE(SystemInfo.wProcessorRevision)); - wsprintf(szStepping, L"%d", LOBYTE(SystemInfo.wProcessorRevision)); + StringCbPrintfW(szModel, sizeof(szModel), L"%x", HIBYTE(SystemInfo.wProcessorRevision)); + StringCbPrintfW(szStepping, sizeof(szStepping), L"%d", LOBYTE(SystemInfo.wProcessorRevision)); SetDlgItemTextW(hDlg, IDC_MODEL, szModel); SetDlgItemTextW(hDlg, IDC_STEPPING, szStepping); CallNtPowerInformation(11, NULL, 0, &PowerInfo, sizeof(PowerInfo)); - wsprintf(szCurrentMhz, L"%ld %s", PowerInfo.CurrentMhz, L"MHz"); + StringCbPrintfW(szCurrentMhz, sizeof(szCurrentMhz), L"%ld %s", PowerInfo.CurrentMhz, L"MHz"); SetDlgItemTextW(hDlg, IDC_CORESPEED, szCurrentMhz); return TRUE;

1 0

[cwittich] 61710: [devcpux] tabs to spaces
by cwittich＠svn.reactos.org 19 Jan '14

19 Jan '14

Author: cwittich Date: Sun Jan 19 19:18:45 2014 New Revision: 61710 URL: http://svn.reactos.org/svn/reactos?rev=61710&view=rev Log: [devcpux] tabs to spaces Modified: trunk/reactos/dll/shellext/devcpux/processor.c Modified: trunk/reactos/dll/shellext/devcpux/processor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/devcpux/proce… ============================================================================== --- trunk/reactos/dll/shellext/devcpux/processor.c [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/devcpux/processor.c [iso-8859-1] Sun Jan 19 19:18:45 2014 @@ -27,17 +27,17 @@ APIENTRY DllMain (HANDLE hInstance, DWORD dwReason, LPVOID lpReserved) { - switch (dwReason) - { - case DLL_THREAD_ATTACH: - case DLL_THREAD_DETACH: - case DLL_PROCESS_ATTACH: - case DLL_PROCESS_DETACH: - break; - } + switch (dwReason) + { + case DLL_THREAD_ATTACH: + case DLL_THREAD_DETACH: + case DLL_PROCESS_ATTACH: + case DLL_PROCESS_DETACH: + break; + } - g_hInstance = (HINSTANCE) hInstance; - return TRUE; + g_hInstance = (HINSTANCE) hInstance; + return TRUE; } @@ -45,84 +45,84 @@ APIENTRY PropSheetExtProc(PSP_PROPSHEETPAGE_REQUEST PropPageRequest, LPFNADDPROPSHEETPAGE fAddFunc, LPARAM lParam) { - PROPSHEETPAGE PropSheetPage; - HPROPSHEETPAGE hPropSheetPage; + PROPSHEETPAGE PropSheetPage; + HPROPSHEETPAGE hPropSheetPage; - if(PropPageRequest->PageRequested != SPPSR_ENUM_ADV_DEVICE_PROPERTIES) - return FALSE; + if(PropPageRequest->PageRequested != SPPSR_ENUM_ADV_DEVICE_PROPERTIES) + return FALSE; - if ((!PropPageRequest->DeviceInfoSet) || (!PropPageRequest->DeviceInfoData)) - return FALSE; + if ((!PropPageRequest->DeviceInfoSet) || (!PropPageRequest->DeviceInfoData)) + return FALSE; - ZeroMemory(&PropSheetPage, sizeof(PROPSHEETPAGE)); - PropSheetPage.dwSize = sizeof(PROPSHEETPAGE); - PropSheetPage.hInstance = g_hInstance; - PropSheetPage.pszTemplate = MAKEINTRESOURCE(DLG_PROCESSORINFO); - PropSheetPage.pfnDlgProc = ProcessorDlgProc; + ZeroMemory(&PropSheetPage, sizeof(PROPSHEETPAGE)); + PropSheetPage.dwSize = sizeof(PROPSHEETPAGE); + PropSheetPage.hInstance = g_hInstance; + PropSheetPage.pszTemplate = MAKEINTRESOURCE(DLG_PROCESSORINFO); + PropSheetPage.pfnDlgProc = ProcessorDlgProc; - hPropSheetPage = CreatePropertySheetPage(&PropSheetPage); - if(!hPropSheetPage) - return FALSE; + hPropSheetPage = CreatePropertySheetPage(&PropSheetPage); + if(!hPropSheetPage) + return FALSE; - if(!(fAddFunc)(hPropSheetPage, lParam)) { - DestroyPropertySheetPage (hPropSheetPage); - return FALSE; - } + if(!(fAddFunc)(hPropSheetPage, lParam)) { + DestroyPropertySheetPage (hPropSheetPage); + return FALSE; + } - return TRUE; + return TRUE; } void AddFeature(WCHAR* szFeatures, WCHAR* Feature, BOOL* bFirst) { - if (!*bFirst) - wcscat(szFeatures, L", "); - *bFirst = FALSE; - wcscat(szFeatures, Feature); + if (!*bFirst) + wcscat(szFeatures, L", "); + *bFirst = FALSE; + wcscat(szFeatures, Feature); } INT_PTR CALLBACK ProcessorDlgProc (HWND hDlg, UINT uMessage, WPARAM wParam, LPARAM lParam) { - switch (uMessage) { - case WM_INITDIALOG: - { - WCHAR szFeatures[MAX_PATH] = L""; - WCHAR szModel[3]; - WCHAR szStepping[3]; - WCHAR szCurrentMhz[10]; - BOOL bFirst = TRUE; - SYSTEM_INFO SystemInfo; - PROCESSOR_POWER_INFORMATION PowerInfo; + switch (uMessage) { + case WM_INITDIALOG: + { + WCHAR szFeatures[MAX_PATH] = L""; + WCHAR szModel[3]; + WCHAR szStepping[3]; + WCHAR szCurrentMhz[10]; + BOOL bFirst = TRUE; + SYSTEM_INFO SystemInfo; + PROCESSOR_POWER_INFORMATION PowerInfo; - if (IsProcessorFeaturePresent(PF_MMX_INSTRUCTIONS_AVAILABLE)) - AddFeature(szFeatures, L"MMX", &bFirst); - if (IsProcessorFeaturePresent(PF_XMMI_INSTRUCTIONS_AVAILABLE)) - AddFeature(szFeatures, L"SSE", &bFirst); - if (IsProcessorFeaturePresent(PF_XMMI64_INSTRUCTIONS_AVAILABLE)) - AddFeature(szFeatures, L"SSE2", &bFirst); - /*if (IsProcessorFeaturePresent(PF_SSE3_INSTRUCTIONS_AVAILABLE)) - AddFeature(szFeatures, L"SSE3", &bFirst); */ - if (IsProcessorFeaturePresent(PF_3DNOW_INSTRUCTIONS_AVAILABLE)) - AddFeature(szFeatures, L"3DNOW", &bFirst); + if (IsProcessorFeaturePresent(PF_MMX_INSTRUCTIONS_AVAILABLE)) + AddFeature(szFeatures, L"MMX", &bFirst); + if (IsProcessorFeaturePresent(PF_XMMI_INSTRUCTIONS_AVAILABLE)) + AddFeature(szFeatures, L"SSE", &bFirst); + if (IsProcessorFeaturePresent(PF_XMMI64_INSTRUCTIONS_AVAILABLE)) + AddFeature(szFeatures, L"SSE2", &bFirst); + /*if (IsProcessorFeaturePresent(PF_SSE3_INSTRUCTIONS_AVAILABLE)) + AddFeature(szFeatures, L"SSE3", &bFirst); */ + if (IsProcessorFeaturePresent(PF_3DNOW_INSTRUCTIONS_AVAILABLE)) + AddFeature(szFeatures, L"3DNOW", &bFirst); - SetDlgItemTextW(hDlg, IDC_FEATURES, szFeatures); + SetDlgItemTextW(hDlg, IDC_FEATURES, szFeatures); - GetSystemInfo(&SystemInfo); + GetSystemInfo(&SystemInfo); - wsprintf(szModel, L"%x", HIBYTE(SystemInfo.wProcessorRevision)); - wsprintf(szStepping, L"%d", LOBYTE(SystemInfo.wProcessorRevision)); + wsprintf(szModel, L"%x", HIBYTE(SystemInfo.wProcessorRevision)); + wsprintf(szStepping, L"%d", LOBYTE(SystemInfo.wProcessorRevision)); - SetDlgItemTextW(hDlg, IDC_MODEL, szModel); - SetDlgItemTextW(hDlg, IDC_STEPPING, szStepping); + SetDlgItemTextW(hDlg, IDC_MODEL, szModel); + SetDlgItemTextW(hDlg, IDC_STEPPING, szStepping); - CallNtPowerInformation(11, NULL, 0, &PowerInfo, sizeof(PowerInfo)); - wsprintf(szCurrentMhz, L"%ld %s", PowerInfo.CurrentMhz, L"MHz"); - SetDlgItemTextW(hDlg, IDC_CORESPEED, szCurrentMhz); + CallNtPowerInformation(11, NULL, 0, &PowerInfo, sizeof(PowerInfo)); + wsprintf(szCurrentMhz, L"%ld %s", PowerInfo.CurrentMhz, L"MHz"); + SetDlgItemTextW(hDlg, IDC_CORESPEED, szCurrentMhz); - return TRUE; - } - } - return FALSE; + return TRUE; + } + } + return FALSE; }

1 0

[cwittich] 61709: [desk.cpl] strsafe++
by cwittich＠svn.reactos.org 19 Jan '14

19 Jan '14

Author: cwittich Date: Sun Jan 19 19:15:08 2014 New Revision: 61709 URL: http://svn.reactos.org/svn/reactos?rev=61709&view=rev Log: [desk.cpl] strsafe++ Modified: trunk/reactos/dll/cpl/desk/advappdlg.c trunk/reactos/dll/cpl/desk/background.c trunk/reactos/dll/cpl/desk/classinst.c trunk/reactos/dll/cpl/desk/desk.h trunk/reactos/dll/cpl/desk/devsett.c trunk/reactos/dll/cpl/desk/screensaver.c Modified: trunk/reactos/dll/cpl/desk/advappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advappdlg.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/advappdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/advappdlg.c [iso-8859-1] Sun Jan 19 19:15:08 2014 @@ -425,7 +425,7 @@ /* Fill font size combo */ for (i = 6; i <= 24; i++) { - wsprintf(Size, TEXT("%d"), i); + StringCbPrintf(Size, sizeof(Size), TEXT("%d"), i); SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E, CB_ADDSTRING, 0, (LPARAM)&Size); } Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] Sun Jan 19 19:15:08 2014 @@ -88,6 +88,7 @@ TCHAR *token; HWND hwndBackgroundList; TCHAR *p; + HRESULT hr; hwndBackgroundList = GetDlgItem(hwndDlg, IDC_BACKGROUND_LIST); @@ -134,7 +135,12 @@ /* Allow environment variables in file name */ if (ExpandEnvironmentStrings(wallpaperFilename, buffer, MAX_PATH)) { - _tcscpy(wallpaperFilename, buffer); + hr = StringCbCopy(wallpaperFilename, sizeof(wallpaperFilename), buffer); + if (FAILED(hr)) + { + RegCloseKey(regKey); + return; + } } himl = (HIMAGELIST)SHGetFileInfo(wallpaperFilename, @@ -155,11 +161,23 @@ backgroundItem->bWallpaper = TRUE; - _tcscpy(backgroundItem->szDisplayName, sfi.szDisplayName); + hr = StringCbCopy(backgroundItem->szDisplayName, sizeof(backgroundItem->szDisplayName), sfi.szDisplayName); + if (FAILED(hr)) + { + RegCloseKey(regKey); + return; + } + p = _tcsrchr(backgroundItem->szDisplayName, _T('.')); if (p) *p = (TCHAR)0; - _tcscpy(backgroundItem->szFilename, wallpaperFilename); + + hr = StringCbCopy(backgroundItem->szFilename, sizeof(backgroundItem->szFilename), wallpaperFilename); + if (FAILED(hr)) + { + RegCloseKey(regKey); + return; + } ZeroMemory(&listItem, sizeof(LV_ITEM)); listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; @@ -190,8 +208,13 @@ while (token != NULL) { GetWindowsDirectory(szSearchPath, MAX_PATH); - _tcscat(szSearchPath, TEXT("\\")); - _tcscat(szSearchPath, token); + + hr = StringCbCat(szSearchPath, sizeof(szSearchPath), TEXT("\\")); + if (FAILED(hr)) + return; + hr = StringCbCat(szSearchPath, sizeof(szSearchPath), token); + if (FAILED(hr)) + return; hFind = FindFirstFile(szSearchPath, &fd); while (hFind != INVALID_HANDLE_VALUE) @@ -200,8 +223,18 @@ GetWindowsDirectory(filename, MAX_PATH); - _tcscat(filename, TEXT("\\")); - _tcscat(filename, fd.cFileName); + hr = StringCbCat(filename, sizeof(filename), TEXT("\\")); + if (FAILED(hr)) + { + FindClose(hFind); + return; + } + hr = StringCbCat(filename, sizeof(filename), fd.cFileName); + if (FAILED(hr)) + { + FindClose(hFind); + return; + } /* Don't add any hidden bitmaps. Also don't add current wallpaper once more. */ if (((fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) == 0) && (_tcscmp(wallpaperFilename, filename) != 0)) @@ -225,11 +258,21 @@ backgroundItem->bWallpaper = TRUE; - _tcscpy(backgroundItem->szDisplayName, sfi.szDisplayName); + hr = StringCbCopy(backgroundItem->szDisplayName, sizeof(backgroundItem->szDisplayName), sfi.szDisplayName); + if (FAILED(hr)) + { + FindClose(hFind); + return; + } p = _tcsrchr(backgroundItem->szDisplayName, _T('.')); if (p) *p = (TCHAR)0; - _tcscpy(backgroundItem->szFilename, filename); + hr = StringCbCopy(backgroundItem->szFilename, sizeof(backgroundItem->szFilename), filename); + if (FAILED(hr)) + { + FindClose(hFind); + return; + } ZeroMemory(&listItem, sizeof(LV_ITEM)); listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; @@ -249,6 +292,7 @@ } token = _tcstok(NULL, separators); + FindClose(hFind); } } @@ -428,6 +472,7 @@ LV_ITEM listItem; HWND hwndBackgroundList; TCHAR *p; + HRESULT hr; hwndBackgroundList = GetDlgItem(hwndDlg, IDC_BACKGROUND_LIST); @@ -469,11 +514,15 @@ backgroundItem->bWallpaper = TRUE; - _tcscpy(backgroundItem->szDisplayName, sfi.szDisplayName); + hr = StringCbCopy(backgroundItem->szDisplayName, sizeof(backgroundItem->szDisplayName), sfi.szDisplayName); + if (FAILED(hr)) + return; p = _tcsrchr(backgroundItem->szDisplayName, _T('.')); if (p) *p = (TCHAR)0; - _tcscpy(backgroundItem->szFilename, filename); + hr = StringCbCopy(backgroundItem->szFilename, sizeof(backgroundItem->szFilename), filename); + if (FAILED(hr)) + return; ZeroMemory(&listItem, sizeof(LV_ITEM)); listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; @@ -736,7 +785,7 @@ green = GetGValue(g_GlobalData.desktop_color); blue = GetBValue(g_GlobalData.desktop_color); /* Format string to be set to registry */ - wsprintf(clText, TEXT("%d %d %d"), red, green, blue); + StringCbPrintf(clText, sizeof(clText), TEXT("%d %d %d"), red, green, blue); RegSetValueEx(hKey, TEXT("Background"), 0, REG_SZ, (BYTE *)clText, (lstrlen(clText) + 1) * sizeof(TCHAR)); RegCloseKey(hKey); Modified: trunk/reactos/dll/cpl/desk/classinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/classinst.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/classinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/classinst.c [iso-8859-1] Sun Jan 19 19:15:08 2014 @@ -32,6 +32,7 @@ DWORD disposition; BOOL result; LONG rc; + HRESULT hr; if (InstallFunction != DIF_INSTALLDEVICE) return ERROR_DI_DO_DEFAULT; @@ -104,7 +105,12 @@ DPRINT("SetupDiGetActualSectionToInstall() failed with error 0x%lx\n", rc); goto cleanup; } - _tcscat(SectionName, _T(".SoftwareSettings")); + hr = StringCbCat(SectionName, sizeof(SectionName), _T(".SoftwareSettings")); + if (FAILED(hr)) + { + rc = ERROR_INSUFFICIENT_BUFFER; + goto cleanup; + } /* Open driver registry key and create Settings subkey */ hDriverKey = SetupDiOpenDevRegKey( Modified: trunk/reactos/dll/cpl/desk/desk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.h?rev=61… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/desk.h [iso-8859-1] Sun Jan 19 19:15:08 2014 @@ -19,6 +19,7 @@ #include <shlobj.h> #include <regstr.h> #include <dll/desk/deskcplx.h> +#include <strsafe.h> #include "appearance.h" #include "preview.h" Modified: trunk/reactos/dll/cpl/desk/devsett.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/devsett.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/devsett.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/devsett.c [iso-8859-1] Sun Jan 19 19:15:08 2014 @@ -83,7 +83,7 @@ if (str != NULL) { #ifdef UNICODE - wcscpy(str, + StringCbCopyW(str, c * sizeof(WCHAR), pszSrc); #else MultiByteToWideChar(CP_ACP, @@ -556,7 +556,7 @@ PCWSTR pszRet = NULL; PWSTR pszBuf; PCDevSettings This = impl_from_IDataObject(iface); - + ZeroMemory(pmedium, sizeof(STGMEDIUM)); @@ -662,11 +662,12 @@ pszRet = szEmpty; pszBuf = GlobalAlloc(GPTR, - (_tcslen(pszRet) + 1) * sizeof(WCHAR)); + (wcslen(pszRet) + 1) * sizeof(WCHAR)); if (pszBuf != NULL) { - _tcscpy(pszBuf, - pszRet); + hr = StringCbCopy(pszBuf, (wcslen(pszRet) + 1) * sizeof(WCHAR), pszRet); + if (FAILED(hr)) + return hr; pmedium->tymed = TYMED_HGLOBAL; pmedium->hGlobal = pszBuf; Modified: trunk/reactos/dll/cpl/desk/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/screensaver.c… ============================================================================== --- trunk/reactos/dll/cpl/desk/screensaver.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/screensaver.c [iso-8859-1] Sun Jan 19 19:15:08 2014 @@ -333,11 +333,17 @@ ScreenSaverItem *ScreenSaverItem; HANDLE hModule; UINT i, ScreenSaverCount; + HRESULT hr; ScreenSaverCount = pData->ScreenSaverCount; - _tcscpy(szSearchPath, pszSearchPath); - _tcscat(szSearchPath, TEXT("\\*.scr")); + + hr = StringCbCopy(szSearchPath, sizeof(szSearchPath), pszSearchPath); + if (FAILED(hr)) + return; + hr = StringCbCat(szSearchPath, sizeof(szSearchPath), TEXT("\\*.scr")); + if (FAILED(hr)) + return; hFind = FindFirstFile(szSearchPath, &fd); @@ -351,9 +357,24 @@ { TCHAR filename[MAX_PATH]; - _tcscpy(filename, pszSearchPath); - _tcscat(filename, _T("\\")); - _tcscat(filename, fd.cFileName); + hr = StringCbCopy(filename, sizeof(filename), pszSearchPath); + if (FAILED(hr)) + { + FindClose(hFind); + return; + } + hr = StringCbCat(filename, sizeof(filename), _T("\\")); + if (FAILED(hr)) + { + FindClose(hFind); + return; + } + hr = StringCbCat(filename, sizeof(filename), fd.cFileName); + if (FAILED(hr)) + { + FindClose(hFind); + return; + } ScreenSaverItem = pData->ScreenSaverItems + ScreenSaverCount; @@ -370,17 +391,33 @@ sizeof(ScreenSaverItem->szDisplayName) / sizeof(TCHAR))) { // If the string does not exists, copy the name of the file - _tcscpy(ScreenSaverItem->szDisplayName, fd.cFileName); + hr = StringCbCopy(ScreenSaverItem->szDisplayName, sizeof(ScreenSaverItem->szDisplayName), fd.cFileName); + if (FAILED(hr)) + { + FreeLibrary(hModule); + FindClose(hFind); + return; + } ScreenSaverItem->szDisplayName[_tcslen(fd.cFileName)-4] = '\0'; } FreeLibrary(hModule); } else { - _tcscpy(ScreenSaverItem->szDisplayName, _T("Unknown")); - } - - _tcscpy(ScreenSaverItem->szFilename, filename); + hr = StringCbCopy(ScreenSaverItem->szDisplayName, sizeof(ScreenSaverItem->szDisplayName), _T("Unknown")); + if (FAILED(hr)) + { + FindClose(hFind); + return; + } + } + + hr = StringCbCopy(ScreenSaverItem->szFilename, sizeof(ScreenSaverItem->szFilename), filename); + if (FAILED(hr)) + { + FindClose(hFind); + return; + } i = SendMessage(hwndScreenSavers, CB_ADDSTRING,

1 0

[tfaber] 61708: [DDK][NDK] - Fix some members of SHARED_CACHE_MAP - Move MBCB to NDK where it belongs
by tfaber＠svn.reactos.org 19 Jan '14

19 Jan '14

Author: tfaber Date: Sun Jan 19 15:05:23 2014 New Revision: 61708 URL: http://svn.reactos.org/svn/reactos?rev=61708&view=rev Log: [DDK][NDK] - Fix some members of SHARED_CACHE_MAP - Move MBCB to NDK where it belongs Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ndk/cctypes.h trunk/reactos/include/xdk/ntifs.template.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=61… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Sun Jan 19 15:05:23 2014 @@ -11416,19 +11416,6 @@ MAPPING_PAIR Pair[1]; } GET_RETRIEVAL_DESCRIPTOR, *PGET_RETRIEVAL_DESCRIPTOR; -typedef struct _MBCB { - CSHORT NodeTypeCode; - CSHORT NodeIsInZone; - ULONG PagesToWrite; - ULONG DirtyPages; - ULONG Reserved; - LIST_ENTRY BitmapRanges; - LONGLONG ResumeWritePage; - BITMAP_RANGE BitmapRange1; - BITMAP_RANGE BitmapRange2; - BITMAP_RANGE BitmapRange3; -} MBCB, *PMBCB; - typedef struct _MOVEFILE_DESCRIPTOR { HANDLE FileHandle; ULONG Reserved; Modified: trunk/reactos/include/ndk/cctypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cctypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/cctypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/cctypes.h [iso-8859-1] Sun Jan 19 15:05:23 2014 @@ -81,6 +81,19 @@ LIST_ENTRY PrivateLinks; } PRIVATE_CACHE_MAP, *PPRIVATE_CACHE_MAP; +typedef struct _MBCB { + CSHORT NodeTypeCode; + CSHORT NodeIsInZone; + ULONG PagesToWrite; + ULONG DirtyPages; + ULONG Reserved; + LIST_ENTRY BitmapRanges; + LONGLONG ResumeWritePage; + BITMAP_RANGE BitmapRange1; + BITMAP_RANGE BitmapRange2; + BITMAP_RANGE BitmapRange3; +} MBCB, *PMBCB; + #ifdef _NTIFS_INCLUDED_ // @@ -103,12 +116,12 @@ PVOID NeedToZero; ULONG ActivePage; ULONG NeedToZeroPage; - ULONG ActiveVacbSpinLock; + KSPIN_LOCK ActiveVacbSpinLock; ULONG VacbActiveCount; ULONG DirtyPages; LIST_ENTRY SharedCacheMapLinks; ULONG Flags; - ULONG Status; + LONG Status; PMBCB Mbcb; PVOID Section; PKEVENT CreateEvent; @@ -119,12 +132,12 @@ PVOID LazyWriteContext; LIST_ENTRY PrivateList; PVOID LogHandle; - PVOID FlushToLsnRoutine; + PFLUSH_TO_LSN FlushToLsnRoutine; ULONG DirtyPageThreshold; ULONG LazyWritePassCount; PCACHE_UNINITIALIZE_EVENT UninitializeEvent; PVACB NeedToZeroVacb; - ULONG BcbSpinLock; + KSPIN_LOCK BcbSpinLock; PVOID Reserved; KEVENT Event; EX_PUSH_LOCK VacbPushLock; Modified: trunk/reactos/include/xdk/ntifs.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ntifs.template… ============================================================================== --- trunk/reactos/include/xdk/ntifs.template.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/ntifs.template.h [iso-8859-1] Sun Jan 19 15:05:23 2014 @@ -1534,19 +1534,6 @@ ULONGLONG StartVcn; MAPPING_PAIR Pair[1]; } GET_RETRIEVAL_DESCRIPTOR, *PGET_RETRIEVAL_DESCRIPTOR; - -typedef struct _MBCB { - CSHORT NodeTypeCode; - CSHORT NodeIsInZone; - ULONG PagesToWrite; - ULONG DirtyPages; - ULONG Reserved; - LIST_ENTRY BitmapRanges; - LONGLONG ResumeWritePage; - BITMAP_RANGE BitmapRange1; - BITMAP_RANGE BitmapRange2; - BITMAP_RANGE BitmapRange3; -} MBCB, *PMBCB; typedef struct _MOVEFILE_DESCRIPTOR { HANDLE FileHandle;

1 0

[tfaber] 61707: [DDK][NDK][RTL][WS2_32_NEW] - Add missing and improve existing declarations of RtlIpv4StringToAddress*
by tfaber＠svn.reactos.org 19 Jan '14

19 Jan '14

Author: tfaber Date: Sun Jan 19 14:56:13 2014 New Revision: 61707 URL: http://svn.reactos.org/svn/reactos?rev=61707&view=rev Log: [DDK][NDK][RTL][WS2_32_NEW] - Add missing and improve existing declarations of RtlIpv4StringToAddress* Modified: trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/psdk/mstcpip.h trunk/reactos/lib/rtl/network.c Modified: trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/a… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] Sun Jan 19 14:56:13 2014 @@ -87,15 +87,18 @@ ParseV4Address(IN PCWSTR AddressString, OUT PDWORD pAddress) { - DWORD Address; - LPWSTR Ip = 0; - - /* Do the conversion, don't accept wildcard */ - RtlIpv4StringToAddressW((LPWSTR)AddressString, 0, &Ip, (IN_ADDR *)&Address); - - /* Return the address and success */ - *pAddress = Address; - return FALSE; + IN_ADDR Address; + PCWSTR Terminator; + NTSTATUS Status; + + *pAddress = 0; + Status = RtlIpv4StringToAddressW(AddressString, FALSE, &Terminator, &Address); + + if (!NT_SUCCESS(Status)) + return FALSE; + + *pAddress = Address.S_un.S_addr; + return TRUE; } static Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sun Jan 19 14:56:13 2014 @@ -3994,11 +3994,41 @@ NTSYSAPI NTSTATUS NTAPI +RtlIpv4StringToAddressA( + _In_ PCSTR String, + _In_ BOOLEAN Strict, + _Out_ PCSTR *Terminator, + _Out_ struct in_addr *Addr +); + +NTSYSAPI +NTSTATUS +NTAPI RtlIpv4StringToAddressW( _In_ PCWSTR String, _In_ BOOLEAN Strict, - _Out_ LPWSTR *Terminator, + _Out_ PCWSTR *Terminator, _Out_ struct in_addr *Addr +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlIpv4StringToAddressExA( + _In_ PCSTR AddressString, + _In_ BOOLEAN Strict, + _Out_ struct in_addr *Address, + _Out_ PUSHORT Port +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlIpv4StringToAddressExW( + _In_ PCWSTR AddressString, + _In_ BOOLEAN Strict, + _Out_ struct in_addr *Address, + _Out_ PUSHORT Port ); NTSYSAPI Modified: trunk/reactos/include/psdk/mstcpip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mstcpip.h?rev… ============================================================================== --- trunk/reactos/include/psdk/mstcpip.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mstcpip.h [iso-8859-1] Sun Jan 19 14:56:13 2014 @@ -1340,7 +1340,7 @@ LONG NTAPI RtlIpv4StringToAddressA( - _In_ PCSTR S, + _In_ PCSTR String, _In_ BOOLEAN Strict, _Out_ PCSTR *Terminator, _Out_ struct in_addr *Addr); @@ -1358,9 +1358,9 @@ LONG NTAPI RtlIpv4StringToAddressW( - _In_ PCWSTR S, + _In_ PCWSTR String, _In_ BOOLEAN Strict, - _Out_ LPCWSTR *Terminator, + _Out_ PCWSTR *Terminator, _Out_ struct in_addr *Addr); NTSYSAPI Modified: trunk/reactos/lib/rtl/network.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/network.c?rev=6170… ============================================================================== --- trunk/reactos/lib/rtl/network.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/network.c [iso-8859-1] Sun Jan 19 14:56:13 2014 @@ -32,7 +32,7 @@ OUT PCHAR S) { INT Length; - + if (!S) return (LPSTR)~0; Length = sprintf(S, "%u.%u.%u.%u", Addr->S_un.S_un_b.s_b1, @@ -88,7 +88,7 @@ INT Length; if (!S) return (LPWSTR)~0; - + Length = swprintf(S, L"%u.%u.%u.%u", Addr->S_un.S_un_b.s_b1, Addr->S_un.S_un_b.s_b2, Addr->S_un.S_un_b.s_b3, @@ -135,9 +135,9 @@ */ NTSTATUS NTAPI -RtlIpv4StringToAddressA(IN PCHAR String, +RtlIpv4StringToAddressA(IN PCSTR String, IN BOOLEAN Strict, - OUT PCHAR *Terminator, + OUT PCSTR *Terminator, OUT struct in_addr *Addr) { UNIMPLEMENTED; @@ -149,10 +149,10 @@ */ NTSTATUS NTAPI -RtlIpv4StringToAddressExA(IN PCHAR AddressString, +RtlIpv4StringToAddressExA(IN PCSTR AddressString, IN BOOLEAN Strict, OUT struct in_addr *Address, - IN PUSHORT Port) + OUT PUSHORT Port) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -165,7 +165,7 @@ NTAPI RtlIpv4StringToAddressW(IN PCWSTR String, IN BOOLEAN Strict, - OUT LPWSTR *Terminator, + OUT PCWSTR *Terminator, OUT struct in_addr *Addr) { UNIMPLEMENTED; @@ -177,7 +177,7 @@ */ NTSTATUS NTAPI -RtlIpv4StringToAddressExW(IN PWCHAR AddressString, +RtlIpv4StringToAddressExW(IN PCWSTR AddressString, IN BOOLEAN Strict, OUT struct in_addr *Address, OUT PUSHORT Port)

1 0

[dreimer] 61706: [RAPPS] Add Mpxplay to Application manager by Alex (jedi-to-be) CORE-7290 #resolve #comment Committed and slightly fixed DL link and comment. Thx for help!
by dreimer＠svn.reactos.org 19 Jan '14

19 Jan '14

Author: dreimer Date: Sun Jan 19 13:17:09 2014 New Revision: 61706 URL: http://svn.reactos.org/svn/reactos?rev=61706&view=rev Log: [RAPPS] Add Mpxplay to Application manager by Alex (jedi-to-be) CORE-7290 #resolve #comment Committed and slightly fixed DL link and comment. Thx for help! Added: trunk/reactos/base/applications/rapps/rapps/mpxplay.txt (with props) Added: trunk/reactos/base/applications/rapps/rapps/mpxplay.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mpxplay.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/mpxplay.txt [iso-8859-1] Sun Jan 19 13:17:09 2014 @@ -0,0 +1,18 @@ +ï»¿; UTF-8 + +[Section] +Name = Mpxplay +Version = 1.60b +Licence = GPL +Description = Mpxplay is a 32-bit console audio player for Windows. You need 7-Zip or a similar Utility to extract it. +Size = 520 kB +Category = 1 +URLSite = http://mpxplay.sourceforge.net/ +URLDownload = http://garr.dl.sourceforge.net/project/mpxplay/Mpxplay/Mpxplay%20v1.60%20fi… +CDPath = none + +[Section.0407] +Description = Mpxplay ist ein konsolenbasierter 32-bit Audio Player fÃ¼r Windows. Zum extrahieren wird 7-Zip oder ein Ã¤hnliches Tool benÃ¶tigt. + +[Section.0419] +Description = Mpxplay - 32-ÑÐ°Ð·ÑÑÐ´Ð½ÑÐ¹ ÐºÐ¾Ð½ÑÐ¾Ð»ÑÐ½ÑÐ¹ Ð°ÑÐ´Ð¸Ð¾Ð¿Ð»ÐµÐµÑ Ð´Ð»Ñ Windows. ÐÐ°Ð¼ Ð½ÑÐ¶ÐµÐ½ 7-Zip Ð¸Ð»Ð¸ Ð¿Ð¾Ð´Ð¾Ð±Ð½Ð°Ñ ÑÑÐ¸Ð»Ð¸ÑÐ° Ð´Ð»Ñ ÐµÐ³Ð¾ ÑÐ°ÑÐ¿Ð°ÐºÐ¾Ð²ÐºÐ¸. Propchange: trunk/reactos/base/applications/rapps/rapps/mpxplay.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 61705: [D3DCOMPILER_43] * Cleanup the main header. CORE-7716
by akhaldi＠svn.reactos.org 19 Jan '14

19 Jan '14

Author: akhaldi Date: Sun Jan 19 10:47:56 2014 New Revision: 61705 URL: http://svn.reactos.org/svn/reactos?rev=61705&view=rev Log: [D3DCOMPILER_43] * Cleanup the main header. CORE-7716 Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h [iso-8859-1] Sun Jan 19 10:47:56 2014 @@ -25,20 +25,18 @@ #include <config.h> #include <wine/port.h> +#include <assert.h> #include <stdio.h> - -#include <wine/debug.h> -#include <wine/list.h> -#include <wine/rbtree.h> #define COBJMACROS #include <windef.h> #include <winbase.h> #include <objbase.h> - #include <d3dcompiler.h> -#include <assert.h> +#include <wine/debug.h> +#include <wine/list.h> +#include <wine/rbtree.h> /* * This doesn't belong here, but for some functions it is possible to return that value,

1 0

[akhaldi] 61704: [D3D9] * Improve the GUIDs situation. CORE-7716
by akhaldi＠svn.reactos.org 19 Jan '14

19 Jan '14

Author: akhaldi Date: Sun Jan 19 10:46:55 2014 New Revision: 61704 URL: http://svn.reactos.org/svn/reactos?rev=61704&view=rev Log: [D3D9] * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/dll/directx/wine/d3d9/guid.c (with props) Modified: trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/CMak… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] Sun Jan 19 10:46:55 2014 @@ -20,6 +20,7 @@ texture.c vertexdeclaration.c volume.c + guid.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/d3d9_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/d3d9.def) Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h [iso-8859-1] Sun Jan 19 10:46:55 2014 @@ -25,16 +25,17 @@ #include <config.h> +#include <assert.h> +#include <stdarg.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <assert.h> -#include <stdarg.h> - #define NONAMELESSUNION #define NONAMELESSSTRUCT #define COBJMACROS + #include <windef.h> #include <winbase.h> #include <wingdi.h> @@ -42,7 +43,6 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(d3d9); -#include <initguid.h> #include <d3d9.h> #include <wine/wined3d.h> Added: trunk/reactos/dll/directx/wine/d3d9/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/guid… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/guid.c (added) +++ trunk/reactos/dll/directx/wine/d3d9/guid.c [iso-8859-1] Sun Jan 19 10:46:55 2014 @@ -0,0 +1,15 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <initguid.h> +#include <d3d9.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/directx/wine/d3d9/guid.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 61703: [D3D8] * Improve the GUIDs situation. CORE-7716
by akhaldi＠svn.reactos.org 19 Jan '14

19 Jan '14

Author: akhaldi Date: Sun Jan 19 10:45:19 2014 New Revision: 61703 URL: http://svn.reactos.org/svn/reactos?rev=61703&view=rev Log: [D3D8] * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/dll/directx/wine/d3d8/guid.c (with props) Modified: trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h Modified: trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/CMak… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] Sun Jan 19 10:45:19 2014 @@ -18,12 +18,13 @@ texture.c vertexdeclaration.c volume.c + guid.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/d3d8.def) add_library(d3d8 SHARED ${SOURCE}) set_module_type(d3d8 win32dll UNICODE) -target_link_libraries(d3d8 wine) +target_link_libraries(d3d8 uuid wine) add_importlibs(d3d8 wined3d msvcrt kernel32 ntdll) add_pch(d3d8 d3d8_private.h) add_cd_file(TARGET d3d8 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h [iso-8859-1] Sun Jan 19 10:45:19 2014 @@ -25,16 +25,17 @@ #include <config.h> +#include <assert.h> +#include <stdarg.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <assert.h> -#include <stdarg.h> - #define NONAMELESSUNION #define NONAMELESSSTRUCT #define COBJMACROS + #include <windef.h> #include <winbase.h> #include <wingdi.h> @@ -42,7 +43,6 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(d3d8); -#include <initguid.h> #include <d3d8.h> #include <wine/wined3d.h> Added: trunk/reactos/dll/directx/wine/d3d8/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/guid… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/guid.c (added) +++ trunk/reactos/dll/directx/wine/d3d8/guid.c [iso-8859-1] Sun Jan 19 10:45:19 2014 @@ -0,0 +1,15 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <initguid.h> +#include <d3d8.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/directx/wine/d3d8/guid.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 61702: [AMSTREAM] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist i...
by akhaldi＠svn.reactos.org 19 Jan '14

19 Jan '14

Author: akhaldi Date: Sun Jan 19 10:43:28 2014 New Revision: 61702 URL: http://svn.reactos.org/svn/reactos?rev=61702&view=rev Log: [AMSTREAM] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/dll/directx/wine/amstream/amstream.c trunk/reactos/dll/directx/wine/amstream/amstream_private.h trunk/reactos/dll/directx/wine/amstream/audiodata.c trunk/reactos/dll/directx/wine/amstream/main.c trunk/reactos/dll/directx/wine/amstream/mediastream.c trunk/reactos/dll/directx/wine/amstream/mediastreamfilter.c Modified: trunk/reactos/dll/directx/wine/amstream/amstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/amstream/… ============================================================================== --- trunk/reactos/dll/directx/wine/amstream/amstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/amstream/amstream.c [iso-8859-1] Sun Jan 19 10:43:28 2014 @@ -19,17 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <wine/debug.h> - -#define COBJMACROS - -//#include "winbase.h" -//#include "wingdi.h" - #include "amstream_private.h" -#include <amstream.h> - -WINE_DEFAULT_DEBUG_CHANNEL(amstream); typedef struct { IAMMultiMediaStream IAMMultiMediaStream_iface; Modified: trunk/reactos/dll/directx/wine/amstream/amstream_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/amstream/… ============================================================================== --- trunk/reactos/dll/directx/wine/amstream/amstream_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/amstream/amstream_private.h [iso-8859-1] Sun Jan 19 10:43:28 2014 @@ -23,17 +23,13 @@ #define WIN32_NO_STATUS #define WIN32_LEAN_AND_MEAN +#define COBJMACROS -//#include <stdarg.h> +#include <dshow.h> +#include <amstream.h> -//#include "windef.h" -//#include "winbase.h" -//#include "wtypes.h" -//#include "wingdi.h" -//#include "winuser.h" -#include <dshow.h> -#include <mmstream.h> -#include <austream.h> +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(amstream); HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/directx/wine/amstream/audiodata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/amstream/… ============================================================================== --- trunk/reactos/dll/directx/wine/amstream/audiodata.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/amstream/audiodata.c [iso-8859-1] Sun Jan 19 10:43:28 2014 @@ -18,16 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" - -#define COBJMACROS - -#include "winbase.h" #include "amstream_private.h" - -#include "amstream.h" - -WINE_DEFAULT_DEBUG_CHANNEL(amstream); typedef struct { IAudioData IAudioData_iface; Modified: trunk/reactos/dll/directx/wine/amstream/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/amstream/… ============================================================================== --- trunk/reactos/dll/directx/wine/amstream/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/amstream/main.c [iso-8859-1] Sun Jan 19 10:43:28 2014 @@ -18,29 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define WIN32_LEAN_AND_MEAN - -//#include <stdarg.h> -//#include <string.h> - -#define COBJMACROS - -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "winerror.h" - -//#include <ole2.h> -#include <objbase.h> +#include "amstream_private.h" + #include <rpcproxy.h> - -#include "amstream_private.h" -#include <amstream.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(amstream); static HINSTANCE instance; static DWORD dll_ref = 0; Modified: trunk/reactos/dll/directx/wine/amstream/mediastream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/amstream/… ============================================================================== --- trunk/reactos/dll/directx/wine/amstream/mediastream.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/amstream/mediastream.c [iso-8859-1] Sun Jan 19 10:43:28 2014 @@ -18,19 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <wine/debug.h> - -#define COBJMACROS - -//#include "winbase.h" -//#include "wingdi.h" - -//#include "amstream_private.h" -#include <amstream.h> - -//#include "ddstream.h" - -WINE_DEFAULT_DEBUG_CHANNEL(amstream); +#include "amstream_private.h" static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawStreamSample **ddraw_stream_sample); static HRESULT audiostreamsample_create(IAudioMediaStream *parent, IAudioData *audio_data, IAudioStreamSample **audio_stream_sample); Modified: trunk/reactos/dll/directx/wine/amstream/mediastreamfilter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/amstream/… ============================================================================== --- trunk/reactos/dll/directx/wine/amstream/mediastreamfilter.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/amstream/mediastreamfilter.c [iso-8859-1] Sun Jan 19 10:43:28 2014 @@ -18,22 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <wine/debug.h> - -#define COBJMACROS - -//#include "winbase.h" -//#include "wingdi.h" -#include <dshow.h> +#include "amstream_private.h" #include <wine/strmbase.h> - -//#include "amstream_private.h" -#include <amstream.h> - -//#include "ddstream.h" - -WINE_DEFAULT_DEBUG_CHANNEL(amstream); typedef struct MediaStreamFilter_InputPin {

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