Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 33926: Fix warnings.
by jimtabor＠svn.reactos.org 11 Jun '08

11 Jun '08

Author: jimtabor Date: Tue Jun 10 23:45:42 2008 New Revision: 33926 URL: http://svn.reactos.org/svn/reactos?rev=33926&view=rev Log: Fix warnings. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue Jun 10 23:45:42 2008 @@ -2234,8 +2234,8 @@ NTAPI NtUserSetSysColors( int cElements, - IN INT *lpaElements, - IN COLORREF *lpaRgbValues, + IN CONST INT *lpaElements, + IN CONST COLORREF *lpaRgbValues, DWORD Unknown3); BOOL Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Tue Jun 10 23:45:42 2008 @@ -525,8 +525,8 @@ STDCALL NtUserSetSysColors( int cElements, - IN INT *lpaElements, - IN COLORREF *lpaRgbValues, + IN CONST INT *lpaElements, + IN CONST COLORREF *lpaRgbValues, DWORD Unknown3) { DWORD Ret = FALSE; @@ -540,7 +540,7 @@ ProbeForRead(lpaRgbValues, sizeof(INT), 1); - Ret = IntSetSysColors(cElements, lpaElements, lpaRgbValues); + Ret = IntSetSysColors(cElements, (INT*)lpaElements, (COLORREF*)lpaRgbValues); } _SEH_HANDLE {

1 0

[weiden] 33925: More IDeskBar support
by weiden＠svn.reactos.org 11 Jun '08

11 Jun '08

Author: weiden Date: Tue Jun 10 22:52:45 2008 New Revision: 33925 URL: http://svn.reactos.org/svn/reactos?rev=33925&view=rev Log: More IDeskBar support Modified: trunk/reactos/dll/win32/browseui/bandsite.c Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/bandsite.c [iso-8859-1] Tue Jun 10 22:52:45 2008 @@ -299,7 +299,8 @@ INT i; LONG NewAllocated; struct BandObject *NewBand = NULL; - IDeskBand *DeskBand; + IDeskBand *DeskBand = NULL; + IObjectWithSite *ObjWithSite = NULL; HRESULT hRet; TRACE("(%p, %p)\n", iface, punk); @@ -311,7 +312,12 @@ &IID_IDeskBand, (PVOID*)&DeskBand); if (!SUCCEEDED(hRet) || DeskBand == NULL) - return E_FAIL; + goto Cleanup; + hRet = IUnknown_QueryInterface(punk, + &IID_IObjectWithSite, + (PVOID*)&ObjWithSite); + if (!SUCCEEDED(hRet) || ObjWithSite == NULL) + goto Cleanup; hRet = S_OK; if (This->BandsAllocated > This->BandsCount) @@ -387,11 +393,21 @@ This->BandsCount++; + hRet = ObjWithSite->lpVtbl->SetSite(ObjWithSite, + (IUnknown*)iface); + if (!SUCCEEDED(hRet)) + ERR("IBandSite::AddBand(): Call to IDeskBand::SetSite() failed: %x\n", hRet); + + if (ObjWithSite != NULL) + ObjWithSite->lpVtbl->Release(ObjWithSite); + return (HRESULT)((SHORT)(NewBand - This->Bands)); } Cleanup: if (DeskBand != NULL) DeskBand->lpVtbl->Release(DeskBand); + if (ObjWithSite != NULL) + ObjWithSite->lpVtbl->Release(ObjWithSite); return hRet; }

1 0

[weiden] 33924: Improve IBandSite support a bit
by weiden＠svn.reactos.org 11 Jun '08

11 Jun '08

Author: weiden Date: Tue Jun 10 22:37:56 2008 New Revision: 33924 URL: http://svn.reactos.org/svn/reactos?rev=33924&view=rev Log: Improve IBandSite support a bit Modified: trunk/reactos/dll/win32/browseui/bandsite.c Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/bandsite.c [iso-8859-1] Tue Jun 10 22:37:56 2008 @@ -32,6 +32,7 @@ #include "shlwapi.h" #include "winerror.h" #include "objbase.h" +#include "commctrl.h" #include "docobj.h" #include "shlguid.h" @@ -46,9 +47,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(browseui); -struct SubBand { - DWORD dwBandID; - IUnknown *punk; +#ifndef ASSERT +#define ASSERT(cond) \ + if (!(cond)) \ + ERR ("ASSERTION %s AT %s:%d FAILED!\n", #cond, __FILE__, __LINE__) +#endif + +extern HINSTANCE browseui_hinstance; + +struct BandObject { + IDeskBand *DeskBand; }; typedef struct tagBandSite { @@ -57,9 +65,12 @@ const IDeskBarClientVtbl *deskbarVtbl; const IOleCommandTargetVtbl *oletargetVtbl; LONG refCount; - INT nObjs; - struct SubBand *objs; + LONG BandsCount; + LONG BandsAllocated; + struct BandObject *Bands; IUnknown *pUnkOuter; + HWND hWndRebar; + IOleWindow *OleWindow; } BandSite; static const IBandSiteVtbl BandSiteVtbl; @@ -82,19 +93,90 @@ return (BandSite *)((char *)iface - FIELD_OFFSET(BandSite, oletargetVtbl)); } -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); +static struct BandObject* GetBandByID(BandSite *This, DWORD dwBandID) +{ + if (dwBandID >= This->BandsAllocated) + return NULL; + + if (This->Bands[dwBandID].DeskBand == NULL) + return NULL; + + return &This->Bands[dwBandID]; +} + +static void FreeBand(BandSite *This, struct BandObject *Band) +{ + IUnknown_Release(Band->DeskBand); + ZeroMemory(Band, sizeof(*Band)); + This->BandsCount--; +} + +static DWORD GetBandSiteViewMode(BandSite *This) +{ + DWORD dwStyle; + + /* FIXME: What about DBIF_VIEWMODE_FLOATING and DBIF_VIEWMODE_TRANSPARENT? */ + dwStyle = GetWindowLong(This->hWndRebar, + GWL_STYLE); + + if (dwStyle & CCS_VERT) + return DBIF_VIEWMODE_VERTICAL; + else + return DBIF_VIEWMODE_NORMAL; +} + +static HRESULT UpdateAllBands(BandSite *This) +{ + DESKBANDINFO dbi; + DWORD dwViewMode; + LONG i; + HRESULT hRet; + + dwViewMode = GetBandSiteViewMode(This); + + for (i = 0; i < This->BandsAllocated; i++) + { + if (This->Bands[i].DeskBand != NULL) + { + ZeroMemory (&dbi, sizeof(dbi)); + dbi.dwMask = 0; + /* FIXME */ + + hRet = IDeskBand_GetBandInfo(This->Bands[i].DeskBand, + i, + dwViewMode, + &dbi); + if (!SUCCEEDED(hRet)) + return hRet; + } + } + + return S_OK; +} + +static HRESULT UpdateBand(BandSite *This, DWORD dwBandID) +{ + struct BandObject *Band; + DESKBANDINFO dbi; + DWORD dwViewMode; + + FIXME("UpdateBand(%x)\n", dwBandID); + + Band = GetBandByID(This, + dwBandID); + if (Band == NULL) + return E_FAIL; + + /* FIXME */ + ZeroMemory (&dbi, sizeof(dbi)); + dbi.dwMask = 0; + + dwViewMode = GetBandSiteViewMode(This); + + return IDeskBand_GetBandInfo(Band->DeskBand, + dwBandID, + dwViewMode, + &dbi); } HRESULT WINAPI BandSite_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) @@ -126,10 +208,33 @@ { int i; TRACE("destroying %p\n", This); - IUnknown_Release(This->pUnkOuter); - for (i = 0; i < This->nObjs; i++) - release_obj(&This->objs[i]); - CoTaskMemFree(This->objs); + + if (This->hWndRebar != NULL) + { + DestroyWindow(This->hWndRebar); + This->hWndRebar = NULL; + } + + if (This->pUnkOuter != NULL) + { + IUnknown_Release(This->pUnkOuter); + This->pUnkOuter = NULL; + } + + if (This->Bands != NULL) + { + for (i = 0; i < This->BandsAllocated; i++) + FreeBand(This, &This->Bands[i]); + CoTaskMemFree(This->Bands); + This->Bands = NULL; + } + + if (This->OleWindow != NULL) + { + This->OleWindow->lpVtbl->Release(This->OleWindow); + This->OleWindow = NULL; + } + CoTaskMemFree(This); BROWSEUI_refCount--; } @@ -191,101 +296,211 @@ static HRESULT WINAPI BandSite_AddBand(IBandSite *iface, IUnknown *punk) { BandSite *This = (BandSite *)iface; - struct SubBand *newObjs, *current; - DWORD freeID; + INT i; + LONG NewAllocated; + struct BandObject *NewBand = NULL; + IDeskBand *DeskBand; + HRESULT hRet; TRACE("(%p, %p)\n", iface, punk); - 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++; - + if (punk == NULL) + return E_FAIL; + + hRet = IUnknown_QueryInterface(punk, + &IID_IDeskBand, + (PVOID*)&DeskBand); + if (!SUCCEEDED(hRet) || DeskBand == NULL) + return E_FAIL; + + hRet = S_OK; + if (This->BandsAllocated > This->BandsCount) + { + /* Search for a free band object */ + for (i = 0; i < This->BandsAllocated; i++) + { + if (This->Bands[i].DeskBand == NULL) + { + NewBand = &This->Bands[i]; + break; + } + } + } + else if (This->BandsAllocated > 0) + { + ASSERT (This->Bands != NULL); + + /* Reallocate the band object array */ + NewAllocated = This->BandsAllocated + 8; + if (NewAllocated > 0xFFFF) + NewAllocated = 0xFFFF; + if (NewAllocated == This->BandsAllocated) + { + hRet = E_OUTOFMEMORY; + goto Cleanup; + } + + + NewBand = CoTaskMemAlloc(NewAllocated * sizeof(struct BandObject)); + if (NewBand == NULL) + { + hRet = E_OUTOFMEMORY; + goto Cleanup; + } + + /* Copy the old array */ + CopyMemory(NewBand, This->Bands, This->BandsAllocated * sizeof(struct BandObject)); + + /* Initialize the added bands */ + ZeroMemory(&NewBand[This->BandsAllocated], (NewAllocated - This->BandsAllocated) * sizeof(struct BandObject)); + + NewBand = &This->Bands[This->BandsAllocated]; + This->BandsAllocated = NewAllocated; + CoTaskMemFree(This->Bands); + This->Bands = NewBand; + } + else + { + ASSERT(This->Bands == NULL); + ASSERT(This->BandsAllocated == 0); + ASSERT(This->BandsCount == 0); + + /* Allocate new array */ + This->Bands = CoTaskMemAlloc(8 * sizeof(struct BandObject)); + if (This->Bands == NULL) + { + hRet = E_OUTOFMEMORY; + goto Cleanup; + } + + /* Initialize the added bands */ + ZeroMemory(This->Bands, 8 * sizeof(struct BandObject)); + + This->BandsAllocated += 8; + NewBand = &This->Bands[0]; + } + + if (SUCCEEDED(hRet)) + { + ASSERT(NewBand != NULL); + NewBand->DeskBand = DeskBand; + + This->BandsCount++; + + return (HRESULT)((SHORT)(NewBand - This->Bands)); + } +Cleanup: + if (DeskBand != NULL) + DeskBand->lpVtbl->Release(DeskBand); + return hRet; +} + +static HRESULT WINAPI BandSite_EnumBands(IBandSite *iface, UINT uBand, DWORD *pdwBandID) +{ + BandSite *This = (BandSite *)iface; + DWORD i; + + TRACE("(%p, %u, %p)\n", iface, uBand, pdwBandID); + + if (uBand == (UINT)-1) + return (UINT)This->BandsCount; + + if (uBand >= This->BandsCount) + return E_FAIL; + + for (i = 0; i < This->BandsAllocated; i++) + { + if (This->Bands[i].DeskBand != NULL) + { + if (uBand == 0) + { + *pdwBandID = i; + return S_OK; + } + + uBand--; + } + } + + return E_FAIL; +} + +static HRESULT WINAPI BandSite_QueryBand(IBandSite *iface, DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, LPWSTR pszName, int cchName) +{ + BandSite *This = (BandSite *)iface; + struct BandObject *Band; + + TRACE("(%p, %u, %p, %p, %p, %d)\n", iface, dwBandID, ppstb, pdwState, pszName, cchName); + + Band = GetBandByID(This, dwBandID); + if (Band == NULL) + return E_FAIL; + + if (ppstb != NULL) + { + Band->DeskBand->lpVtbl->AddRef(Band->DeskBand); + *ppstb = Band->DeskBand; + } + + if (pdwState != NULL) + { + FIXME("IBandSite::QueryBand() requests band state!\n"); + *pdwState = 0; + } + + if (pszName != NULL && cchName > 0) + { + FIXME("IBandSite::QueryBand() requests band name!\n"); + pszName[0] = 0; + } return S_OK; } -static HRESULT WINAPI BandSite_EnumBands(IBandSite *iface, UINT uBand, DWORD *pdwBandID) +static HRESULT WINAPI BandSite_SetBandState(IBandSite *iface, DWORD dwBandID, DWORD dwMask, DWORD dwState) { BandSite *This = (BandSite *)iface; - - TRACE("(%p, %u, %p)\n", iface, uBand, pdwBandID); - - 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; - - TRACE("(%p, %u, %p, %p, %p, %d)\n", iface, dwBandID, ppstb, pdwState, pszName, cchName); - - band = get_band(This, dwBandID); - if (!band) + struct BandObject *Band; + + TRACE("(%p, %u, %x, %x)\n", iface, dwBandID, dwMask, dwState); + + Band = GetBandByID(This, dwBandID); + if (Band == NULL) return E_FAIL; FIXME("Stub\n"); return E_NOTIMPL; } -static HRESULT WINAPI BandSite_SetBandState(IBandSite *iface, DWORD dwBandID, DWORD dwMask, DWORD dwState) +static HRESULT WINAPI BandSite_RemoveBand(IBandSite *iface, DWORD dwBandID) { BandSite *This = (BandSite *)iface; - struct SubBand *band; - - TRACE("(%p, %u, %x, %x)\n", iface, dwBandID, dwMask, dwState); - - band = get_band(This, dwBandID); - if (!band) - return E_FAIL; - - FIXME("Stub\n"); - return E_NOTIMPL; -} - -static HRESULT WINAPI BandSite_RemoveBand(IBandSite *iface, DWORD dwBandID) + struct BandObject *Band; + + TRACE("(%p, %u)\n", iface, dwBandID); + + Band = GetBandByID(This, dwBandID); + if (Band == NULL) + return E_FAIL; + + FreeBand(This, Band); + return S_OK; +} + +static HRESULT WINAPI BandSite_GetBandObject(IBandSite *iface, DWORD dwBandID, REFIID riid, VOID **ppv) { BandSite *This = (BandSite *)iface; - struct SubBand *band; - - TRACE("(%p, %u)\n", iface, dwBandID); - - 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; + struct BandObject *Band; TRACE("(%p, %u, %s, %p)\n", iface, dwBandID, debugstr_guid(riid), ppv); - band = get_band(This, dwBandID); - if (!band) - return E_FAIL; - - return IUnknown_QueryInterface(band->punk, riid, ppv); + Band = GetBandByID(This, dwBandID); + if (Band == NULL) + { + *ppv = NULL; + return E_FAIL; + } + + return Band->DeskBand->lpVtbl->QueryInterface(Band->DeskBand, riid, ppv); } static HRESULT WINAPI BandSite_SetBandSiteInfo(IBandSite *iface, const BANDSITEINFO *pbsinfo) @@ -382,8 +597,15 @@ static HRESULT WINAPI BandSite_IDeskBarClient_GetWindow(IDeskBarClient *iface, HWND *phWnd) { - FIXME("(%p, %p)\n", iface, phWnd); - return E_NOTIMPL; + BandSite *This = impl_from_IDeskBarClient(iface); + + TRACE("(%p, %p)\n", iface, phWnd); + + *phWnd = This->hWndRebar; + if (This->hWndRebar != NULL) + return S_OK; + + return E_FAIL; } static HRESULT WINAPI BandSite_IDeskBarClient_ContextSensitiveHelp(IDeskBarClient *iface, BOOL fEnterMode) @@ -394,20 +616,97 @@ static HRESULT WINAPI BandSite_IDeskBarClient_SetDeskBarSite(IDeskBarClient *iface, IUnknown *pUnk) { - FIXME("(%p, %p)\n", iface, pUnk); - return E_NOTIMPL; -} - -static HRESULT WINAPI BandSite_IDeskBarClient_SetModeDBC(IDeskBarClient *iface, DWORD unknown) -{ - FIXME("(%p, %x)\n", iface, unknown); - return E_NOTIMPL; -} - -static HRESULT WINAPI BandSite_IDeskBarClient_UIActivateDBC(IDeskBarClient *iface, DWORD unknown) -{ - FIXME("(%p, %x)\n", iface, unknown); - return E_NOTIMPL; + BandSite *This = impl_from_IDeskBarClient(iface); + HWND hWndParent; + HRESULT hRet; + + TRACE("(%p, %p)\n", iface, pUnk); + + if (This->OleWindow != NULL) + { + This->OleWindow->lpVtbl->Release(This->OleWindow); + This->OleWindow = NULL; + } + + hRet = IUnknown_QueryInterface(pUnk, + &IID_IOleWindow, + (PVOID*)&This->OleWindow); + if (!SUCCEEDED(hRet)) + { + This->OleWindow = NULL; + return E_FAIL; + } + + hRet = IOleWindow_GetWindow(This->OleWindow, + &hWndParent); + if (!SUCCEEDED(hRet)) + return E_FAIL; + + This->hWndRebar = CreateWindowExW(WS_EX_TOOLWINDOW, + REBARCLASSNAMEW, + NULL, + WS_CHILD | WS_CLIPSIBLINGS | + WS_CLIPCHILDREN | RBS_VARHEIGHT | + CCS_NODIVIDER | RBS_BANDBORDERS, + 0, + 0, + 0, + 0, + hWndParent, + NULL, + browseui_hinstance, + NULL); + if (This->hWndRebar == NULL) + { + IOleWindow_Release(This->OleWindow); + This->OleWindow = NULL; + WARN("IDeskbarClient::SetDeskBarSite() failed to create ReBar control!\n"); + return E_FAIL; + } + + return S_OK; +} + +static HRESULT WINAPI BandSite_IDeskBarClient_SetModeDBC(IDeskBarClient *iface, DWORD dwMode) +{ + BandSite *This = impl_from_IDeskBarClient(iface); + LONG dwStyle, dwPrevStyle; + + TRACE("(%p, %x)\n", iface, dwMode); + + if (This->hWndRebar == NULL) + return E_FAIL; + + dwStyle = dwPrevStyle = GetWindowLong(This->hWndRebar, + GWL_STYLE); + if (dwMode & DBIF_VIEWMODE_VERTICAL) + dwStyle |= CCS_VERT; + + if (dwMode & ~DBIF_VIEWMODE_VERTICAL) + FIXME("IDeskBarClient::SetModeDBC() unhandled modes: %x\n", dwStyle & ~DBIF_VIEWMODE_VERTICAL); + + if (dwStyle != dwPrevStyle) + { + SetWindowLong(This->hWndRebar, + GWL_STYLE, + dwPrevStyle); + } + + return S_OK; +} + +static HRESULT WINAPI BandSite_IDeskBarClient_UIActivateDBC(IDeskBarClient *iface, DWORD dwState) +{ + BandSite *This = impl_from_IDeskBarClient(iface); + + TRACE("(%p, %x)\n", iface, dwState); + + if (This->hWndRebar == NULL) + return E_FAIL; + + ShowWindow(This->hWndRebar, (dwState & DBC_SHOW) ? SW_SHOW : SW_HIDE); + FIXME("IDeskBarClient::UIActivateDBC() Properly notify bands?\n"); + return S_OK; } static HRESULT WINAPI BandSite_IDeskBarClient_GetSize(IDeskBarClient *iface, DWORD unknown1, LPRECT unknown2) @@ -460,7 +759,44 @@ static HRESULT WINAPI BandSite_IOleCommandTarget_Exec(IOleCommandTarget *iface, const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdExecOpt, VARIANTARG *pvaIn, VARIANTARG *pvaOut) { - FIXME("(%p, %p, %u, %u, %p, %p)\n", iface, pguidCmdGroup, nCmdID, nCmdExecOpt, pvaIn, pvaOut); + BandSite *This = impl_from_IOleCommandTarget(iface); + HRESULT hRet = S_OK; + + TRACE("(%p, %p, %u, %u, %p, %p)\n", iface, pguidCmdGroup, nCmdID, nCmdExecOpt, pvaIn, pvaOut); + + if (This->hWndRebar == NULL) + return E_FAIL; + + if (IsEqualIID(pguidCmdGroup, &IID_IDeskBand)) + { + switch (nCmdID) + { + case DBID_BANDINFOCHANGED: + if (pvaIn == NULL) + hRet = UpdateAllBands(This); + else + { + /* Update a single band */ + if (pvaIn->n1.n2.vt == VT_I4) + hRet = UpdateBand(This, pvaIn->n1.n2.n3.lVal); + else + hRet = E_FAIL; + } + break; + + case DBID_SHOWONLY: + case DBID_MAXIMIZEBAND: + case DBID_PUSHCHEVRON: + FIXME("IOleCommandTarget::Exec(): Unsupported command ID %d\n", nCmdID); + return E_NOTIMPL; + default: + return E_FAIL; + } + return S_OK; + } + else + WARN("IOleCommandTarget::Exec(): Unsupported command group GUID\n"); + return E_NOTIMPL; }

1 0

[weiden] 33923: Fix a small bug
by weiden＠svn.reactos.org 11 Jun '08

11 Jun '08

Author: weiden Date: Tue Jun 10 22:36:21 2008 New Revision: 33923 URL: http://svn.reactos.org/svn/reactos?rev=33923&view=rev Log: Fix a small bug Modified: trunk/reactos/base/shell/explorer-new/tbsite.c Modified: trunk/reactos/base/shell/explorer-new/tbsite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tb… ============================================================================== --- trunk/reactos/base/shell/explorer-new/tbsite.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/tbsite.c [iso-8859-1] Tue Jun 10 22:36:21 2008 @@ -573,6 +573,8 @@ if (ppstb != NULL) *ppstb = pstb; } + else if (ppstb != NULL) + *ppstb = NULL; return hRet; } @@ -730,7 +732,7 @@ &dwBandID))) { if (SUCCEEDED(IBandSite_GetBandObject(This->BandSite, - uBand, + dwBandID, &IID_IOleCommandTarget, (PVOID*)&pOct))) {

1 0

[jimtabor] 33922: Retool SetSysColors and use SEH.
by jimtabor＠svn.reactos.org 10 Jun '08

10 Jun '08

Author: jimtabor Date: Tue Jun 10 16:57:16 2008 New Revision: 33922 URL: http://svn.reactos.org/svn/reactos?rev=33922&view=rev Log: Retool SetSysColors and use SEH. Modified: trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Tue Jun 10 16:57:16 2008 @@ -69,9 +69,6 @@ #define NtUserGetSysColors(ColorRefs, count) \ (BOOL)NtUserCallTwoParam((DWORD)(ColorRefs), (DWORD)(count), TWOPARAM_ROUTINE_GETSYSCOLORS) -#define NtUserSetSysColors(ColorRefs, count) \ - (BOOL)NtUserCallTwoParam((DWORD)(ColorRefs), (DWORD)(count), TWOPARAM_ROUTINE_SETSYSCOLORS) - #define NtUserSetCaretBlinkTime(uMSeconds) \ (BOOL)NtUserCallOneParam((DWORD)uMSeconds, ONEPARAM_ROUTINE_SETCARETBLINKTIME) Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Tue Jun 10 16:57:16 2008 @@ -110,27 +110,7 @@ CONST INT *lpaElements, CONST COLORREF *lpaRgbValues) { - BOOL Ret; - struct - { - INT *Elements; - COLORREF *Colors; - } ChangeSysColors; - - ChangeSysColors.Elements = (INT*)lpaElements; - ChangeSysColors.Colors = (COLORREF*)lpaRgbValues; - - if(cElements > 0) - { - Ret = NtUserSetSysColors(&ChangeSysColors, cElements); - } - else - { - SetLastError(ERROR_INVALID_PARAMETER); - Ret = FALSE; - } - - return Ret; + return NtUserSetSysColors(cElements, lpaElements, lpaRgbValues, 0); } void Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue Jun 10 16:57:16 2008 @@ -2230,12 +2230,12 @@ HWND hwndShell, HWND hwndShellListView); -DWORD +BOOL NTAPI NtUserSetSysColors( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, + int cElements, + IN INT *lpaElements, + IN COLORREF *lpaRgbValues, DWORD Unknown3); BOOL @@ -2639,7 +2639,6 @@ #define TWOPARAM_ROUTINE_GETSYSCOLORBRUSHES 0xfffd0063 #define TWOPARAM_ROUTINE_GETSYSCOLORPENS 0xfffd0064 #define TWOPARAM_ROUTINE_GETSYSCOLORS 0xfffd0065 -#define TWOPARAM_ROUTINE_SETSYSCOLORS 0xfffd0066 // use NtUserSetSysColors #define TWOPARAM_ROUTINE_ROS_SHOWWINDOW 0x1000 #define TWOPARAM_ROUTINE_ROS_ISACTIVEICON 0x1001 #define TWOPARAM_ROUTINE_ROS_NCDESTROY 0x1002 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Tue Jun 10 16:57:16 2008 @@ -521,17 +521,39 @@ return 0; } -DWORD +BOOL STDCALL NtUserSetSysColors( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, + int cElements, + IN INT *lpaElements, + IN COLORREF *lpaRgbValues, DWORD Unknown3) { - UNIMPLEMENTED - - return 0; + DWORD Ret = FALSE; + NTSTATUS Status = STATUS_SUCCESS; + UserEnterExclusive(); + _SEH_TRY + { + ProbeForRead(lpaElements, + sizeof(INT), + 1); + ProbeForRead(lpaRgbValues, + sizeof(INT), + 1); + Ret = IntSetSysColors(cElements, lpaElements, lpaRgbValues); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + Ret = FALSE; + } + UserLeave(); + return Ret; } DWORD Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Tue Jun 10 16:57:16 2008 @@ -611,53 +611,6 @@ case TWOPARAM_ROUTINE_REGISTERLOGONPROC: RETURN( (DWORD)co_IntRegisterLogonProcess((HANDLE)Param1, (BOOL)Param2)); - - case TWOPARAM_ROUTINE_SETSYSCOLORS: - { - DWORD Ret = 0; - PVOID Buffer; - struct - { - INT *Elements; - COLORREF *Colors; - } - ChangeSysColors; - - /* FIXME - we should make use of SEH here... */ - - Status = MmCopyFromCaller(&ChangeSysColors, (PVOID)Param1, sizeof(ChangeSysColors)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( 0); - } - - Buffer = ExAllocatePool(PagedPool, (Param2 * sizeof(INT)) + (Param2 * sizeof(COLORREF))); - if(Buffer != NULL) - { - INT *Elements = (INT*)Buffer; - COLORREF *Colors = (COLORREF*)Buffer + Param2; - - Status = MmCopyFromCaller(Elements, ChangeSysColors.Elements, Param2 * sizeof(INT)); - if(NT_SUCCESS(Status)) - { - Status = MmCopyFromCaller(Colors, ChangeSysColors.Colors, Param2 * sizeof(COLORREF)); - if(NT_SUCCESS(Status)) - { - Ret = (DWORD)IntSetSysColors((UINT)Param2, Elements, Colors); - } - else - SetLastNtError(Status); - } - else - SetLastNtError(Status); - - ExFreePool(Buffer); - } - - - RETURN( Ret); - } case TWOPARAM_ROUTINE_GETSYSCOLORBRUSHES: case TWOPARAM_ROUTINE_GETSYSCOLORPENS:

1 0

[ekohl] 33921: Enable the user to modify the profile information of a user account.
by ekohl＠svn.reactos.org 10 Jun '08

10 Jun '08

Author: ekohl Date: Tue Jun 10 16:56:19 2008 New Revision: 33921 URL: http://svn.reactos.org/svn/reactos?rev=33921&view=rev Log: Enable the user to modify the profile information of a user account. Modified: trunk/reactos/dll/cpl/usrmgr/userprops.c Modified: trunk/reactos/dll/cpl/usrmgr/userprops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/userprops.c… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/userprops.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/userprops.c [iso-8859-1] Tue Jun 10 16:56:19 2008 @@ -18,10 +18,16 @@ #define VALID_GENERAL_FLAGS (UF_PASSWD_CANT_CHANGE | UF_DONT_EXPIRE_PASSWD | UF_ACCOUNTDISABLE | UF_LOCKOUT) +typedef struct _PROFILE_USER_DATA +{ + TCHAR szUserName[1]; +} PROFILE_USER_DATA, *PPROFILE_USER_DATA; + static VOID -GetProfileData(HWND hwndDlg, LPTSTR lpUserName) +GetUserProfileData(HWND hwndDlg, + PPROFILE_USER_DATA pUserData) { PUSER_INFO_3 userInfo = NULL; NET_API_STATUS status; @@ -30,7 +36,7 @@ INT i; INT nSel; - status = NetUserGetInfo(NULL, lpUserName, 3, (LPBYTE*)&userInfo); + status = NetUserGetInfo(NULL, pUserData->szUserName, 3, (LPBYTE*)&userInfo); if (status != NERR_Success) return; @@ -67,6 +73,118 @@ CB_SETCURSEL, nSel, 0); NetApiBufferFree(userInfo); +} + + +static BOOL +SetUserProfileData(HWND hwndDlg, + PPROFILE_USER_DATA pUserData) +{ + PUSER_INFO_3 pUserInfo = NULL; + LPTSTR pszProfilePath = NULL; + LPTSTR pszScriptPath = NULL; + LPTSTR pszHomeDir = NULL; + LPTSTR pszHomeDrive = NULL; + NET_API_STATUS status; +#if 0 + DWORD dwIndex; +#endif + INT nLength; + INT nIndex; + + NetUserGetInfo(NULL, pUserData->szUserName, 3, (LPBYTE*)&pUserInfo); + + /* Get the profile path */ + nLength = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_USER_PROFILE_PATH)); + if (nLength == 0) + { + pUserInfo->usri3_profile = NULL; + } + else + { + pszProfilePath = HeapAlloc(GetProcessHeap(), 0, (nLength + 1) * sizeof(TCHAR)); + GetDlgItemText(hwndDlg, IDC_USER_PROFILE_PATH, pszProfilePath, nLength + 1); + pUserInfo->usri3_profile = pszProfilePath; + } + + /* Get the script path */ + nLength = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_USER_PROFILE_SCRIPT)); + if (nLength == 0) + { + pUserInfo->usri3_script_path = NULL; + } + else + { + pszScriptPath = HeapAlloc(GetProcessHeap(), 0, (nLength + 1) * sizeof(TCHAR)); + GetDlgItemText(hwndDlg, IDC_USER_PROFILE_SCRIPT, pszScriptPath, nLength + 1); + pUserInfo->usri3_script_path = pszScriptPath; + } + + if (IsDlgButtonChecked(hwndDlg, IDC_USER_PROFILE_LOCAL) == BST_CHECKED) + { + /* Local home directory */ + nLength = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_USER_PROFILE_LOCAL_PATH)); + if (nLength == 0) + { + pUserInfo->usri3_home_dir = NULL; + } + else + { + pszHomeDir = HeapAlloc(GetProcessHeap(), 0, (nLength + 1) * sizeof(TCHAR)); + GetDlgItemText(hwndDlg, IDC_USER_PROFILE_LOCAL_PATH, pszHomeDir, nLength + 1); + pUserInfo->usri3_home_dir = pszHomeDir; + } + } + else + { + /* Remote home directory */ + nLength = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_USER_PROFILE_REMOTE_PATH)); + if (nLength == 0) + { + pUserInfo->usri3_home_dir = NULL; + } + else + { + pszHomeDir = HeapAlloc(GetProcessHeap(), 0, (nLength + 1) * sizeof(TCHAR)); + GetDlgItemText(hwndDlg, IDC_USER_PROFILE_REMOTE_PATH, pszHomeDir, nLength + 1); + pUserInfo->usri3_home_dir = pszHomeDir; + } + + nIndex = SendMessage(GetDlgItem(hwndDlg, IDC_USER_PROFILE_DRIVE), CB_GETCURSEL, 0, 0); + if (nIndex != CB_ERR) + { + nLength = SendMessage(GetDlgItem(hwndDlg, IDC_USER_PROFILE_DRIVE), CB_GETLBTEXTLEN, nIndex, 0); + pszHomeDrive = HeapAlloc(GetProcessHeap(), 0, (nLength + 1) * sizeof(TCHAR)); + SendMessage(GetDlgItem(hwndDlg, IDC_USER_PROFILE_DRIVE), CB_GETLBTEXT, nIndex, (LPARAM)pszHomeDrive); + pUserInfo->usri3_home_dir_drive = pszHomeDrive; + } + } + +#if 0 + status = NetUserSetInfo(NULL, pUserData->szUserName, 3, (LPBYTE)pUserInfo, &dwIndex); + if (status != NERR_Success) + { + DebugPrintf(_T("Status: %lu Index: %lu"), status, dwIndex); + } +#else + status = NERR_Success; +#endif + + if (pszProfilePath) + HeapFree(GetProcessHeap(), 0, pszProfilePath); + + if (pszScriptPath) + HeapFree(GetProcessHeap(), 0, pszScriptPath); + + if (pszHomeDir) + HeapFree(GetProcessHeap(), 0, pszHomeDir); + + if (pszHomeDrive) + HeapFree(GetProcessHeap(), 0, pszHomeDrive); + + NetApiBufferFree(pUserInfo); + + return (status == NERR_Success); } @@ -76,21 +194,38 @@ WPARAM wParam, LPARAM lParam) { + PPROFILE_USER_DATA pUserData; UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(wParam); UNREFERENCED_PARAMETER(hwndDlg); + pUserData= (PPROFILE_USER_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + switch (uMsg) { case WM_INITDIALOG: - GetProfileData(hwndDlg, - (LPTSTR)((PROPSHEETPAGE *)lParam)->lParam); + pUserData = (PPROFILE_USER_DATA)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(PROFILE_USER_DATA) + + lstrlen((LPTSTR)((PROPSHEETPAGE *)lParam)->lParam) * sizeof(TCHAR)); + lstrcpy(pUserData->szUserName, (LPTSTR)((PROPSHEETPAGE *)lParam)->lParam); + + SetWindowLongPtr(hwndDlg, DWLP_USER, (INT_PTR)pUserData); + + GetUserProfileData(hwndDlg, + pUserData); break; case WM_COMMAND: switch (LOWORD(wParam)) { + case IDC_USER_PROFILE_PATH: + case IDC_USER_PROFILE_SCRIPT: + if (HIWORD(wParam) == EN_CHANGE) + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + case IDC_USER_PROFILE_LOCAL: EnableWindow(GetDlgItem(hwndDlg, IDC_USER_PROFILE_LOCAL_PATH), TRUE); EnableWindow(GetDlgItem(hwndDlg, IDC_USER_PROFILE_DRIVE), FALSE); @@ -102,6 +237,18 @@ EnableWindow(GetDlgItem(hwndDlg, IDC_USER_PROFILE_DRIVE), TRUE); EnableWindow(GetDlgItem(hwndDlg, IDC_USER_PROFILE_REMOTE_PATH), TRUE); break; + } + break; + + case WM_DESTROY: + HeapFree(GetProcessHeap(), 0, pUserData); + break; + + case WM_NOTIFY: + if (((LPPSHNOTIFY)lParam)->hdr.code == PSN_APPLY) + { + SetUserProfileData(hwndDlg, pUserData); + return TRUE; } break; } @@ -231,7 +378,7 @@ static VOID -GetGeneralUserData(HWND hwndDlg, +GetUserGeneralData(HWND hwndDlg, PGENERAL_USER_DATA pUserData) { PUSER_INFO_3 pUserInfo = NULL; @@ -253,7 +400,7 @@ static BOOL -SetGeneralUserData(HWND hwndDlg, +SetUserGeneralData(HWND hwndDlg, PGENERAL_USER_DATA pUserData) { PUSER_INFO_3 pUserInfo = NULL; @@ -344,7 +491,7 @@ SetWindowLongPtr(hwndDlg, DWLP_USER, (INT_PTR)pUserData); - GetGeneralUserData(hwndDlg, + GetUserGeneralData(hwndDlg, pUserData); break; @@ -390,7 +537,7 @@ case WM_NOTIFY: if (((LPPSHNOTIFY)lParam)->hdr.code == PSN_APPLY) { - SetGeneralUserData(hwndDlg, pUserData); + SetUserGeneralData(hwndDlg, pUserData); return TRUE; } break;

1 0

[jimtabor] 33920: Use server information for GetSystemMetrics.
by jimtabor＠svn.reactos.org 10 Jun '08

10 Jun '08

Author: jimtabor Date: Tue Jun 10 16:09:31 2008 New Revision: 33920 URL: http://svn.reactos.org/svn/reactos?rev=33920&view=rev Log: Use server information for GetSystemMetrics. Modified: trunk/reactos/dll/win32/user32/misc/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c Modified: trunk/reactos/dll/win32/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/desk… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] Tue Jun 10 16:09:31 2008 @@ -99,6 +99,9 @@ int STDCALL GetSystemMetrics(int nIndex) { +// FIXME("Global Sever Data -> %x\n",g_psi); + if (g_psi) return g_psi->SystemMetrics[nIndex]; + else return(NtUserGetSystemMetrics(nIndex)); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Tue Jun 10 16:09:31 2008 @@ -57,9 +57,15 @@ return Status; } - gpsi = UserHeapAlloc(sizeof(SERVERINFO)); - if (gpsi) RtlZeroMemory(gpsi, sizeof(SERVERINFO)); - + if (!gpsi) + { + gpsi = UserHeapAlloc(sizeof(SERVERINFO)); + if (gpsi) + { + RtlZeroMemory(gpsi, sizeof(SERVERINFO)); + DPRINT1("Gloabal Server Data -> %x\n", gpsi); + } + } return STATUS_SUCCESS; }

1 0

[cfinck] 33919: Matthias Kupfer (matthias DOT kupfer AT informatik DOT tu-chemnitz DOT de) - Give the Run Dialog resources a default title (only done in German and English resources so far, others still need to be done) - Add support for passing no title to RunFileDlg, so that it uses the default title - Pass no hardcoded english title in Explorer and Task-Manager. I slightly modified the patch to also remove the other hardcoded text passed in Explorer. See issue #3340 for more details.
by cfinck＠svn.reactos.org 10 Jun '08

10 Jun '08

Author: cfinck Date: Tue Jun 10 14:19:59 2008 New Revision: 33919 URL: http://svn.reactos.org/svn/reactos?rev=33919&view=rev Log: Matthias Kupfer (matthias DOT kupfer AT informatik DOT tu-chemnitz DOT de) - Give the Run Dialog resources a default title (only done in German and English resources so far, others still need to be done) - Add support for passing no title to RunFileDlg, so that it uses the default title - Pass no hardcoded english title in Explorer and Task-Manager. I slightly modified the patch to also remove the other hardcoded text passed in Explorer. See issue #3340 for more details. Modified: trunk/reactos/base/applications/taskmgr/run.c trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp trunk/reactos/dll/win32/shell32/dialogs.c trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc Modified: trunk/reactos/base/applications/taskmgr/run.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/run.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/run.c [iso-8859-1] Tue Jun 10 14:19:59 2008 @@ -43,7 +43,7 @@ { /* NOTE - don't check whether running on win 9x or NT, let's just assume that a unicode build only runs on NT */ - RunFileDlg(hMainWnd, 0, NULL, szTitle, szText, RFF_CALCDIRECTORY); + RunFileDlg(hMainWnd, 0, NULL, NULL, szText, RFF_CALCDIRECTORY); } FreeLibrary(hShell32); Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] Tue Jun 10 14:19:59 2008 @@ -2113,26 +2113,11 @@ void StartMenuHandler::ShowLaunchDialog(HWND hwndOwner) { - ///@todo All text phrases should be put into the resources. - static LPCSTR szTitle = "Run"; - static LPCSTR szText = "Type the name of a program, folder, document, or Internet resource, and Explorer will open it for you."; - static DynamicFct<RUNFILEDLG> RunFileDlg(TEXT("SHELL32"), 61); // Show "Run..." dialog if (RunFileDlg) { -#ifndef _ROS_ /* FIXME: our shell32 always expects Ansi strings */ - if ((HIWORD(GetVersion())>>14) == W_VER_NT) { - WCHAR wTitle[40], wText[256]; - - MultiByteToWideChar(CP_ACP, 0, szTitle, -1, wTitle, 40); - MultiByteToWideChar(CP_ACP, 0, szText, -1, wText, 256); - - (*RunFileDlg)(hwndOwner, 0, NULL, (LPCSTR)wTitle, (LPCSTR)wText, RFF_CALCDIRECTORY); - } - else -#endif - (*RunFileDlg)(hwndOwner, 0, NULL, szTitle, szText, RFF_CALCDIRECTORY); + (*RunFileDlg)(hwndOwner, 0, NULL, NULL, NULL, RFF_CALCDIRECTORY); } } Modified: trunk/reactos/dll/win32/shell32/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs.… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs.c [iso-8859-1] Tue Jun 10 14:19:59 2008 @@ -330,7 +330,10 @@ { case WM_INITDIALOG : prfdp = (RUNFILEDLGPARAMS *)lParam ; - SetWindowTextA (hwnd, prfdp->lpstrTitle) ; + + if (prfdp->lpstrTitle) + SetWindowTextA (hwnd, prfdp->lpstrTitle) ; + SetClassLongPtrW (hwnd, GCLP_HICON, (LPARAM)prfdp->hIcon) ; SendMessageW (GetDlgItem (hwnd, 12297), STM_SETICON, (WPARAM)LoadIconW (NULL, (LPCWSTR)IDI_WINLOGO), 0); Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Tue Jun 10 14:19:59 2008 @@ -151,7 +151,7 @@ SHELL_RUN_DLG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "" +CAPTION "Ausführen" FONT 8, "MS Shell Dlg" BEGIN ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Tue Jun 10 14:19:59 2008 @@ -149,7 +149,7 @@ SHELL_RUN_DLG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "" +CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Tue Jun 10 14:19:59 2008 @@ -149,7 +149,7 @@ SHELL_RUN_DLG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "" +CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE

1 0

[jimtabor] 33918: Fix build, add float to long union for dword transfer.
by jimtabor＠svn.reactos.org 10 Jun '08

10 Jun '08

Author: jimtabor Date: Tue Jun 10 00:48:18 2008 New Revision: 33918 URL: http://svn.reactos.org/svn/reactos?rev=33918&view=rev Log: Fix build, add float to long union for dword transfer. Modified: trunk/reactos/dll/win32/gdi32/objects/arc.c trunk/reactos/subsystems/win32/win32k/objects/arc.c Modified: trunk/reactos/dll/win32/gdi32/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/ar… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/arc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/arc.c [iso-8859-1] Tue Jun 10 00:48:18 2008 @@ -64,6 +64,11 @@ FLOAT StartAngle, FLOAT SweepAngle) { + gxf_long worker, worker1; + + worker.f = StartAngle; + worker1.f = SweepAngle; + #if 0 // Handle something other than a normal dc object. if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) @@ -87,7 +92,7 @@ } } #endif - return NtGdiAngleArc(hDC, X, Y, Radius, (DWORD)StartAngle, (DWORD)SweepAngle); + return NtGdiAngleArc(hDC, X, Y, Radius, (DWORD)worker.l, (DWORD)worker1.l); } BOOL Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] Tue Jun 10 00:48:18 2008 @@ -469,7 +469,7 @@ BOOL APIENTRY NtGdiAngleArc( - IN HDC hdc, + IN HDC hDC, IN INT x, IN INT y, IN DWORD dwRadius, @@ -477,7 +477,8 @@ IN DWORD dwSweepAngle) { DC *dc; - BOOL Ret = FASLE; + BOOL Ret = FALSE; + gxf_long worker, worker1; dc = DC_LockDc (hDC); if(!dc) @@ -491,11 +492,11 @@ /* Yes, Windows really returns TRUE in this case */ return TRUE; } - + worker.l = dwStartAngle; + worker1.l = dwSweepAngle; DC_UnlockDc( dc ); return Ret; - } BOOL

1 0

[jimtabor] 33917: Move NtGdiAngleArc to arc.c.
by jimtabor＠svn.reactos.org 10 Jun '08

10 Jun '08

Author: jimtabor Date: Tue Jun 10 00:25:37 2008 New Revision: 33917 URL: http://svn.reactos.org/svn/reactos?rev=33917&view=rev Log: Move NtGdiAngleArc to arc.c. Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c trunk/reactos/subsystems/win32/win32k/objects/line.c Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] Tue Jun 10 00:25:37 2008 @@ -466,6 +466,38 @@ rc1.left, rc1.top, rc1.right, rc1.bottom, arctype); } +BOOL +APIENTRY +NtGdiAngleArc( + IN HDC hdc, + IN INT x, + IN INT y, + IN DWORD dwRadius, + IN DWORD dwStartAngle, + IN DWORD dwSweepAngle) +{ + DC *dc; + BOOL Ret = FASLE; + + dc = DC_LockDc (hDC); + if(!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + if (dc->DC_Type == DC_TYPE_INFO) + { + DC_UnlockDc(dc); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } + + + DC_UnlockDc( dc ); + return Ret; + +} + BOOL STDCALL NtGdiArcInternal( Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] Tue Jun 10 00:25:37 2008 @@ -376,21 +376,6 @@ /******************************************************************************/ BOOL -APIENTRY -NtGdiAngleArc( - IN HDC hdc, - IN INT x, - IN INT y, - IN DWORD dwRadius, - IN DWORD dwStartAngle, - IN DWORD dwSweepAngle) -{ - UNIMPLEMENTED; - return FALSE; -} - - -BOOL STDCALL NtGdiLineTo(HDC hDC, int XEnd,

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