Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 30387: save the settings to file when the connect button is hit
by gedmurphy＠svn.reactos.org 12 Nov '07

12 Nov '07

Author: gedmurphy Date: Mon Nov 12 15:43:58 2007 New Revision: 30387 URL: http://svn.reactos.org/svn/reactos?rev=30387&view=rev Log: save the settings to file when the connect button is hit Modified: trunk/reactos/base/applications/mstsc/connectdialog.c Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c Mon Nov 12 15:43:58 2007 @@ -957,6 +957,7 @@ if (LOWORD(wParam) == IDOK ) { SaveAllSettings(pInfo); + SaveRdpSettingsToFile(NULL, pInfo->pRdpSettings); } if (pInfo)

1 0

[gedmurphy] 30386: - refactor .rdp reading - fix the way the settings are saved - fix a few other small bugs which I've forgotten about now
by gedmurphy＠svn.reactos.org 12 Nov '07

12 Nov '07

Author: gedmurphy Date: Mon Nov 12 15:32:32 2007 New Revision: 30386 URL: http://svn.reactos.org/svn/reactos?rev=30386&view=rev Log: - refactor .rdp reading - fix the way the settings are saved - fix a few other small bugs which I've forgotten about now Modified: trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/mstsc/precomp.h trunk/reactos/base/applications/mstsc/settings.c trunk/reactos/base/applications/mstsc/win32.c Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c Mon Nov 12 15:32:32 2007 @@ -516,7 +516,7 @@ WCHAR Pixel[64]; DWORD index, i, num; DWORD MaxBpp = 0; - DWORD width, height; + INT width, height, pos = 0; UINT types[4]; pInfo->CurrentDisplayDevice = pInfo->DisplayDeviceList; /* Update global variable */ @@ -599,48 +599,27 @@ width = GetIntegerFromSettings(pInfo->pRdpSettings, L"desktopwidth"); height = GetIntegerFromSettings(pInfo->pRdpSettings, L"desktopheight"); - if (width && height) + if (width != -1 && height != -1) { for (index = 0; index < pInfo->CurrentDisplayDevice->ResolutionsCount; index++) { if (pInfo->CurrentDisplayDevice->Resolutions[index].dmPelsWidth == width && pInfo->CurrentDisplayDevice->Resolutions[index].dmPelsHeight == height) { - SendDlgItemMessageW(pInfo->hDisplayPage, - IDC_GEOSLIDER, - TBM_SETPOS, - TRUE, - index); + pos = index; break; } } - - if (LoadStringW(hInst, - IDS_PIXEL, - Pixel, - sizeof(Pixel) / sizeof(WCHAR))) - { -#ifdef _MSC_VER - _swprintf(Buffer, - Pixel, - width, - height, - Pixel); -#else - swprintf(Buffer, - Pixel, - width, - height, - Pixel); -#endif - - SendDlgItemMessageW(pInfo->hDisplayPage, - IDC_SETTINGS_RESOLUTION_TEXT, - WM_SETTEXT, - 0, - (LPARAM)Buffer); - } - } + } + + /* set slider position */ + SendDlgItemMessageW(pInfo->hDisplayPage, + IDC_GEOSLIDER, + TBM_SETPOS, + TRUE, + pos); + + OnResolutionChanged(pInfo, pos); } Modified: trunk/reactos/base/applications/mstsc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/pr… ============================================================================== --- trunk/reactos/base/applications/mstsc/precomp.h (original) +++ trunk/reactos/base/applications/mstsc/precomp.h Mon Nov 12 15:32:32 2007 @@ -16,7 +16,7 @@ #define MAXKEY 256 #define MAXVALUE 256 - +#define NUM_SETTINGS 4 extern LPWSTR lpSettings[]; typedef struct _SETTINGS @@ -90,8 +90,9 @@ BITMAP bitmap; } INFO, *PINFO; +BOOL InitRdpSettings(PRDPSETTINGS pRdpSettings); BOOL OpenRDPConnectDialog(HINSTANCE hInstance, PRDPSETTINGS pRdpSettings); -PRDPSETTINGS LoadRdpSettingsFromFile(LPWSTR lpFile); +BOOL LoadRdpSettingsFromFile(PRDPSETTINGS pRdpSettings, LPWSTR lpFile); BOOL SaveRdpSettingsToFile(LPWSTR lpFile, PRDPSETTINGS pRdpSettings); INT GetIntegerFromSettings(PRDPSETTINGS pSettings, LPWSTR lpValue); LPWSTR GetStringFromSettings(PRDPSETTINGS pSettings, LPWSTR lpValue); Modified: trunk/reactos/base/applications/mstsc/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/se… ============================================================================== --- trunk/reactos/base/applications/mstsc/settings.c (original) +++ trunk/reactos/base/applications/mstsc/settings.c Mon Nov 12 15:32:32 2007 @@ -1,15 +1,13 @@ #include <precomp.h> -#define NUM_SETTINGS 6 +/* update NUM_SETTINGS in precomp.h */ LPWSTR lpSettings[NUM_SETTINGS] = { - L"screen mode id", L"desktopwidth", L"desktopheight", L"session bpp", L"full address", - L"compression", }; VOID @@ -84,12 +82,12 @@ { if (wcscmp(pRdpSettings->pSettings[i].Key, lpKey) == 0) { - if (pRdpSettings->pSettings[i].Type == L'i') - { - pRdpSettings->pSettings[i].Value.i = Value; - bRet = TRUE; - break; - } + if (pRdpSettings->pSettings[i].Type == 0) + pRdpSettings->pSettings[i].Type = L'i'; + + pRdpSettings->pSettings[i].Value.i = Value; + bRet = TRUE; + break; } } } @@ -113,12 +111,12 @@ { if (wcscmp(pRdpSettings->pSettings[i].Key, lpKey) == 0) { - if (pRdpSettings->pSettings[i].Type == L's') - { - wcscpy(pRdpSettings->pSettings[i].Value.s, lpValue); - bRet = TRUE; - break; - } + if (pRdpSettings->pSettings[i].Type == 0) + pRdpSettings->pSettings[i].Type = L's'; + + wcscpy(pRdpSettings->pSettings[i].Value.s, lpValue); + bRet = TRUE; + break; } } } @@ -232,89 +230,50 @@ LPWSTR lpBuffer) { LPWSTR lpStr = lpBuffer; - WCHAR lpKey[MAXKEY]; - WCHAR lpValue[MAXVALUE]; - INT NumSettings = 0; - INT s; - - if (lpStr) - { - /* get number of settings */ - while (*lpStr) - { - if (*lpStr == L'\n') - NumSettings++; - lpStr++; - } - lpStr = lpBuffer; - - if (NumSettings == 0) - return; - - /* move past unicode byte order */ - if (lpStr[0] == 0xFEFF || lpStr[0] == 0xFFFE) - lpStr += 1; - - pRdpSettings->pSettings = HeapAlloc(GetProcessHeap(), - 0, - sizeof(SETTINGS) * NumSettings); - if (pRdpSettings->pSettings) - { - pRdpSettings->NumSettings = NumSettings; - - for (s = 0; s < NumSettings; s++) - { - INT i = 0, k; - - /* get a key */ - while (*lpStr != L':') - { - lpKey[i++] = *lpStr++; - } - lpKey[i] = 0; - - for (k = 0; k < NUM_SETTINGS; k++) - { - if (wcscmp(lpSettings[k], lpKey) == 0) - { - wcscpy(pRdpSettings->pSettings[s].Key, lpKey); - - /* get the type */ - lpStr++; - if (*lpStr == L'i' || *lpStr == L's') - pRdpSettings->pSettings[s].Type = *lpStr; - - lpStr += 2; - - /* get a value */ - i = 0; - while (*lpStr != L'\r') - { - lpValue[i++] = *lpStr++; - } - lpValue[i] = 0; - - if (pRdpSettings->pSettings[s].Type == L'i') - { - pRdpSettings->pSettings[s].Value.i = _wtoi(lpValue); - } - else if (pRdpSettings->pSettings[s].Type == L's') - { - wcscpy(pRdpSettings->pSettings[s].Value.s, lpValue); - } - else - pRdpSettings->pSettings[s].Type = 0; - } - } - - /* move onto next setting */ - while (*lpStr != L'\n') - { - lpStr++; - } - lpStr++; - } - } + WCHAR szSeps[] = L":\r\n"; + LPWSTR lpToken; + BOOL bFound; + INT i; + + /* move past unicode byte order */ + if (lpStr[0] == 0xFEFF || lpStr[0] == 0xFFFE) + lpStr += 1; + + lpToken = wcstok(lpStr, szSeps); + while (lpToken) + { + bFound = FALSE; + + for (i = 0; i < pRdpSettings->NumSettings && !bFound; i++) + { + if (wcscmp(lpToken, pRdpSettings->pSettings[i].Key) == 0) + { + lpToken = wcstok(NULL, szSeps); + if (lpToken[0] == L'i') + { + pRdpSettings->pSettings[i].Type = lpToken[0]; + lpToken = wcstok(NULL, szSeps); + pRdpSettings->pSettings[i].Value.i = _wtoi(lpToken); + } + else if (lpToken[0] == L's') + { + pRdpSettings->pSettings[i].Type = lpToken[0]; + lpToken = wcstok(NULL, szSeps); + wcscpy(pRdpSettings->pSettings[i].Value.s, lpToken); + } + bFound = TRUE; + } + } + + /* move past the type and value */ + if (!bFound) + { + lpToken = wcstok(NULL, szSeps); + lpToken = wcstok(NULL, szSeps); + } + + /* move to next key */ + lpToken = wcstok(NULL, szSeps); } } @@ -372,7 +331,7 @@ bWrite ? GENERIC_WRITE : GENERIC_READ, 0, NULL, - bWrite ? OPEN_EXISTING: CREATE_ALWAYS, + bWrite ? CREATE_ALWAYS : OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_ATTRIBUTE_HIDDEN, NULL); } @@ -442,17 +401,18 @@ } -PRDPSETTINGS -LoadRdpSettingsFromFile(LPWSTR lpFile) -{ - PRDPSETTINGS pRdpSettings = NULL; +BOOL +LoadRdpSettingsFromFile(PRDPSETTINGS pRdpSettings, + LPWSTR lpFile) +{ WCHAR pszPath[MAX_PATH]; HANDLE hFile; + BOOL bRet = FALSE; /* use default file */ if (lpFile == NULL) { -#ifndef __REACTOS__ +#ifndef __REACTOS__ // remove when this is working HRESULT hr; LPITEMIDLIST lpidl= NULL; @@ -480,28 +440,52 @@ { LPWSTR lpBuffer = NULL; - pRdpSettings = HeapAlloc(GetProcessHeap(), - 0, - sizeof(RDPSETTINGS)); - if (pRdpSettings) - { - hFile = OpenRdpFile(lpFile, FALSE); - if (hFile) - { - lpBuffer = ReadRdpFile(hFile); - if (lpBuffer) - { - ParseSettings(pRdpSettings, lpBuffer); - - HeapFree(GetProcessHeap(), - 0, - lpBuffer); - } - - CloseRdpFile(hFile); - } - } - } - - return pRdpSettings; -} + hFile = OpenRdpFile(lpFile, FALSE); + if (hFile) + { + lpBuffer = ReadRdpFile(hFile); + if (lpBuffer) + { + ParseSettings(pRdpSettings, lpBuffer); + + HeapFree(GetProcessHeap(), + 0, + lpBuffer); + + bRet = TRUE; + } + + CloseRdpFile(hFile); + } + } + + return bRet; +} + + +BOOL +InitRdpSettings(PRDPSETTINGS pRdpSettings) +{ + BOOL bRet = FALSE; + + pRdpSettings->pSettings = HeapAlloc(GetProcessHeap(), + 0, + sizeof(SETTINGS) * NUM_SETTINGS); + if (pRdpSettings->pSettings) + { + INT i; + + for (i = 0; i < NUM_SETTINGS; i++) + { + wcscpy(pRdpSettings->pSettings[i].Key, lpSettings[i]); + pRdpSettings->pSettings[i].Type = (WCHAR)0; + pRdpSettings->pSettings[i].Value.i = 0; + } + + pRdpSettings->NumSettings = NUM_SETTINGS; + + bRet = TRUE; + } + + return bRet; +} Modified: trunk/reactos/base/applications/mstsc/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/wi… ============================================================================== --- trunk/reactos/base/applications/mstsc/win32.c (original) +++ trunk/reactos/base/applications/mstsc/win32.c Mon Nov 12 15:32:32 2007 @@ -1301,38 +1301,47 @@ if (WSAStartup(MAKEWORD(2, 0), &d) == 0) { - pRdpSettings = LoadRdpSettingsFromFile(NULL); - + pRdpSettings = HeapAlloc(GetProcessHeap(), + 0, + sizeof(RDPSETTINGS)); if (pRdpSettings) { - //mi_process_cl(lpCmdLine) - if (OpenRDPConnectDialog(hInstance, - pRdpSettings)) + pRdpSettings->pSettings = NULL; + pRdpSettings->NumSettings = 0; + + if (InitRdpSettings(pRdpSettings)) { - char szValue[MAXVALUE]; - - uni_to_str(szValue, GetStringFromSettings(pRdpSettings, L"full address")); - - strcpy(g_servername, szValue); - //g_port = 3389; - strcpy(g_username, ""); - strcpy(g_password, ""); - g_server_depth = GetIntegerFromSettings(pRdpSettings, L"session bpp"); - if (g_server_depth > 16) g_server_depth = 16; /* hack, we don't support 24bpp yet */ - g_width = GetIntegerFromSettings(pRdpSettings, L"desktopwidth"); - g_height = GetIntegerFromSettings(pRdpSettings, L"desktopheight"); - g_screen_width = GetSystemMetrics(SM_CXSCREEN); - g_screen_height = GetSystemMetrics(SM_CYSCREEN); - g_xoff = GetSystemMetrics(SM_CXEDGE) * 2; - g_yoff = GetSystemMetrics(SM_CYCAPTION) + GetSystemMetrics(SM_CYEDGE) * 2; - - ui_main(); - ret = 0; + LoadRdpSettingsFromFile(pRdpSettings, NULL); + + //mi_process_cl(lpCmdLine) + if (OpenRDPConnectDialog(hInstance, + pRdpSettings)) + { + char szValue[MAXVALUE]; + + uni_to_str(szValue, GetStringFromSettings(pRdpSettings, L"full address")); + + strcpy(g_servername, szValue); + //g_port = 3389; + strcpy(g_username, ""); + strcpy(g_password, ""); + g_server_depth = GetIntegerFromSettings(pRdpSettings, L"session bpp"); + if (g_server_depth > 16) g_server_depth = 16; /* hack, we don't support 24bpp yet */ + g_width = GetIntegerFromSettings(pRdpSettings, L"desktopwidth"); + g_height = GetIntegerFromSettings(pRdpSettings, L"desktopheight"); + g_screen_width = GetSystemMetrics(SM_CXSCREEN); + g_screen_height = GetSystemMetrics(SM_CYSCREEN); + g_xoff = GetSystemMetrics(SM_CXEDGE) * 2; + g_yoff = GetSystemMetrics(SM_CYCAPTION) + GetSystemMetrics(SM_CYEDGE) * 2; + + ui_main(); + ret = 0; + } + + HeapFree(GetProcessHeap(), + 0, + pRdpSettings->pSettings); } - - HeapFree(GetProcessHeap(), - 0, - pRdpSettings->pSettings); HeapFree(GetProcessHeap(), 0,

1 0

[hpoussin] 30385: Add explorer-new to the build (doesn't work yet)
by hpoussin＠svn.reactos.org 12 Nov '07

12 Nov '07

Author: hpoussin Date: Mon Nov 12 14:41:29 2007 New Revision: 30385 URL: http://svn.reactos.org/svn/reactos?rev=30385&view=rev Log: Add explorer-new to the build (doesn't work yet) Modified: trunk/reactos/base/shell/shell.rbuild Modified: trunk/reactos/base/shell/shell.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/shell.rbuild?re… ============================================================================== --- trunk/reactos/base/shell/shell.rbuild (original) +++ trunk/reactos/base/shell/shell.rbuild Mon Nov 12 14:41:29 2007 @@ -7,7 +7,7 @@ <directory name="explorer"> <xi:include href="explorer/explorer.rbuild" /> </directory> -  + </directory> </group>

1 0

[fireball] 30384: - Fix russian translation (towerr).
by fireball＠svn.reactos.org 12 Nov '07

12 Nov '07

Author: fireball Date: Mon Nov 12 14:29:08 2007 New Revision: 30384 URL: http://svn.reactos.org/svn/reactos?rev=30384&view=rev Log: - Fix russian translation (towerr). Modified: trunk/reactos/base/applications/cmdutils/more/lang/ru-RU.rc Modified: trunk/reactos/base/applications/cmdutils/more/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/ru-RU.rc Mon Nov 12 14:29:08 2007 @@ -1,17 +1,23 @@ -// Russian language resource file (towerr & Lentin, 2007-10-17) +/* + * PROJECT: ReactOS Console Command More + * LICENSE: GPL - See COPYING in the top level directory + * FILE: /base/applications/cmdutils/more/lang/ru-RU.rc + * PURPOSE: Russian Language File for ReactOS Console Command More + * PROGRAMMERS: towerr & Lentin + */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_USAGE, "?????????? ?????????? ??????????? ?????? ?????????????.\n\n\ - MORE < [????:][????]??? ?????\n\ + IDS_USAGE, "Ïîêàçûâàòü äàííûå ïîñòðàíè÷íî çàïîëíÿÿ ýêðàí.\n\n\ + MORE < [Òîì:][Ïóòü]Èìÿ ôàéëà\n\ Command | MORE \n\ - MORE [????:][????]??? ?????\n\n\ - [????:][????]??? ????? ?????????? ???????? ????? ???????????.\n\ - Command\t\t ???????, ?????????? ??????? ????????????.\n\n\ - ??? ?????? ""-- ?????????? --"" ??? ????????? ????????? ???????? ??????? ????? ???????.\n" + MORE [Òîì:][Ïóòü]Èìÿ ôàéëà\n\n\ + [Òîì:][Ïóòü]Èìÿ Ôàéëà Èìÿ ôàéëà ñîäåðæèìîå êîòîðîãî áóäåò îòîáðàæåíî.\n\ + Command\t\t Êîìàíäà, ðåçóëüòàò ðàáîòû êîòîðîé òðåáóåòñÿ âûâîäèòü íà ýêðàí.\n\n\ + Ïðè çàïðîñå ""-- Ïðîäîëæèòü --"" âû ìîæåòå íàæàòü ëþáóþ êëàâèøó äëÿ îòîáðàæåíèÿ ñëåäóþùåãî ýêðàíà.\n" - IDS_CONTINUE, " -- ?????????? (100%) -- " - IDS_FILE_ACCESS, "??? ??????? ? ????? %s." + IDS_CONTINUE, " -- Ïðîäîëæèòü (100%) -- " + IDS_FILE_ACCESS, "Íåò äîñòóïà ê ôàéëó %s." }

1 0

[hpoussin] 30383: Add a stub for rebar band site object
by hpoussin＠svn.reactos.org 12 Nov '07

12 Nov '07

Author: hpoussin Date: Mon Nov 12 13:29:17 2007 New Revision: 30383 URL: http://svn.reactos.org/svn/reactos?rev=30383&view=rev Log: Add a stub for rebar band site object Added: trunk/reactos/dll/win32/browseui/bandsite.c (with props) Modified: trunk/reactos/dll/win32/browseui/browseui.h trunk/reactos/dll/win32/browseui/browseui.rbuild trunk/reactos/dll/win32/browseui/browseui_main.c trunk/reactos/dll/win32/browseui/regsvr.c Added: trunk/reactos/dll/win32/browseui/bandsite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit… ============================================================================== --- trunk/reactos/dll/win32/browseui/bandsite.c (added) +++ trunk/reactos/dll/win32/browseui/bandsite.c Mon Nov 12 13:29:17 2007 @@ -1,0 +1,378 @@ +/* + * Rebar band site + * + * Copyright 2007 Hervé Poussineua + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "shlwapi.h" +#include "winerror.h" +#include "objbase.h" + +#include "shlguid.h" +#include "shlobj.h" +#include "shobjidl.h" +#include "todo.h" +#include "undoc.h" + +#include "wine/unicode.h" + +#include "browseui.h" + +WINE_DEFAULT_DEBUG_CHANNEL(browseui); + +struct SubBand { + DWORD dwBandID; + IUnknown *punk; +}; + +typedef struct tagBandSite { + const IBandSiteVtbl *vtbl; + const IWindowEventHandlerVtbl *eventhandlerVtbl; + const IDeskBarClientVtbl *deskbarVtbl; + LONG refCount; + INT nObjs; + struct SubBand *objs; +} BandSite; + +static const IBandSiteVtbl BandSiteVtbl; +static const IWindowEventHandlerVtbl BandSite_EventHandlerVtbl; +static const IDeskBarClientVtbl BandSite_DeskBarVtbl; + +static inline BandSite *impl_from_IWindowEventHandler(IWindowEventHandler *iface) +{ + return (BandSite *)((char *)iface - FIELD_OFFSET(BandSite, eventhandlerVtbl)); +} + +static inline BandSite *impl_from_IDeskBarClient(IDeskBarClient *iface) +{ + return (BandSite *)((char *)iface - FIELD_OFFSET(BandSite, deskbarVtbl)); +} + +static struct SubBand *get_band(BandSite *This, DWORD dwBandID) +{ + INT i; + + for (i = 0; i < This->nObjs; i++) + if (This->objs[i].dwBandID == dwBandID) + return &This->objs[i]; + return NULL; +} + +static void release_obj(struct SubBand *obj) +{ + IUnknown_Release(obj->punk); +} + +HRESULT WINAPI BandSite_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) +{ + BandSite *This; + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + This = CoTaskMemAlloc(sizeof(BandSite)); + if (This == NULL) + return E_OUTOFMEMORY; + ZeroMemory(This, sizeof(*This)); + This->vtbl = &BandSiteVtbl; + This->eventhandlerVtbl = &BandSite_EventHandlerVtbl; + This->refCount = 1; + + TRACE("returning %p\n", This); + *ppOut = (IUnknown *)This; + BROWSEUI_refCount++; + return S_OK; +} + +static void WINAPI BandSite_Destructor(BandSite *This) +{ + int i; + TRACE("destroying %p\n", This); + for (i = 0; i < This->nObjs; i++) + release_obj(&This->objs[i]); + CoTaskMemFree(This->objs); + CoTaskMemFree(This); + BROWSEUI_refCount--; +} + +static HRESULT WINAPI BandSite_QueryInterface(IBandSite *iface, REFIID iid, LPVOID *ppvOut) +{ + BandSite *This = (BandSite *)iface; + *ppvOut = NULL; + + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IBandSite)) + { + *ppvOut = This; + } + else if (IsEqualIID(iid, &IID_IWindowEventHandler)) + { + *ppvOut = &This->eventhandlerVtbl; + } + else if (IsEqualIID(iid, &IID_IOleWindow) || IsEqualIID(iid, &IID_IDeskBarClient)) + { + *ppvOut = &This->deskbarVtbl; + } + + if (*ppvOut) + { + IUnknown_AddRef(iface); + return S_OK; + } + + WARN("unsupported interface: %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI BandSite_AddRef(IBandSite *iface) +{ + BandSite *This = (BandSite *)iface; + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI BandSite_Release(IBandSite *iface) +{ + BandSite *This = (BandSite *)iface; + ULONG ret; + + ret = InterlockedDecrement(&This->refCount); + if (ret == 0) + BandSite_Destructor(This); + return ret; +} + +static HRESULT WINAPI BandSite_AddBand(IBandSite *iface, IUnknown *punk) +{ + BandSite *This = (BandSite *)iface; + struct SubBand *newObjs, *current; + DWORD freeID; + + newObjs = CoTaskMemAlloc((This->nObjs + 1) * sizeof(struct SubBand)); + if (!newObjs) + return E_OUTOFMEMORY; + CopyMemory(newObjs, This->objs, This->nObjs * sizeof(struct SubBand)); + current = &newObjs[This->nObjs]; + + freeID = This->nObjs; + while (get_band(This, freeID) != NULL) + freeID--; + current->dwBandID = freeID; + current->punk = punk; + + CoTaskMemFree(This->objs); + This->objs = newObjs; + This->nObjs++; + + return S_OK; +} + +static HRESULT WINAPI BandSite_EnumBands(IBandSite *iface, UINT uBand, DWORD *pdwBandID) +{ + BandSite *This = (BandSite *)iface; + + if (uBand >= This->nObjs) + return E_FAIL; + + *pdwBandID = This->objs[uBand].dwBandID; + return S_OK; +} + +static HRESULT WINAPI BandSite_QueryBand(IBandSite *iface, DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, LPWSTR pszName, int cchName) +{ + BandSite *This = (BandSite *)iface; + struct SubBand *band; + + band = get_band(This, dwBandID); + if (!band) + return E_FAIL; + + return E_NOTIMPL; +} + +static HRESULT WINAPI BandSite_SetBandState(IBandSite *iface, DWORD dwBandID, DWORD dwMask, DWORD dwState) +{ + BandSite *This = (BandSite *)iface; + struct SubBand *band; + + band = get_band(This, dwBandID); + if (!band) + return E_FAIL; + + return E_NOTIMPL; +} + +static HRESULT WINAPI BandSite_RemoveBand(IBandSite *iface, DWORD dwBandID) +{ + BandSite *This = (BandSite *)iface; + struct SubBand *band; + + band = get_band(This, dwBandID); + if (!band) + return E_FAIL; + + This->nObjs--; + MoveMemory(band, band + 1, (This->objs - band - 1) * sizeof(struct SubBand)); + return S_OK; +} + +static HRESULT WINAPI BandSite_GetBandObject(IBandSite *iface, DWORD dwBandID, REFIID riid, VOID **ppv) +{ + BandSite *This = (BandSite *)iface; + struct SubBand *band; + + band = get_band(This, dwBandID); + if (!band) + return E_FAIL; + + return IUnknown_QueryInterface(band->punk, riid, ppv); +} + +static HRESULT WINAPI BandSite_SetBandSiteInfo(IBandSite *iface, const BANDSITEINFO *pbsinfo) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI BandSite_GetBandSiteInfo(IBandSite *iface, BANDSITEINFO *pbsinfo) +{ + return E_NOTIMPL; +} + +static const IBandSiteVtbl BandSiteVtbl = +{ + BandSite_QueryInterface, + BandSite_AddRef, + BandSite_Release, + + BandSite_AddBand, + BandSite_EnumBands, + BandSite_QueryBand, + BandSite_SetBandState, + BandSite_RemoveBand, + BandSite_GetBandObject, + BandSite_SetBandSiteInfo, + BandSite_GetBandSiteInfo, +}; + +static HRESULT WINAPI BandSite_IWindowEventHandler_QueryInterface(IWindowEventHandler *iface, REFIID iid, LPVOID *ppvOut) +{ + BandSite *This = impl_from_IWindowEventHandler(iface); + return BandSite_QueryInterface((IBandSite *)This, iid, ppvOut); +} + +static ULONG WINAPI BandSite_IWindowEventHandler_AddRef(IWindowEventHandler *iface) +{ + BandSite *This = impl_from_IWindowEventHandler(iface); + return BandSite_AddRef((IBandSite *)This); +} + +static ULONG WINAPI BandSite_IWindowEventHandler_Release(IWindowEventHandler *iface) +{ + BandSite *This = impl_from_IWindowEventHandler(iface); + return BandSite_Release((IBandSite *)This); +} + +static HRESULT WINAPI BandSite_ProcessMessage(IWindowEventHandler *iface, HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plrResult) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI BandSite_ContainsWindow(IWindowEventHandler *iface, HWND hWnd) +{ + return E_NOTIMPL; +} + +static const IWindowEventHandlerVtbl BandSite_EventHandlerVtbl = +{ + BandSite_IWindowEventHandler_QueryInterface, + BandSite_IWindowEventHandler_AddRef, + BandSite_IWindowEventHandler_Release, + + BandSite_ProcessMessage, + BandSite_ContainsWindow, +}; + +static HRESULT WINAPI BandSite_IDeskBarClient_QueryInterface(IDeskBarClient *iface, REFIID iid, LPVOID *ppvOut) +{ + BandSite *This = impl_from_IDeskBarClient(iface); + return BandSite_QueryInterface((IBandSite *)This, iid, ppvOut); +} + +static ULONG WINAPI BandSite_IDeskBarClient_AddRef(IDeskBarClient *iface) +{ + BandSite *This = impl_from_IDeskBarClient(iface); + return BandSite_AddRef((IBandSite *)This); +} + +static ULONG WINAPI BandSite_IDeskBarClient_Release(IDeskBarClient *iface) +{ + BandSite *This = impl_from_IDeskBarClient(iface); + return BandSite_Release((IBandSite *)This); +} + +static HRESULT WINAPI BandSite_IDeskBarClient_GetWindow(IDeskBarClient *iface, HWND *phWnd) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI BandSite_IDeskBarClient_ContextSensitiveHelp(IDeskBarClient *iface, BOOL fEnterMode) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI BandSite_SetDeskBarSite(IDeskBarClient *iface, IUnknown *pUnk) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI BandSite_SetModeDBC(IDeskBarClient *iface, DWORD unknown) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI BandSite_UIActivateDBC(IDeskBarClient *iface, DWORD unknown) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI BandSite_GetSize(IDeskBarClient *iface, DWORD unknown1, LPRECT unknown2) +{ + return E_NOTIMPL; +} + +static const IDeskBarClientVtbl BandSite_DeskBarVtbl = +{ + BandSite_IDeskBarClient_QueryInterface, + BandSite_IDeskBarClient_AddRef, + BandSite_IDeskBarClient_Release, + + BandSite_IDeskBarClient_GetWindow, + BandSite_IDeskBarClient_ContextSensitiveHelp, + + BandSite_SetDeskBarSite, + BandSite_SetModeDBC, + BandSite_UIActivateDBC, + BandSite_GetSize, +}; Propchange: trunk/reactos/dll/win32/browseui/bandsite.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/browseui/browseui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.h (original) +++ trunk/reactos/dll/win32/browseui/browseui.h Mon Nov 12 13:29:17 2007 @@ -24,5 +24,6 @@ extern LONG BROWSEUI_refCount; HRESULT WINAPI ACLMulti_Constructor(IUnknown *punkOuter, IUnknown **ppOut); +HRESULT WINAPI BandSite_Constructor(IUnknown *punkOuter, IUnknown **ppOut); #endif /* __WINE_SHDOCVW_H */ Modified: trunk/reactos/dll/win32/browseui/browseui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.rbuild (original) +++ trunk/reactos/dll/win32/browseui/browseui.rbuild Mon Nov 12 13:29:17 2007 @@ -5,6 +5,7 @@ <importlibrary definition="browseui.spec.def" /> <include base="browseui">.</include> <include base="ReactOS">include/reactos/wine</include> + <include base="explorer_new">.</include> <define name="__REACTOS__" /> <define name="__WINESRC__" /> <define name="__USE_W32API" /> @@ -19,6 +20,7 @@ <library>uuid</library> <library>ntdll</library> <file>aclmulti.c</file> + <file>bandsite.c</file> <file>browseui_main.c</file> <file>regsvr.c</file> <file>version.rc</file> Modified: trunk/reactos/dll/win32/browseui/browseui_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui_main.c (original) +++ trunk/reactos/dll/win32/browseui/browseui_main.c Mon Nov 12 13:29:17 2007 @@ -33,9 +33,9 @@ #include "shlwapi.h" #include "shlguid.h" -#include "initguid.h" - #include "browseui.h" +#include "shobjidl.h" /* for IShellFolder used in undoc.h */ +#include "undoc.h" /* for CLSID_RebarBandSite */ WINE_DEFAULT_DEBUG_CHANNEL(browseui); @@ -50,6 +50,7 @@ LPFNCONSTRUCTOR ctor; } ClassesTable[] = { {&CLSID_ACLMulti, ACLMulti_Constructor}, + {&CLSID_RebarBandSite, BandSite_Constructor}, {NULL, NULL} }; Modified: trunk/reactos/dll/win32/browseui/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/regsvr.… ============================================================================== --- trunk/reactos/dll/win32/browseui/regsvr.c (original) +++ trunk/reactos/dll/win32/browseui/regsvr.c Mon Nov 12 13:29:17 2007 @@ -30,6 +30,8 @@ #include "ole2.h" #include "shlguid.h" +#include "shobjidl.h" /* for IShellFolder used in undoc.h */ +#include "undoc.h" /* for CLSID_RebarBandSite */ #include "wine/debug.h" @@ -447,6 +449,13 @@ "browseui.dll", "Apartment" }, + { + &CLSID_RebarBandSite, + "Shell Rebar Band Site", + NULL, + "browseui.dll", + "Apartment" + }, { NULL } /* list terminator */ };

1 0

[fireball] 30382: - There is no DllMain in mesa32.
by fireball＠svn.reactos.org 12 Nov '07

12 Nov '07

Author: fireball Date: Mon Nov 12 13:22:41 2007 New Revision: 30382 URL: http://svn.reactos.org/svn/reactos?rev=30382&view=rev Log: - There is no DllMain in mesa32. Modified: trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild Modified: trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/mesa32… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild (original) +++ trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild Mon Nov 12 13:22:41 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="mesa32" type="win32dll" baseaddress="${BASEADDRESS_MESA32}" installbase="system32" installname="mesa32.dll" allowwarnings="true"> +<module name="mesa32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MESA32}" installbase="system32" installname="mesa32.dll" allowwarnings="true"> <importlibrary definition="src/drivers/windows/icd/mesa.def" /> <linkerflag>-Wl,--enable-stdcall-fixup</linkerflag> <library>ntdll</library>

1 0

[hpoussin] 30381: Add missing macro
by hpoussin＠svn.reactos.org 12 Nov '07

12 Nov '07

Author: hpoussin Date: Mon Nov 12 13:14:28 2007 New Revision: 30381 URL: http://svn.reactos.org/svn/reactos?rev=30381&view=rev Log: Add missing macro Modified: trunk/reactos/base/shell/explorer-new/undoc.h Modified: trunk/reactos/base/shell/explorer-new/undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/un… ============================================================================== --- trunk/reactos/base/shell/explorer-new/undoc.h (original) +++ trunk/reactos/base/shell/explorer-new/undoc.h Mon Nov 12 13:14:28 2007 @@ -93,6 +93,7 @@ #define IWindowEventHandler_AddRef(T) (T)->lpVtbl->AddRef(T) #define IWindowEventHandler_Release(T) (T)->lpVtbl->Release(T) #define IWindowEventHandler_ProcessMessage(T,a,b,c,d,e) (T)->lpVtbl->ProcessMessage(T,a,b,c,d,e) +#define IWindowEventHandler_ContainsWindow(T,a) (T)->lpVtbl->ContainsWindow(T,a) #endif #if USE_API_SHCREATEDESKTOP != 0

1 0

[hpoussin] 30380: No need for <library> tags static libraries (which are never linked)
by hpoussin＠svn.reactos.org 12 Nov '07

12 Nov '07

Author: hpoussin Date: Mon Nov 12 13:12:01 2007 New Revision: 30380 URL: http://svn.reactos.org/svn/reactos?rev=30380&view=rev Log: No need for <library> tags static libraries (which are never linked) Modified: trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild trunk/reactos/lib/cmlib/cmlib.rbuild Modified: trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/libxm… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild (original) +++ trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild Mon Nov 12 13:12:01 2007 @@ -1,8 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="libxml2" type="staticlibrary" allowwarnings="true"> - <library>ntdll</library> - <library>kernel32</library> <define name="HAVE_CONFIG_H" /> <define name="WIN32" /> <define name="_WINDOWS" /> Modified: trunk/reactos/lib/cmlib/cmlib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.rbuild?rev… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.rbuild (original) +++ trunk/reactos/lib/cmlib/cmlib.rbuild Mon Nov 12 13:12:01 2007 @@ -7,7 +7,6 @@ <define name="_NTSYSTEM_" /> <define name="NASSERT" /> <pch>cmlib.h</pch> - <library>rtl</library> <file>cminit.c</file> <file>hivebin.c</file> <file>hivecell.c</file>

1 0

[hpoussin] 30379: Silent some MSVC warnings
by hpoussin＠svn.reactos.org 12 Nov '07

12 Nov '07

Author: hpoussin Date: Mon Nov 12 13:06:05 2007 New Revision: 30379 URL: http://svn.reactos.org/svn/reactos?rev=30379&view=rev Log: Silent some MSVC warnings Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.h trunk/reactos/include/psdk/windef.h Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/xmlstorage.h (original) +++ trunk/reactos/base/shell/explorer/utility/xmlstorage.h Mon Nov 12 13:06:05 2007 @@ -39,6 +39,9 @@ #ifndef _XMLSTORAGE_H +#ifndef __REACTOS__ +#include <strstream> +#endif #ifdef UNICODE #ifndef _UNICODE @@ -2242,7 +2245,7 @@ typedef std::char_traits<_E> _Tr; explicit fast_ostringbuffer() - {_Init(0, 0, std::_Noread);} // optimized for ios::out mode + {_Init(0, 0, /*std::_Noread*/4);} // optimized for ios::out mode virtual ~fast_ostringbuffer() {_Tidy();} @@ -2271,10 +2274,10 @@ else if (_ALSIZE < _Alsize) _Alsize = _ALSIZE; - if (_Strmode & std::_Allocated) + if (_Strmode & std::strstreambuf::_Allocated) _Al.deallocate(eback(), _Os); - _Strmode |= std::_Allocated; + _Strmode |= std::strstreambuf::_Allocated; if (_Os == 0) {_Seekhigh = _P; @@ -2288,24 +2291,24 @@ return _C;}} - void _Init(const _E *_S, size_t _N, std::_Strstate _M) + void _Init(const _E *_S, size_t _N, std::strstreambuf::_Strstate _M) {_Pendsave = 0, _Seekhigh = 0; _Alsize = _MINSIZE, _Strmode = _M; setg(0, 0, 0); setp(0, 0);} void _Tidy() - {if (_Strmode & std::_Allocated) + {if (_Strmode & std::strstreambuf::_Allocated) _Al.deallocate(eback(), (pptr() != 0 ? epptr() : egptr()) - eback()); _Seekhigh = 0; - _Strmode &= ~std::_Allocated;} + _Strmode &= ~std::strstreambuf::_Allocated;} private: enum {_ALSIZE = 65536/*512*/, _MINSIZE = 32768/*32*/}; // bigger buffer sizes _E *_Pendsave, *_Seekhigh; int _Alsize; - std::_Strstate _Strmode; + std::strstreambuf::_Strstate _Strmode; std::allocator<_E> _Al; }; Modified: trunk/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/windef.h (original) +++ trunk/reactos/include/psdk/windef.h Mon Nov 12 13:06:05 2007 @@ -166,7 +166,7 @@ #define min __min #define max __max -#elif !defined(NOMINMAX) +#elif !defined(_MSC_VER) && !defined(NOMINMAX) #ifndef max #define max(a,b) ((a)>(b)?(a):(b))

1 0

[hpoussin] 30378: Silent some MSVC warnings
by hpoussin＠svn.reactos.org 12 Nov '07

12 Nov '07

Author: hpoussin Date: Mon Nov 12 13:03:04 2007 New Revision: 30378 URL: http://svn.reactos.org/svn/reactos?rev=30378&view=rev Log: Silent some MSVC warnings Modified: trunk/reactos/include/psdk/winbase.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h (original) +++ trunk/reactos/include/psdk/winbase.h Mon Nov 12 13:03:04 2007 @@ -1100,7 +1100,9 @@ HFILE WINAPI _lopen(LPCSTR,int); UINT WINAPI _lread(HFILE,LPVOID,UINT); UINT WINAPI _lwrite(HFILE,LPCSTR,UINT); +#ifndef AbnormalTermination #define AbnormalTermination() FALSE +#endif BOOL WINAPI AccessCheck(PSECURITY_DESCRIPTOR,HANDLE,DWORD,PGENERIC_MAPPING,PPRIVILEGE_SET,PDWORD,PDWORD,PBOOL); BOOL WINAPI AccessCheckAndAuditAlarmA(LPCSTR,LPVOID,LPSTR,LPSTR,PSECURITY_DESCRIPTOR,DWORD,PGENERIC_MAPPING,BOOL,PDWORD,PBOOL,PBOOL); BOOL WINAPI AccessCheckAndAuditAlarmW(LPCWSTR,LPVOID,LPWSTR,LPWSTR,PSECURITY_DESCRIPTOR,DWORD,PGENERIC_MAPPING,BOOL,PDWORD,PBOOL,PBOOL);

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