Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[greatlrd] 19846: revert my latest change for it contain to some serous bugs and some mistake thx w3seek
by greatlrd＠svn.reactos.com 03 Dec '05

03 Dec '05

revert my latest change for it contain to some serous bugs and some mistake thx w3seek Modified: trunk/reactos/lib/dxdiagn/container.c _____ Modified: trunk/reactos/lib/dxdiagn/container.c --- trunk/reactos/lib/dxdiagn/container.c 2005-12-03 21:00:55 UTC (rev 19845) +++ trunk/reactos/lib/dxdiagn/container.c 2005-12-03 21:25:27 UTC (rev 19846) @@ -20,9 +20,9 @@ */ #include "config.h" +#include "dxdiag_private.h" #include "wine/debug.h" #include "wine/unicode.h" -#include "dxdiag_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); @@ -120,73 +120,21 @@ return E_INVALIDARG; } -HRESULT WINAPI IDxDiagContainerImpl_GetNumberOfProps(PDXDIAGCONTAINER iface, DWORD* pdwCount) -{ - IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; - - - *pdwCount = This->nSubpProperty; - - TRACE("(%p)->(%ld)\n", iface, *pdwCount); - +HRESULT WINAPI IDxDiagContainerImpl_GetNumberOfProps(PDXDIAGCONTAINER iface, DWORD* pdwCount) { + /* IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; */ + FIXME("(%p, %p): stub\n", iface, pdwCount); return S_OK; } HRESULT WINAPI IDxDiagContainerImpl_EnumPropNames(PDXDIAGCONTAINER iface, DWORD dwIndex, LPWSTR pwszPropName, DWORD cchPropName) { - - IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; - - if (This->pProperty == NULL) - { - - This->pProperty = (Contain_Property *)HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(Contain_Property) *(dwIndex+1)); - - This->nSubpProperty = dwIndex+1; - } - else - { - if (dwIndex>=This->nSubpProperty) - { - This->pProperty = (Contain_Property *) HeapReAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, This->pProperty, - sizeof(Contain_Property) *(dwIndex+1)); - This->nSubpProperty = dwIndex+1; - } - - } - - lstrcpynW(pwszPropName, This->pProperty[dwIndex].pwszPropName, cchPropName); - - TRACE("(%p)->(%s)\n", iface, debugstr_w(This->pProperty[dwIndex].pwszPropName)); - return S_OK; + /* IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; */ + FIXME("(%p, %lu, %s, %lu): stub\n", iface, dwIndex, debugstr_w(pwszPropName), cchPropName); + return S_OK; } -HRESULT WINAPI IDxDiagContainerImpl_GetProp(PDXDIAGCONTAINER iface, LPCWSTR pwszPropName, VARIANT* pvarProp) -{ - IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; - Contain_Property *propert = This->pProperty; - TRACE("(%p)->(%s, %p)\n", iface, debugstr_w(pwszPropName), pvarProp); - - while (propert->pwszPropName && lstrcmpW(propert->pwszPropName, pwszPropName)) - { - propert += sizeof(Contain_Property); - } - - if (!propert->pwszPropName) - return E_INVALIDARG; - - /* FIXME - if (property->pvarProp == VT_EMPTY) - return E_INVALIDARG; - - if (property->pvarProp.vt == VT_ERROR) - return E_INVALIDARG; - */ - - memcpy(pvarProp,&propert->pvarProp, sizeof(VARIANT)); - +HRESULT WINAPI IDxDiagContainerImpl_GetProp(PDXDIAGCONTAINER iface, LPCWSTR pwszPropName, VARIANT* pvarProp) { + /* IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; */ + FIXME("(%p, %s, %p): stub\n", iface, debugstr_w(pwszPropName), pvarProp); return S_OK; } @@ -219,3 +167,4 @@ container->ref = 0; /* will be inited with QueryInterface */ return IDxDiagContainerImpl_QueryInterface((PDXDIAGCONTAINER)container, riid, ppobj); } +

1 0

[sgasiorek] 19845: fix for LoadStringA - return part of string if buffer is to small
by sgasiorek＠svn.reactos.com 03 Dec '05

03 Dec '05

fix for LoadStringA - return part of string if buffer is to small Modified: trunk/reactos/lib/user32/misc/resources.c _____ Modified: trunk/reactos/lib/user32/misc/resources.c --- trunk/reactos/lib/user32/misc/resources.c 2005-12-03 20:53:23 UTC (rev 19844) +++ trunk/reactos/lib/user32/misc/resources.c 2005-12-03 21:00:55 UTC (rev 19845) @@ -98,7 +98,7 @@ { UNICODE_STRING wstrResStr; ANSI_STRING strBuf; - NTSTATUS nErrCode; + INT retSize; /* parameter validation */ if @@ -125,14 +125,13 @@ strBuf.MaximumLength = nBufferMax * sizeof(CHAR); strBuf.Buffer = lpBuffer; - nErrCode = RtlUnicodeStringToAnsiString(&strBuf, &wstrResStr, FALSE); + retSize = WideCharToMultiByte(CP_ACP, 0, wstrResStr.Buffer, wstrResStr.Length / sizeof(WCHAR), strBuf.Buffer, strBuf.MaximumLength, NULL, NULL); - if(!NT_SUCCESS(nErrCode)) - { + if(!retSize) /* failure */ - RtlNtStatusToDosError(nErrCode); return 0; - } + else + strBuf.Length = retSize; /* the ANSI string may not be null-terminated */ if(strBuf.Length >= strBuf.MaximumLength)

1 0

[greatlrd] 19844: Implmenet IDxDiagContainerImpl_GetNumberOfProps, IDxDiagContainerImpl_EnumPropNames, IDxDiagContainerImpl_GetProp working fine in windows but in reactos we are missing some regvalues (alot). This change should be commit to wine.
by greatlrd＠svn.reactos.com 03 Dec '05

03 Dec '05

Implmenet IDxDiagContainerImpl_GetNumberOfProps, IDxDiagContainerImpl_EnumPropNames, IDxDiagContainerImpl_GetProp working fine in windows but in reactos we are missing some regvalues (alot). This change should be commit to wine. Modified: trunk/reactos/lib/ddraw/ddraw.xml Modified: trunk/reactos/lib/devenum/devenum.xml Modified: trunk/reactos/lib/dplay/dplay.xml Modified: trunk/reactos/lib/dxdiagn/container.c Modified: trunk/reactos/lib/dxdiagn/dxdiag_private.h _____ Modified: trunk/reactos/lib/ddraw/ddraw.xml --- trunk/reactos/lib/ddraw/ddraw.xml 2005-12-03 19:40:52 UTC (rev 19843) +++ trunk/reactos/lib/ddraw/ddraw.xml 2005-12-03 20:53:23 UTC (rev 19844) @@ -1,5 +1,6 @@ <module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll"> - <importlibrary definition="ddraw.def" /> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> + <importlibrary definition="ddraw.def" /> <include base="ddraw">.</include> <define name="UNICODE" /> <define name="__USE_W32API" /> _____ Modified: trunk/reactos/lib/devenum/devenum.xml --- trunk/reactos/lib/devenum/devenum.xml 2005-12-03 19:40:52 UTC (rev 19843) +++ trunk/reactos/lib/devenum/devenum.xml 2005-12-03 20:53:23 UTC (rev 19844) @@ -1,4 +1,5 @@ <module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devenum.dll" allowwarnings="true"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="devenum.spec.def" /> <include base="devenum">.</include> <include base="ReactOS">include/wine</include> _____ Modified: trunk/reactos/lib/dplay/dplay.xml --- trunk/reactos/lib/dplay/dplay.xml 2005-12-03 19:40:52 UTC (rev 19843) +++ trunk/reactos/lib/dplay/dplay.xml 2005-12-03 20:53:23 UTC (rev 19844) @@ -1,4 +1,4 @@ -<module name="dplay" type="win32dll" baseaddress="${BASEADDRESS_DPLAY}" installbase="system32" installname="dplay.dll"> +<module name="dplay" type="win32dll" baseaddress="${BASEADDRESS_DPLAY}" installbase="system32" installname="dplay.dll"> <importlibrary definition="dplay.spec.def" /> <include base="dinput8">.</include> <include base="ReactOS">include/wine</include> _____ Modified: trunk/reactos/lib/dxdiagn/container.c --- trunk/reactos/lib/dxdiagn/container.c 2005-12-03 19:40:52 UTC (rev 19843) +++ trunk/reactos/lib/dxdiagn/container.c 2005-12-03 20:53:23 UTC (rev 19844) @@ -20,9 +20,9 @@ */ #include "config.h" -#include "dxdiag_private.h" #include "wine/debug.h" #include "wine/unicode.h" +#include "dxdiag_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); @@ -120,21 +120,73 @@ return E_INVALIDARG; } -HRESULT WINAPI IDxDiagContainerImpl_GetNumberOfProps(PDXDIAGCONTAINER iface, DWORD* pdwCount) { - /* IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; */ - FIXME("(%p, %p): stub\n", iface, pdwCount); +HRESULT WINAPI IDxDiagContainerImpl_GetNumberOfProps(PDXDIAGCONTAINER iface, DWORD* pdwCount) +{ + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + + + *pdwCount = This->nSubpProperty; + + TRACE("(%p)->(%ld)\n", iface, *pdwCount); + return S_OK; } HRESULT WINAPI IDxDiagContainerImpl_EnumPropNames(PDXDIAGCONTAINER iface, DWORD dwIndex, LPWSTR pwszPropName, DWORD cchPropName) { - /* IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; */ - FIXME("(%p, %lu, %s, %lu): stub\n", iface, dwIndex, debugstr_w(pwszPropName), cchPropName); - return S_OK; + + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + + if (This->pProperty == NULL) + { + + This->pProperty = (Contain_Property *)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(Contain_Property) *(dwIndex+1)); + + This->nSubpProperty = dwIndex+1; + } + else + { + if (dwIndex>=This->nSubpProperty) + { + This->pProperty = (Contain_Property *) HeapReAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, This->pProperty, + sizeof(Contain_Property) *(dwIndex+1)); + This->nSubpProperty = dwIndex+1; + } + + } + + lstrcpynW(pwszPropName, This->pProperty[dwIndex].pwszPropName, cchPropName); + + TRACE("(%p)->(%s)\n", iface, debugstr_w(This->pProperty[dwIndex].pwszPropName)); + return S_OK; } -HRESULT WINAPI IDxDiagContainerImpl_GetProp(PDXDIAGCONTAINER iface, LPCWSTR pwszPropName, VARIANT* pvarProp) { - /* IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; */ - FIXME("(%p, %s, %p): stub\n", iface, debugstr_w(pwszPropName), pvarProp); +HRESULT WINAPI IDxDiagContainerImpl_GetProp(PDXDIAGCONTAINER iface, LPCWSTR pwszPropName, VARIANT* pvarProp) +{ + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + Contain_Property *propert = This->pProperty; + TRACE("(%p)->(%s, %p)\n", iface, debugstr_w(pwszPropName), pvarProp); + + while (propert->pwszPropName && lstrcmpW(propert->pwszPropName, pwszPropName)) + { + propert += sizeof(Contain_Property); + } + + if (!propert->pwszPropName) + return E_INVALIDARG; + + /* FIXME + if (property->pvarProp == VT_EMPTY) + return E_INVALIDARG; + + if (property->pvarProp.vt == VT_ERROR) + return E_INVALIDARG; + */ + + memcpy(pvarProp,&propert->pvarProp, sizeof(VARIANT)); + return S_OK; } _____ Modified: trunk/reactos/lib/dxdiagn/dxdiag_private.h --- trunk/reactos/lib/dxdiagn/dxdiag_private.h 2005-12-03 19:40:52 UTC (rev 19843) +++ trunk/reactos/lib/dxdiagn/dxdiag_private.h 2005-12-03 20:53:23 UTC (rev 19844) @@ -48,6 +48,12 @@ /*********************************************************************** ****** * IDxDiagProvider implementation structure */ +typedef struct Contain_Property +{ + WCHAR *pwszPropName; + VARIANT pvarProp; +} Contain_Property; + struct IDxDiagProviderImpl { /* IUnknown fields */ IDxDiagProviderVtbl *lpVtbl; @@ -92,6 +98,8 @@ /* IDxDiagContainer fields */ IDxDiagContainerImpl_SubContainer* subContainers; DWORD nSubContainers; + Contain_Property* pProperty; + DWORD nSubpProperty; }; /* IUnknown: */

1 0

[gvg] 19843: Document (failed) attempt to optimize memcpy()
by gvg＠svn.reactos.com 03 Dec '05

03 Dec '05

Document (failed) attempt to optimize memcpy() Modified: trunk/reactos/lib/string/i386/memcpy_asm.s Added: trunk/reactos/media/doc/memcpy_optimize.txt _____ Modified: trunk/reactos/lib/string/i386/memcpy_asm.s --- trunk/reactos/lib/string/i386/memcpy_asm.s 2005-12-03 18:16:02 UTC (rev 19842) +++ trunk/reactos/lib/string/i386/memcpy_asm.s 2005-12-03 19:40:52 UTC (rev 19843) @@ -1,9 +1,7 @@ -/* - * $Id$ - */ - /* * void *memcpy (void *to, const void *from, size_t count) + * + * Some optimization research can be found in media/doc/memcpy_optimize.txt */ .globl _memcpy _____ Added: trunk/reactos/media/doc/memcpy_optimize.txt --- trunk/reactos/media/doc/memcpy_optimize.txt 2005-12-03 18:16:02 UTC (rev 19842) +++ trunk/reactos/media/doc/memcpy_optimize.txt 2005-12-03 19:40:52 UTC (rev 19843) @@ -0,0 +1,55 @@ +Surfing the Internet, I stumbled upon http://www.sciencemark.org where you +can download a benchmark program that (amongst others) can benchmark different +x86 memcpy implementations. Running that benchmark on my machine revealed that +the fastest implementation was roughly twice as fast as the "rep movsl" +implementation (lib/string/i386/memcpy_asm.s) that ReactOS uses. +To test the alternate implementations in a ReactOS setting, I first +instrumented the existing memcpy implementation to log with which arguments +it was being called. I then booted ReactOS, started a background compile in it +(to generate some I/O) and played a game of Solitaire (to generate graphics +operations). After loosing the game, I shut down ReactOS. I then extracted +the memcpy calls roughly between the start of Explorer (to get rid of one time +startup effects) an shutdown. The resulting call profile is attached below. +I then used that profile to make calls to the existing memcpy and an alternate +implementation (I selected the "MMX registry copy with SSE prefetching"), +taking care to use different source and destination regions to remove caching +effects. The profile consisted of roughly 250000 calls to memcpy, I found +that I had to execute the profile 10000 times to get "reasonable" time values. +To compensate for the overhead of the test program, I also ran a test where +the whole memcpy routine consisted of a single instruction: "ret". The test +results, after applying a correction for the overhead: + +rep movl 70.5 sec +mmx registers 58.3 sec +Speed increase: 17% + +(Test machine: AMD Athlon MP 2800+ running Linux). +Although the relative speed increase is nice (17%), we also have to look at the +absolute speed increase. Remember that the 70.5 sec for the "rep movl" case +was obtained by running the whole profile 10000 times. This means that all the +memcpy's executed during the profiling run of ReactOS together took only +0.00705 seconds. So the conclusion has to be that we're simply not spending +a significant amount of time in memcpy (BTW, our memcpy implementation is +shared between kernel and user mode, of the total of 250000 memcpy calls about +90% were made from kernel mode and 10% from user mode), so optimizing memcpy +(although possible) will not result in a significant better performance of +ReactOS as a whole. +Just for fun, I then used only the part of the profile where the memory area +was larger than 128 bytes. The MMX implementation actually only runs for sizes +over 128 bytes, for smaller sizes it deferred to the "rep movl" implementation. +According to the profile, the vast majority of memcpy calls is made with a +size smaller than 128 bytes (96.8%). + +rep movl 52.9 sec +mmx registers 27.1 sec +Speed increase 48% + +This is more or less in line with the results I got from the membench benchmark +from http://www.sciencemark.org. + +Final conclusion: Although optimizing memcpy is useful (and feasible) for +transfer of large blocks, the usage pattern in ReactOS consists mostly of +small blocks. The resulting absolute spead increase doesn't justify the +increased code complexity. + +2005/12/03 GvG Property changes on: trunk/reactos/media/doc/memcpy_optimize.txt ___________________________________________________________________ Name: svn:eol-style + native

1 0

[weiden] 19842: get the root fcb when creating a file and no parent fcb is returned
by weiden＠svn.reactos.com 03 Dec '05

03 Dec '05

get the root fcb when creating a file and no parent fcb is returned Modified: trunk/reactos/drivers/fs/vfat/create.c _____ Modified: trunk/reactos/drivers/fs/vfat/create.c --- trunk/reactos/drivers/fs/vfat/create.c 2005-12-03 17:33:41 UTC (rev 19841) +++ trunk/reactos/drivers/fs/vfat/create.c 2005-12-03 18:16:02 UTC (rev 19842) @@ -564,6 +564,11 @@ RequestedDisposition == FILE_SUPERSEDE) { ULONG Attributes; + if (ParentFcb == NULL) + { + ParentFcb = vfatOpenRootFCB (DeviceExt); + ASSERT(ParentFcb != NULL); + } Attributes = Stack->Parameters.Create.FileAttributes; vfatSplitPathName(&PathNameU, NULL, &FileNameU); @@ -600,7 +605,10 @@ } else { - vfatReleaseFCB (DeviceExt, ParentFcb); + if (ParentFcb) + { + vfatReleaseFCB (DeviceExt, ParentFcb); + } return(Status); } }

1 0

[weiden] 19841: fixed prototype of GdiGetCharDimensions
by weiden＠svn.reactos.com 03 Dec '05

03 Dec '05

fixed prototype of GdiGetCharDimensions Modified: trunk/reactos/lib/gdi32/objects/font.c Modified: trunk/reactos/lib/user32/include/user32.h _____ Modified: trunk/reactos/lib/gdi32/objects/font.c --- trunk/reactos/lib/gdi32/objects/font.c 2005-12-03 17:21:37 UTC (rev 19840) +++ trunk/reactos/lib/gdi32/objects/font.c 2005-12-03 17:33:41 UTC (rev 19841) @@ -818,7 +818,7 @@ */ DWORD STDCALL -GdiGetCharDimensions(HDC hdc, LPTEXTMETRICW lptm, DWORD *height) +GdiGetCharDimensions(HDC hdc, LPTEXTMETRICW lptm, LONG *height) { SIZE sz; static const WCHAR alphabet[] = { _____ Modified: trunk/reactos/lib/user32/include/user32.h --- trunk/reactos/lib/user32/include/user32.h 2005-12-03 17:21:37 UTC (rev 19840) +++ trunk/reactos/lib/user32/include/user32.h 2005-12-03 17:33:41 UTC (rev 19841) @@ -42,4 +42,4 @@ /* FIXME: FILIP */ HGDIOBJ STDCALL NtGdiSelectObject(HDC hDC, HGDIOBJ hGDIObj); -DWORD STDCALL GdiGetCharDimensions(HDC, LPTEXTMETRICW, DWORD *); +DWORD STDCALL GdiGetCharDimensions(HDC, LPTEXTMETRICW, LONG *);

1 0

[sgasiorek] 19840: fixes from Wine.
by sgasiorek＠svn.reactos.com 03 Dec '05

03 Dec '05

fixes from Wine. user32 dialog test: 55 executes, 7 failures Modified: trunk/reactos/lib/user32/windows/dialog.c Modified: trunk/reactos/lib/user32/windows/message.c _____ Modified: trunk/reactos/lib/user32/windows/dialog.c --- trunk/reactos/lib/user32/windows/dialog.c 2005-12-03 16:42:41 UTC (rev 19839) +++ trunk/reactos/lib/user32/windows/dialog.c 2005-12-03 17:21:37 UTC (rev 19840) @@ -848,8 +848,8 @@ return hwnd; } + if (modal && ownerEnabled) DIALOG_EnableOwner(owner); if( IsWindow(hwnd) ) DestroyWindow( hwnd ); - if (modal && ownerEnabled) DIALOG_EnableOwner(owner); return 0; } @@ -917,43 +917,93 @@ */ static HWND DEFDLG_FindDefButton( HWND hwndDlg ) { - HWND hwndChild = GetWindow( hwndDlg, GW_CHILD ); + HWND hwndChild, hwndTmp; + + hwndChild = GetWindow( hwndDlg, GW_CHILD ); while (hwndChild) { if (SendMessageW( hwndChild, WM_GETDLGCODE, 0, 0 ) & DLGC_DEFPUSHBUTTON) break; + + /* Recurse into WS_EX_CONTROLPARENT controls */ + if (GetWindowLongW( hwndChild, GWL_EXSTYLE ) & WS_EX_CONTROLPARENT) + { + LONG dsStyle = GetWindowLongW( hwndChild, GWL_STYLE ); + if ((dsStyle & WS_VISIBLE) && !(dsStyle & WS_DISABLED) && + (hwndTmp = DEFDLG_FindDefButton(hwndChild)) != NULL) + return hwndTmp; + } hwndChild = GetWindow( hwndChild, GW_HWNDNEXT ); } return hwndChild; } /*********************************************************************** - * DEFDLG_SetDefButton + * DEFDLG_SetDefId * - * Set the new default button to be hwndNew. + * Set the default button id. */ -static BOOL DEFDLG_SetDefButton( HWND hwndDlg, DIALOGINFO *dlgInfo, - HWND hwndNew ) +static BOOL DEFDLG_SetDefId( HWND hwndDlg, DIALOGINFO *dlgInfo, WPARAM wParam) { DWORD dlgcode=0; /* initialize just to avoid a warning */ + HWND hwndOld, hwndNew = GetDlgItem(hwndDlg, wParam); + INT old_id = dlgInfo->idResult; + + dlgInfo->idResult = wParam; if (hwndNew && !((dlgcode=SendMessageW(hwndNew, WM_GETDLGCODE, 0, 0 )) & (DLGC_UNDEFPUSHBUTTON | DLGC_BUTTON))) return FALSE; /* Destination is not a push button */ - if (dlgInfo->idResult) /* There's already a default pushbutton */ + /* Make sure the old default control is a valid push button ID */ + hwndOld = GetDlgItem( hwndDlg, old_id ); + if (!hwndOld || !(SendMessageA( hwndOld, WM_GETDLGCODE, 0, 0) & DLGC_DEFPUSHBUTTON)) + hwndOld = DEFDLG_FindDefButton( hwndDlg ); + if (hwndOld && hwndOld != hwndNew) + SendMessageA( hwndOld, BM_SETSTYLE, BS_PUSHBUTTON, TRUE ); + + if (hwndNew) { - HWND hwndOld = GetDlgItem( hwndDlg, dlgInfo->idResult ); - if (SendMessageA( hwndOld, WM_GETDLGCODE, 0, 0) & DLGC_DEFPUSHBUTTON) - SendMessageA( hwndOld, BM_SETSTYLE, BS_PUSHBUTTON, TRUE ); + if(dlgcode & DLGC_UNDEFPUSHBUTTON) + SendMessageA( hwndNew, BM_SETSTYLE, BS_DEFPUSHBUTTON, TRUE ); } + return TRUE; +} + +/********************************************************************** * + * DEFDLG_SetDefButton + * + * Set the new default button to be hwndNew. + */ +static BOOL DEFDLG_SetDefButton( HWND hwndDlg, DIALOGINFO *dlgInfo, HWND hwndNew ) +{ + DWORD dlgcode=0; /* initialize just to avoid a warning */ + HWND hwndOld = GetDlgItem( hwndDlg, dlgInfo->idResult ); + + if (hwndNew && + !((dlgcode=SendMessageW(hwndNew, WM_GETDLGCODE, 0, 0 )) + & (DLGC_UNDEFPUSHBUTTON | DLGC_DEFPUSHBUTTON))) + { + /** + * Need to draw only default push button rectangle. + * Since the next control is not a push button, need to draw the push + * button rectangle for the default control. + */ + hwndNew = hwndOld; + dlgcode = SendMessageW(hwndNew, WM_GETDLGCODE, 0, 0 ); + } + + /* Make sure the old default control is a valid push button ID */ + if (!hwndOld || !(SendMessageA( hwndOld, WM_GETDLGCODE, 0, 0) & DLGC_DEFPUSHBUTTON)) + hwndOld = DEFDLG_FindDefButton( hwndDlg ); + if (hwndOld && hwndOld != hwndNew) + SendMessageA( hwndOld, BM_SETSTYLE, BS_PUSHBUTTON, TRUE ); + if (hwndNew) { - if(dlgcode==DLGC_UNDEFPUSHBUTTON) + if(dlgcode & DLGC_UNDEFPUSHBUTTON) SendMessageA( hwndNew, BM_SETSTYLE, BS_DEFPUSHBUTTON, TRUE ); - dlgInfo->idResult = GetDlgCtrlID( hwndNew ); } - else dlgInfo->idResult = 0; return TRUE; } @@ -1013,7 +1063,7 @@ case DM_SETDEFID: if (dlgInfo && !(dlgInfo->flags & DF_END)) - DEFDLG_SetDefButton( hwnd, dlgInfo, wParam ? GetDlgItem( hwnd, wParam ) : 0 ); + DEFDLG_SetDefId( hwnd, dlgInfo, wParam ); return 1; case DM_GETDEFID: @@ -2094,99 +2144,70 @@ } #endif +/********************************************************************** * + * DIALOG_FixOneChildOnChangeFocus + * + * Callback helper for DIALOG_FixChildrenOnChangeFocus + */ -/* - * @implemented +static BOOL CALLBACK DIALOG_FixOneChildOnChangeFocus (HWND hwndChild, + LPARAM lParam) +{ + /* If a default pushbutton then no longer default */ + if (DLGC_DEFPUSHBUTTON & SendMessageW (hwndChild, WM_GETDLGCODE, 0, 0)) + SendMessageW (hwndChild, BM_SETSTYLE, BS_PUSHBUTTON, TRUE); + return TRUE; +} + +/********************************************************************** * + * DIALOG_FixChildrenOnChangeFocus + * + * Following the change of focus that occurs for example after handling + * a WM_KEYDOWN VK_TAB in IsDialogMessage, some tidying of the dialog's + * children may be required. */ -BOOL -STDCALL -IsDialogMessageA( - HWND hDlg, - LPMSG lpMsg) +static void DIALOG_FixChildrenOnChangeFocus (HWND hwndDlg, HWND hwndNext) { - INT dlgCode = 0; + INT dlgcode_next = SendMessageW (hwndNext, WM_GETDLGCODE, 0, 0); + /* INT dlgcode_dlg = SendMessageW (hwndDlg, WM_GETDLGCODE, 0, 0); */ + /* Windows does ask for this. I don't know why yet */ - // FIXME: hooks - if (CallMsgFilterA( lpMsg, MSGF_DIALOGBOX )) return TRUE; + EnumChildWindows (hwndDlg, DIALOG_FixOneChildOnChangeFocus, 0); - if ((hDlg != lpMsg->hwnd) && !IsChild( hDlg, lpMsg->hwnd )) return FALSE; - - hDlg = DIALOG_FindMsgDestination(hDlg); - - switch(lpMsg->message) - { - case WM_KEYDOWN: - dlgCode = SendMessageA( lpMsg->hwnd, WM_GETDLGCODE, lpMsg->wParam, (LPARAM)lpMsg ); - if (dlgCode & DLGC_WANTMESSAGE) break; - - switch(lpMsg->wParam) - { - case VK_TAB: - if (!(dlgCode & DLGC_WANTTAB)) - { - SendMessageA( hDlg, WM_NEXTDLGCTL, (GetKeyState(VK_SHIFT) & 0x8000), 0 ); - return TRUE; - } - break; - - case VK_RIGHT: - case VK_DOWN: - case VK_LEFT: - case VK_UP: - if (!(dlgCode & DLGC_WANTARROWS)) - { - BOOL fPrevious = (lpMsg->wParam == VK_LEFT || lpMsg->wParam == VK_UP); - HWND hwndNext = GetNextDlgGroupItem (hDlg, GetFocus(), fPrevious ); - SendMessageA( hDlg, WM_NEXTDLGCTL, (WPARAM)hwndNext, 1 ); - return TRUE; - } - break; - - case VK_CANCEL: - case VK_ESCAPE: - SendMessageA( hDlg, WM_COMMAND, IDCANCEL, (LPARAM)GetDlgItem( hDlg, IDCANCEL ) ); - return TRUE; - - case VK_EXECUTE: - case VK_RETURN: - { - DWORD dw = SendMessageA( hDlg, DM_GETDEFID, 0, 0 ); - if (HIWORD(dw) == DC_HASDEFID) - { - SendMessageA( hDlg, WM_COMMAND, MAKEWPARAM( LOWORD(dw), BN_CLICKED ), - (LPARAM)GetDlgItem(hDlg, LOWORD(dw))); - } - else - { - SendMessageA( hDlg, WM_COMMAND, IDOK, (LPARAM)GetDlgItem( hDlg, IDOK ) ); - - } - } - return TRUE; - } - break; - - case WM_CHAR: - dlgCode = SendMessageA( lpMsg->hwnd, WM_GETDLGCODE, lpMsg->wParam, (LPARAM)lpMsg ); - if (dlgCode & (DLGC_WANTCHARS|DLGC_WANTMESSAGE)) break; - if (lpMsg->wParam == '\t' && (dlgCode & DLGC_WANTTAB)) break; - /* drop through */ - - case WM_SYSCHAR: - if (DIALOG_IsAccelerator( lpMsg->hwnd, hDlg, lpMsg->wParam )) - { - /* don't translate or dispatch */ - return TRUE; - } - break; - } - - TranslateMessage( lpMsg ); - DispatchMessageA( lpMsg ); - return TRUE; + /* If the button that is getting the focus WAS flagged as the default + * pushbutton then ask the dialog what it thinks the default is and + * set that in the default style. + */ + if (dlgcode_next & DLGC_DEFPUSHBUTTON) + { + DWORD def_id = SendMessageW (hwndDlg, DM_GETDEFID, 0, 0); + if (HIWORD(def_id) == DC_HASDEFID) + { + HWND hwndDef; + def_id = LOWORD(def_id); + hwndDef = GetDlgItem (hwndDlg, def_id); + if (hwndDef) + { + INT dlgcode_def = SendMessageW (hwndDef, WM_GETDLGCODE, 0, 0); + /* I know that if it is a button then it should already be a + * UNDEFPUSHBUTTON, since we have just told the buttons to + * change style. But maybe they ignored our request + */ + if ((dlgcode_def & DLGC_BUTTON) && + (dlgcode_def & DLGC_UNDEFPUSHBUTTON)) + { + SendMessageW (hwndDef, BM_SETSTYLE, BS_DEFPUSHBUTTON, TRUE); + } + } + } + } + else if ((dlgcode_next & DLGC_BUTTON) && (dlgcode_next & DLGC_UNDEFPUSHBUTTON)) + { + SendMessageW (hwndNext, BM_SETSTYLE, BS_DEFPUSHBUTTON, TRUE); + /* I wonder why it doesn't send a DM_SETDEFID */ + } } - /* * @implemented */ @@ -2214,13 +2235,53 @@ switch(lpMsg->wParam) { case VK_TAB: - if (!(dlgCode & DLGC_WANTTAB)) - { - SendMessageW( hDlg, WM_NEXTDLGCTL, (GetKeyState(VK_SHIFT) & 0x8000), 0 ); - return TRUE; - } - break; + if (!(dlgCode & DLGC_WANTTAB)) + { + /* I am not sure under which circumstances the TAB is handled + * each way. All I do know is that it does not always simply + * send WM_NEXTDLGCTL. (Personally I have never yet seen it + * do so but I presume someone has) + */ + if (GETDLGINFO(hDlg)) + SendMessageW( hDlg, WM_NEXTDLGCTL, (GetKeyState(VK_SHIFT) & 0x8000), 0 ); + else + { + /* It would appear that GetNextDlgTabItem can handle being + * passed hwndDlg rather than NULL but that is undocumented + * so let's do it properly + */ + HWND hwndFocus = GetFocus(); + HWND hwndNext = GetNextDlgTabItem (hDlg, + hwndFocus == hDlg ? NULL : hwndFocus, + GetKeyState (VK_SHIFT) & 0x8000); + if (hwndNext) + { + dlgCode = SendMessageW (hwndNext, WM_GETDLGCODE, + lpMsg->wParam, (LPARAM)lpMsg); + if (dlgCode & DLGC_HASSETSEL) + { + INT maxlen = 1 + SendMessageW (hwndNext, WM_GETTEXTLENGTH, 0, 0); + WCHAR *buffer = HeapAlloc (GetProcessHeap(), 0, maxlen * sizeof(WCHAR)); + if (buffer) + { + INT length; + SendMessageW (hwndNext, WM_GETTEXT, maxlen, (LPARAM) buffer); + length = wcslen (buffer); + HeapFree (GetProcessHeap(), 0, buffer); + SendMessageW (hwndNext, EM_SETSEL, 0, length); + } + } + SetFocus (hwndNext); + DIALOG_FixChildrenOnChangeFocus (hDlg, hwndNext); + } + else + return FALSE; + } + return TRUE; + } + break; + case VK_RIGHT: case VK_DOWN: case VK_LEFT: @@ -2241,10 +2302,15 @@ case VK_EXECUTE: case VK_RETURN: - { - DWORD dw = SendMessageW( hDlg, DM_GETDEFID, 0, 0 ); - if (HIWORD(dw) == DC_HASDEFID) + { + DWORD dw; + if ((GetFocus() == lpMsg->hwnd) && + (SendMessageW (lpMsg->hwnd, WM_GETDLGCODE, 0, 0) & DLGC_DEFPUSHBUTTON)) { + SendMessageW (hDlg, WM_COMMAND, MAKEWPARAM (GetDlgCtrlID(lpMsg->hwnd),BN_CLICKED), (LPARAM)lpMsg->hwnd); + } + else if (DC_HASDEFID == HIWORD(dw = SendMessageW (hDlg, DM_GETDEFID, 0, 0))) + { SendMessageW( hDlg, WM_COMMAND, MAKEWPARAM( LOWORD(dw), BN_CLICKED ), (LPARAM)GetDlgItem(hDlg, LOWORD(dw))); } @@ -2449,4 +2515,3 @@ return EnumChildWindows(hDlg, CheckRB, (LPARAM)&radioGroup); } - _____ Modified: trunk/reactos/lib/user32/windows/message.c --- trunk/reactos/lib/user32/windows/message.c 2005-12-03 16:42:41 UTC (rev 19839) +++ trunk/reactos/lib/user32/windows/message.c 2005-12-03 17:21:37 UTC (rev 19840) @@ -2114,3 +2114,55 @@ return TRUE; } + +/********************************************************************** * + * map_wparam_AtoW + * + * Convert the wparam of an ASCII message to Unicode. + */ +static WPARAM +map_wparam_AtoW( UINT message, WPARAM wparam ) +{ + switch(message) + { + case WM_CHARTOITEM: + case EM_SETPASSWORDCHAR: + case WM_CHAR: + case WM_DEADCHAR: + case WM_SYSCHAR: + case WM_SYSDEADCHAR: + case WM_MENUCHAR: + { + char ch[2]; + WCHAR wch[2]; + ch[0] = (wparam & 0xff); + ch[1] = (wparam >> 8); + MultiByteToWideChar(CP_ACP, 0, ch, 2, wch, 2); + wparam = MAKEWPARAM(wch[0], wch[1]); + } + break; + case WM_IME_CHAR: + { + char ch[2]; + WCHAR wch; + ch[0] = (wparam >> 8); + ch[1] = (wparam & 0xff); + if (ch[0]) MultiByteToWideChar(CP_ACP, 0, ch, 2, &wch, 1); + else MultiByteToWideChar(CP_ACP, 0, &ch[1], 1, &wch, 1); + wparam = MAKEWPARAM( wch, HIWORD(wparam) ); + } + break; + } + return wparam; +} + +/* + * @implemented + */ +BOOL WINAPI +IsDialogMessageA( HWND hwndDlg, LPMSG pmsg ) +{ + MSG msg = *pmsg; + msg.wParam = map_wparam_AtoW( msg.message, msg.wParam ); + return IsDialogMessageW( hwndDlg, &msg ); +}

1 0

[weiden] 19839: partly implemented DeviceProblemWizardA/W
by weiden＠svn.reactos.com 03 Dec '05

03 Dec '05

partly implemented DeviceProblemWizardA/W Modified: trunk/reactos/lib/devmgr/En.rc Modified: trunk/reactos/lib/devmgr/advprop.c Modified: trunk/reactos/lib/devmgr/devmgr.xml Added: trunk/reactos/lib/devmgr/devprblm.c Modified: trunk/reactos/lib/devmgr/precomp.h Modified: trunk/reactos/lib/devmgr/resource.h Modified: trunk/reactos/lib/devmgr/stubs.c _____ Modified: trunk/reactos/lib/devmgr/En.rc --- trunk/reactos/lib/devmgr/En.rc 2005-12-03 15:26:36 UTC (rev 19838) +++ trunk/reactos/lib/devmgr/En.rc 2005-12-03 16:42:41 UTC (rev 19839) @@ -17,6 +17,8 @@ IDS_UNKNOWNDEVICE "Unknown device" IDS_NODRIVERLOADED "No drivers are installed for this device." IDS_DEVONPARENT "on %1" + IDS_TROUBLESHOOTDEV "&Troubleshoot..." + IDS_ENABLEDEV "E&nable Device" END STRINGTABLE @@ -104,7 +106,7 @@ EDITTEXT IDC_DEVLOCATION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY GROUPBOX "Device status", IDC_DEVSTATUSGROUP, 7, 83, 238, 100 EDITTEXT IDC_DEVSTATUS, 14, 96, 224, 61, NOT WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL - PUSHBUTTON "&Troubleshoot...", IDC_TROUBLESHOOT, 148, 163, 90, 15 + PUSHBUTTON "&Troubleshoot...", IDC_DEVPROBLEM, 148, 163, 90, 15 LTEXT "&Device usage:", IDC_DEVUSAGELABEL, 7, 188, 222, 8, WS_DISABLED COMBOBOX IDC_DEVUSAGE, 7, 198, 239, 40, CBS_DROPDOWNLIST | WS_VSCROLL | WS_DISABLED END _____ Modified: trunk/reactos/lib/devmgr/advprop.c --- trunk/reactos/lib/devmgr/advprop.c 2005-12-03 15:26:36 UTC (rev 19838) +++ trunk/reactos/lib/devmgr/advprop.c 2005-12-03 16:42:41 UTC (rev 19839) @@ -218,8 +218,10 @@ IN BOOL ReOpen) { HICON hIcon; - HWND hDevUsage; - HWND hPropSheetDlg; + HWND hDevUsage, hPropSheetDlg, hDevProbBtn; + CONFIGRET cr; + ULONG Status, ProblemNumber; + UINT TroubleShootStrId = IDS_TROUBLESHOOTDEV; BOOL bFlag; DWORD i; HDEVINFO DeviceInfoSet = NULL; @@ -458,6 +460,31 @@ dap->szTemp); } + /* set the device troubleshoot button text and disable it if necessary */ + hDevProbBtn = GetDlgItem(hwndDlg, + IDC_DEVPROBLEM); + EnableWindow(hDevProbBtn, + dap->IsAdmin); + cr = CM_Get_DevNode_Status_Ex(&Status, + &ProblemNumber, + DeviceInfoData->DevInst, + 0, + dap->hMachine); + if (cr == CR_SUCCESS && + (Status & DN_HAS_PROBLEM) && ProblemNumber == CM_PROB_DISABLED) + { + TroubleShootStrId = IDS_ENABLEDEV; + } + + if (LoadString(hDllInstance, + TroubleShootStrId, + dap->szTemp, + sizeof(dap->szTemp) / sizeof(dap->szTemp[0])) != 0) + { + SetWindowText(hDevProbBtn, + dap->szTemp); + } + /* check if the device can be enabled/disabled */ hDevUsage = GetDlgItem(hwndDlg, IDC_DEVUSAGE); @@ -579,6 +606,19 @@ } break; } + + case IDC_DEVPROBLEM: + { + if (dap->IsAdmin) + { + /* display the device problem wizard */ + ShowDeviceProblemWizard(hwndDlg, + dap->DeviceInfoSet, + &dap->DeviceInfoData, + dap->hMachine); + } + break; + } } break; } @@ -959,6 +999,12 @@ HINSTANCE hComCtl32; INT_PTR Ret = -1; + if (lpDeviceID == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + /* dynamically load comctl32 */ hComCtl32 = LoadAndInitComctl32(); if (hComCtl32 != NULL) @@ -1072,7 +1118,8 @@ * ARGUMENTS * hWndParent: Handle to the parent window * lpMachineName: Machine Name, NULL is the local machine - * lpDeviceID: Specifies the device whose properties are to be shown + * lpDeviceID: Specifies the device whose properties are to be shown, optional if + * bShowDevMgr is nonzero * dwFlags: This parameter can be a combination of the following flags: * * DPF_DEVICE_STATUS_ACTION: Only valid if bShowDevMgr, causes * the default device status action button @@ -1150,7 +1197,8 @@ * ARGUMENTS * hWndParent: Handle to the parent window * lpMachineName: Machine Name, NULL is the local machine - * lpDeviceID: Specifies the device whose properties are to be shown + * lpDeviceID: Specifies the device whose properties are to be shown, optional if + * bShowDevMgr is nonzero * dwFlags: This parameter can be a combination of the following flags: * * DPF_DEVICE_STATUS_ACTION: Only valid if bShowDevMgr, causes * the default device status action button _____ Modified: trunk/reactos/lib/devmgr/devmgr.xml --- trunk/reactos/lib/devmgr/devmgr.xml 2005-12-03 15:26:36 UTC (rev 19838) +++ trunk/reactos/lib/devmgr/devmgr.xml 2005-12-03 16:42:41 UTC (rev 19839) @@ -15,6 +15,7 @@ <library>user32</library> <file>devmgr.rc</file> <file>advprop.c</file> + <file>devprblm.c</file> <file>hwpage.c</file> <file>misc.c</file> <file>stubs.c</file> _____ Added: trunk/reactos/lib/devmgr/devprblm.c --- trunk/reactos/lib/devmgr/devprblm.c 2005-12-03 15:26:36 UTC (rev 19838) +++ trunk/reactos/lib/devmgr/devprblm.c 2005-12-03 16:42:41 UTC (rev 19839) @@ -0,0 +1,212 @@ +/* + * ReactOS Device Manager Applet + * Copyright (C) 2004 - 2005 ReactOS Team + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +/* $Id: hwpage.c 19599 2005-11-26 02:12:58Z weiden $ + * + * PROJECT: ReactOS devmgr.dll + * FILE: lib/devmgr/devprblm.c + * PURPOSE: ReactOS Device Manager + * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> + * UPDATE HISTORY: + * 04-04-2004 Created + */ +#include <precomp.h> + +#define NDEBUG +#include <debug.h> + + +BOOL +ShowDeviceProblemWizard(IN HWND hWndParent OPTIONAL, + IN HDEVINFO hDevInfo, + IN PSP_DEVINFO_DATA DevInfoData, + IN HMACHINE hMachine OPTIONAL) +{ + CONFIGRET cr; + ULONG Status, ProblemNumber; + BOOL Ret = FALSE; + + cr = CM_Get_DevNode_Status_Ex(&Status, + &ProblemNumber, + DevInfoData->DevInst, + 0, + hMachine); + if (cr == CR_SUCCESS && (Status & DN_HAS_PROBLEM)) + { + switch (ProblemNumber) + { + case CM_PROB_DISABLED: + { + /* FIXME - display the "Enable Device" wizard */ + break; + } + + default: + { + /* FIXME - troubleshoot the device */ + break; + } + } + } + + return Ret; +} + + +/********************************************************************** ***** + * NAME EXPORTED + * DeviceProblemWizardA + * + * DESCRIPTION + * Calls the device problem wizard + * + * ARGUMENTS + * hWndParent: Handle to the parent window + * lpMachineName: Machine Name, NULL is the local machine + * lpDeviceID: Specifies the device, also see NOTEs + * + * RETURN VALUE + * TRUE: if no errors occured + * FALSE: if errors occured + * + * @implemented + */ +BOOL +WINAPI +DeviceProblemWizardA(IN HWND hWndParent OPTIONAL, + IN LPCSTR lpMachineName OPTIONAL, + IN LPCSTR lpDeviceID) +{ + LPWSTR lpMachineNameW = NULL; + LPWSTR lpDeviceIDW = NULL; + BOOL Ret = FALSE; + + if (lpMachineName != NULL) + { + if (!(lpMachineNameW = ConvertMultiByteToUnicode(lpMachineName, + CP_ACP))) + { + goto Cleanup; + } + } + if (lpDeviceID != NULL) + { + if (!(lpDeviceIDW = ConvertMultiByteToUnicode(lpDeviceID, + CP_ACP))) + { + goto Cleanup; + } + } + + Ret = DeviceProblemWizardW(hWndParent, + lpMachineNameW, + lpDeviceIDW); + +Cleanup: + if (lpMachineNameW != NULL) + { + HeapFree(GetProcessHeap(), + 0, + lpMachineNameW); + } + if (lpDeviceIDW != NULL) + { + HeapFree(GetProcessHeap(), + 0, + lpDeviceIDW); + } + + return Ret; +} + + +/********************************************************************** ***** + * NAME EXPORTED + * DeviceProblemWizardW + * + * DESCRIPTION + * Calls the device problem wizard + * + * ARGUMENTS + * hWndParent: Handle to the parent window + * lpMachineName: Machine Name, NULL is the local machine + * lpDeviceID: Specifies the device, also see NOTEs + * + * RETURN VALUE + * TRUE: if no errors occured + * FALSE: if errors occured + * + * @unimplemented + */ +BOOL +WINAPI +DeviceProblemWizardW(IN HWND hWndParent OPTIONAL, + IN LPCWSTR lpMachineName OPTIONAL, + IN LPCWSTR lpDeviceID) +{ + HDEVINFO hDevInfo; + SP_DEVINFO_DATA DevInfoData; + HINSTANCE hComCtl32; + CONFIGRET cr; + HMACHINE hMachine; + BOOL Ret = FALSE; + + if (lpDeviceID == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* dynamically load comctl32 */ + hComCtl32 = LoadAndInitComctl32(); + if (hComCtl32 != NULL) + { + hDevInfo = SetupDiCreateDeviceInfoListEx(NULL, + hWndParent, + lpMachineName, + NULL); + if (hDevInfo != INVALID_HANDLE_VALUE) + { + cr = CM_Connect_Machine(lpMachineName, + &hMachine); + if (cr == CR_SUCCESS) + { + DevInfoData.cbSize = sizeof(SP_DEVINFO_DATA); + if (SetupDiOpenDeviceInfo(hDevInfo, + lpDeviceID, + hWndParent, + 0, + &DevInfoData)) + { + Ret = ShowDeviceProblemWizard(hWndParent, + hDevInfo, + &DevInfoData, + hMachine); + } + + CM_Disconnect_Machine(hMachine); + } + + SetupDiDestroyDeviceInfoList(hDevInfo); + } + + FreeLibrary(hComCtl32); + } + + return Ret; +} Property changes on: trunk/reactos/lib/devmgr/devprblm.c ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/devmgr/precomp.h --- trunk/reactos/lib/devmgr/precomp.h 2005-12-03 15:26:36 UTC (rev 19838) +++ trunk/reactos/lib/devmgr/precomp.h 2005-12-03 16:42:41 UTC (rev 19839) @@ -71,18 +71,18 @@ LPWSTR lpString, UINT uMaxString); -WINBOOL +BOOL WINAPI -DeviceProblemWizardA(HWND hWndParent, - LPCSTR lpMachineName, - LPCSTR lpDeviceID); +DeviceProblemWizardA(IN HWND hWndParent OPTIONAL, + IN LPCSTR lpMachineName OPTIONAL, + IN LPCSTR lpDeviceID); -WINBOOL +BOOL WINAPI -DeviceProblemWizardW(HWND hWndParent, - LPCWSTR lpMachineName, - LPCWSTR lpDeviceID); +DeviceProblemWizardW(IN HWND hWndParent OPTIONAL, + IN LPCWSTR lpMachineName OPTIONAL, + IN LPCWSTR lpDeviceID); VOID WINAPI @@ -200,6 +200,14 @@ IN LPCWSTR lpMachineName, IN DWORD dwFlags); +/* DEVPRBLM.C */ + +BOOL +ShowDeviceProblemWizard(IN HWND hWndParent OPTIONAL, + IN HDEVINFO hDevInfo, + IN PSP_DEVINFO_DATA DevInfoData, + IN HMACHINE hMachine OPTIONAL); + /* MISC.C */ DWORD _____ Modified: trunk/reactos/lib/devmgr/resource.h --- trunk/reactos/lib/devmgr/resource.h 2005-12-03 15:26:36 UTC (rev 19838) +++ trunk/reactos/lib/devmgr/resource.h 2005-12-03 16:42:41 UTC (rev 19839) @@ -23,8 +23,8 @@ #define IDC_TROUBLESHOOT 0x589 #define IDC_PROPERTIES 0x58A #define IDC_DEVUSAGELABEL 0x58B +#define IDC_DEVPROBLEM 0x58C - #define IDS_NAME 0x100 #define IDS_TYPE 0x101 #define IDS_MANUFACTURER 0x102 @@ -38,6 +38,8 @@ #define IDS_UNKNOWNDEVICE 0x10A #define IDS_NODRIVERLOADED 0x10B #define IDS_DEVONPARENT 0x10C +#define IDS_TROUBLESHOOTDEV 0x10D +#define IDS_ENABLEDEV 0x10E #define IDS_DEV_NO_PROBLEM 0x200 #define IDS_DEV_NOT_CONFIGURED 0x201 _____ Modified: trunk/reactos/lib/devmgr/stubs.c --- trunk/reactos/lib/devmgr/stubs.c 2005-12-03 15:26:36 UTC (rev 19838) +++ trunk/reactos/lib/devmgr/stubs.c 2005-12-03 16:42:41 UTC (rev 19839) @@ -318,72 +318,6 @@ /*********************************************************************** **** * NAME EXPORTED - * DeviceProblemWizardA - * - * DESCRIPTION - * Calls the device problem wizard - * - * ARGUMENTS - * hWndParent: Handle to the parent window - * lpMachineName: Machine Name, NULL is the local machine - * lpDeviceID: Specifies the device, also see NOTEs - * - * RETURN VALUE - * TRUE: if no errors occured - * FALSE: if errors occured - * - * REVISIONS - * - * NOTE - * - * @unimplemented - */ -WINBOOL -WINAPI -DeviceProblemWizardA(HWND hWndParent, - LPCSTR lpMachineName, - LPCSTR lpDeviceID) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/********************************************************************** ***** - * NAME EXPORTED - * DeviceProblemWizardW - * - * DESCRIPTION - * Calls the device problem wizard - * - * ARGUMENTS - * hWndParent: Handle to the parent window - * lpMachineName: Machine Name, NULL is the local machine - * lpDeviceID: Specifies the device, also see NOTEs - * - * RETURN VALUE - * TRUE: if no errors occured - * FALSE: if errors occured - * - * REVISIONS - * - * NOTE - * - * @unimplemented - */ -WINBOOL -WINAPI -DeviceProblemWizardW(HWND hWndParent, - LPCWSTR lpMachineName, - LPCWSTR lpDeviceID) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/********************************************************************** ***** - * NAME EXPORTED * DeviceProblemWizard_RunDLLA * * DESCRIPTION

1 0

[navaraf] 19838: Make the debugging functions slightly more portable.
by navaraf＠svn.reactos.com 03 Dec '05

03 Dec '05

Make the debugging functions slightly more portable. Modified: trunk/reactos/boot/freeldr/freeldr/debug.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/debug.c --- trunk/reactos/boot/freeldr/freeldr/debug.c 2005-12-03 14:07:38 UTC (rev 19837) +++ trunk/reactos/boot/freeldr/freeldr/debug.c 2005-12-03 15:26:36 UTC (rev 19838) @@ -231,9 +231,9 @@ VOID DebugPrint(ULONG Mask, char *format, ...) { - int *dataptr = (int *) &format; - char Buffer[4096]; - char *ptr = Buffer; + va_list ap; + char Buffer[4096]; + char *ptr = Buffer; // Mask out unwanted debug messages if (!(Mask & DebugPrintMask)) @@ -248,24 +248,28 @@ DebugStartOfLine = FALSE; } - vsprintf(Buffer, format, (PVOID)(++dataptr)); - while (*ptr) - { - DebugPrintChar(*ptr++); - } + va_start(ap, format); + vsprintf(Buffer, format, ap); + va_end(ap); + while (*ptr) + { + DebugPrintChar(*ptr++); + } } VOID DebugPrint1(char *format, ...) { - int *dataptr = (int *) &format; - char Buffer[4096]; - char *ptr = Buffer; + va_list ap; + char Buffer[4096]; + char *ptr = Buffer; - vsprintf(Buffer, format, (PVOID)(++dataptr)); - while (*ptr) - { - DebugPrintChar(*ptr++); - } + va_start(ap, format); + vsprintf(Buffer, format, ap); + va_end(ap); + while (*ptr) + { + DebugPrintChar(*ptr++); + } } VOID DebugDumpBuffer(ULONG Mask, PVOID Buffer, ULONG Length)

1 0

[weiden] 19837: - document and partly implement DevicePropertiesExA/W()
by weiden＠svn.reactos.com 03 Dec '05

03 Dec '05

- document and partly implement DevicePropertiesExA/W() - minor fixes Modified: trunk/reactos/lib/devmgr/advprop.c Modified: trunk/reactos/lib/devmgr/hwpage.c Modified: trunk/reactos/lib/devmgr/misc.c Modified: trunk/reactos/lib/devmgr/precomp.h Modified: trunk/reactos/lib/devmgr/stubs.c _____ Modified: trunk/reactos/lib/devmgr/advprop.c --- trunk/reactos/lib/devmgr/advprop.c 2005-12-03 11:55:07 UTC (rev 19836) +++ trunk/reactos/lib/devmgr/advprop.c 2005-12-03 14:07:38 UTC (rev 19837) @@ -67,6 +67,7 @@ BOOL DeviceUsageChanged : 1; BOOL CloseDevInst : 1; BOOL IsAdmin : 1; + BOOL DoDefaultDevAction : 1; WCHAR szDevName[255]; WCHAR szTemp[255]; @@ -682,7 +683,8 @@ IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData, IN HINSTANCE hComCtl32, - IN LPCWSTR lpMachineName) + IN LPCWSTR lpMachineName, + IN DWORD dwFlags) { PROPSHEETHEADER psh = {0}; PROPSHEETPAGE pspGeneral = {0}; @@ -755,6 +757,7 @@ (DevIdSize * sizeof(WCHAR))); if (DevAdvPropInfo == NULL) { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto Cleanup; } @@ -788,6 +791,7 @@ DevAdvPropInfo->hComCtl32 = hComCtl32; DevAdvPropInfo->IsAdmin = IsUserAdmin(); + DevAdvPropInfo->DoDefaultDevAction = ((dwFlags & DPF_DEVICE_STATUS_ACTION) != 0); psh.dwSize = sizeof(PROPSHEETHEADER); psh.dwFlags = PSH_PROPTITLE | PSH_NOAPPLYNOW; @@ -940,19 +944,15 @@ * lpDeviceID: Specifies the device whose properties are to be shown * * RETURN VALUE - * -1: if errors occured + * Always returns -1, a call to GetLastError returns 0 if successful * - * REVISIONS - * - * NOTE - * * @implemented */ INT_PTR WINAPI -DeviceAdvancedPropertiesW(HWND hWndParent, - LPCWSTR lpMachineName, - LPCWSTR lpDeviceID) +DeviceAdvancedPropertiesW(IN HWND hWndParent OPTIONAL, + IN LPCWSTR lpMachineName OPTIONAL, + IN LPCWSTR lpDeviceID) { HDEVINFO hDevInfo; SP_DEVINFO_DATA DevInfoData; @@ -981,7 +981,8 @@ hDevInfo, &DevInfoData, hComCtl32, - lpMachineName); + lpMachineName, + 0); } SetupDiDestroyDeviceInfoList(hDevInfo); @@ -1008,19 +1009,15 @@ * lpDeviceID: Specifies the device whose properties are to be shown * * RETURN VALUE - * -1: if errors occured + * Always returns -1, a call to GetLastError returns 0 if successful * - * REVISIONS - * - * NOTE - * * @implemented */ INT_PTR WINAPI -DeviceAdvancedPropertiesA(HWND hWndParent, - LPCSTR lpMachineName, - LPCSTR lpDeviceID) +DeviceAdvancedPropertiesA(IN HWND hWndParent OPTIONAL, + IN LPCSTR lpMachineName OPTIONAL, + IN LPCSTR lpDeviceID) { LPWSTR lpMachineNameW = NULL; LPWSTR lpDeviceIDW = NULL; @@ -1063,3 +1060,178 @@ return Ret; } + + +/********************************************************************** ***** + * NAME EXPORTED + * DevicePropertiesExA + * + * DESCRIPTION + * Invokes the extended device properties dialog + * + * ARGUMENTS + * hWndParent: Handle to the parent window + * lpMachineName: Machine Name, NULL is the local machine + * lpDeviceID: Specifies the device whose properties are to be shown + * dwFlags: This parameter can be a combination of the following flags: + * * DPF_DEVICE_STATUS_ACTION: Only valid if bShowDevMgr, causes + * the default device status action button + * to be clicked (Troubleshoot, Enable + * Device, etc) + * bShowDevMgr: If non-zero it displays the device manager instead of + * the advanced device property dialog + * + * RETURN VALUE + * 1: if bShowDevMgr is non-zero and no error occured + * -1: a call to GetLastError returns 0 if successful + * + * @implemented + */ +INT_PTR +WINAPI +DevicePropertiesExA(IN HWND hWndParent OPTIONAL, + IN LPCSTR lpMachineName OPTIONAL, + IN LPCSTR lpDeviceID OPTIONAL, + IN DWORD dwFlags OPTIONAL, + IN BOOL bShowDevMgr) +{ + LPWSTR lpMachineNameW = NULL; + LPWSTR lpDeviceIDW = NULL; + INT_PTR Ret = -1; + + if (lpMachineName != NULL) + { + if (!(lpMachineNameW = ConvertMultiByteToUnicode(lpMachineName, + CP_ACP))) + { + goto Cleanup; + } + } + if (lpDeviceID != NULL) + { + if (!(lpDeviceIDW = ConvertMultiByteToUnicode(lpDeviceID, + CP_ACP))) + { + goto Cleanup; + } + } + + Ret = DevicePropertiesExW(hWndParent, + lpMachineNameW, + lpDeviceIDW, + dwFlags, + bShowDevMgr); + +Cleanup: + if (lpMachineNameW != NULL) + { + HeapFree(GetProcessHeap(), + 0, + lpMachineNameW); + } + if (lpDeviceIDW != NULL) + { + HeapFree(GetProcessHeap(), + 0, + lpDeviceIDW); + } + + return Ret; +} + + +/********************************************************************** ***** + * NAME EXPORTED + * DevicePropertiesExW + * + * DESCRIPTION + * Invokes the extended device properties dialog + * + * ARGUMENTS + * hWndParent: Handle to the parent window + * lpMachineName: Machine Name, NULL is the local machine + * lpDeviceID: Specifies the device whose properties are to be shown + * dwFlags: This parameter can be a combination of the following flags: + * * DPF_DEVICE_STATUS_ACTION: Only valid if bShowDevMgr, causes + * the default device status action button + * to be clicked (Troubleshoot, Enable + * Device, etc) + * bShowDevMgr: If non-zero it displays the device manager instead of + * the advanced device property dialog + * + * RETURN VALUE + * 1: if bShowDevMgr is non-zero and no error occured + * -1: a call to GetLastError returns 0 if successful + * + * @unimplemented + */ +INT_PTR +WINAPI +DevicePropertiesExW(IN HWND hWndParent OPTIONAL, + IN LPCWSTR lpMachineName OPTIONAL, + IN LPCWSTR lpDeviceID OPTIONAL, + IN DWORD dwFlags OPTIONAL, + IN BOOL bShowDevMgr) +{ + INT_PTR Ret = -1; + + if (dwFlags & ~(DPF_UNKNOWN | DPF_DEVICE_STATUS_ACTION)) + { + DPRINT1("DevPropertiesExW: Invalid flags: 0x%x\n", + dwFlags & ~(DPF_UNKNOWN | DPF_DEVICE_STATUS_ACTION)); + SetLastError(ERROR_INVALID_FLAGS); + return -1; + } + + if (bShowDevMgr) + { + DPRINT("DevPropertiesExW doesn't support bShowDevMgr!\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + } + else + { + HDEVINFO hDevInfo; + SP_DEVINFO_DATA DevInfoData; + HINSTANCE hComCtl32; + + if (lpDeviceID == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return -1; + } + + /* dynamically load comctl32 */ + hComCtl32 = LoadAndInitComctl32(); + if (hComCtl32 != NULL) + { + hDevInfo = SetupDiCreateDeviceInfoListEx(NULL, + hWndParent, + lpMachineName, + NULL); + if (hDevInfo != INVALID_HANDLE_VALUE) + { + DevInfoData.cbSize = sizeof(SP_DEVINFO_DATA); + if (SetupDiOpenDeviceInfo(hDevInfo, + lpDeviceID, + hWndParent, + 0, + &DevInfoData)) + { + Ret = DisplayDeviceAdvancedProperties(hWndParent, + lpDeviceID, + hDevInfo, + &DevInfoData, + hComCtl32, + lpMachineName, + dwFlags); + } + + SetupDiDestroyDeviceInfoList(hDevInfo); + } + + FreeLibrary(hComCtl32); + } + } + + return Ret; +} _____ Modified: trunk/reactos/lib/devmgr/hwpage.c --- trunk/reactos/lib/devmgr/hwpage.c 2005-12-03 11:55:07 UTC (rev 19836) +++ trunk/reactos/lib/devmgr/hwpage.c 2005-12-03 14:07:38 UTC (rev 19837) @@ -30,13 +30,6 @@ #define NDEBUG #include <debug.h> -typedef enum -{ - HWPD_STANDARDLIST = 0, - HWPD_LARGELIST, - HWPD_MAX = HWPD_LARGELIST -} HWPAGE_DISPLAYMODE, *PHWPAGE_DISPLAYMODE; - typedef struct _HWDEVINFO { struct _HWCLASSDEVINFO *ClassDevInfo; @@ -139,7 +132,8 @@ HwDevInfo->ClassDevInfo->hDevInfo, &HwDevInfo->DevInfoData, hpd->hComCtl32, - NULL) != -1; + NULL, + 0) != -1; } return Ret; _____ Modified: trunk/reactos/lib/devmgr/misc.c --- trunk/reactos/lib/devmgr/misc.c 2005-12-03 11:55:07 UTC (rev 19836) +++ trunk/reactos/lib/devmgr/misc.c 2005-12-03 14:07:38 UTC (rev 19837) @@ -254,7 +254,10 @@ 0, nLength * sizeof(WCHAR)); if (lpUnicodeStr == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL; + } if (!MultiByteToWideChar(uCodePage, 0, _____ Modified: trunk/reactos/lib/devmgr/precomp.h --- trunk/reactos/lib/devmgr/precomp.h 2005-12-03 11:55:07 UTC (rev 19836) +++ trunk/reactos/lib/devmgr/precomp.h 2005-12-03 14:07:38 UTC (rev 19837) @@ -120,16 +120,23 @@ INT_PTR WINAPI -DeviceAdvancedPropertiesA(HWND hWndParent, - LPCSTR lpMachineName, - LPCSTR lpDeviceID); +DeviceAdvancedPropertiesA(IN HWND hWndParent OPTIONAL, + IN LPCSTR lpMachineName OPTIONAL, + IN LPCSTR lpDeviceID); INT_PTR WINAPI -DeviceAdvancedPropertiesW(HWND hWndParent, - LPCWSTR lpMachineName, - LPCWSTR lpDeviceID); +DeviceAdvancedPropertiesW(IN HWND hWndParent OPTIONAL, + IN LPCWSTR lpMachineName OPTIONAL, + IN LPCWSTR lpDeviceID); +typedef enum +{ + HWPD_STANDARDLIST = 0, + HWPD_LARGELIST, + HWPD_MAX = HWPD_LARGELIST +} HWPAGE_DISPLAYMODE, *PHWPAGE_DISPLAYMODE; + HWND WINAPI DeviceCreateHardwarePage(HWND hWndParent, @@ -137,26 +144,28 @@ HWND WINAPI -DeviceCreateHardwarePageEx(HWND hWndParent, - LPGUID lpGuids, - UINT uNumberOfGuids, - UINT Unknown); +DeviceCreateHardwarePageEx(IN HWND hWndParent, + IN LPGUID lpGuids, + IN UINT uNumberOfGuids, + IN HWPAGE_DISPLAYMODE DisplayMode); -int +#define DPF_UNKNOWN (0x1) +#define DPF_DEVICE_STATUS_ACTION (0x2) +INT_PTR WINAPI -DevicePropertiesExA(HWND hWndParent, - LPCSTR lpMachineName, - LPCSTR lpDeviceID, - HINSTANCE hInst, - DWORD Unknown); +DevicePropertiesExA(IN HWND hWndParent OPTIONAL, + IN LPCSTR lpMachineName OPTIONAL, + IN LPCSTR lpDeviceID OPTIONAL, + IN DWORD dwFlags OPTIONAL, + IN BOOL bShowDevMgr); -int +INT_PTR WINAPI -DevicePropertiesExW(HWND hWndParent, - LPCWSTR lpMachineName, - LPCWSTR lpDeviceID, - HINSTANCE hInst, - DWORD Unknown); +DevicePropertiesExW(IN HWND hWndParent OPTIONAL, + IN LPCWSTR lpMachineName OPTIONAL, + IN LPCWSTR lpDeviceID OPTIONAL, + IN DWORD dwFlags OPTIONAL, + IN BOOL bShowDevMgr); #ifdef UNICODE #define DeviceManager_Execute DeviceManager_ExecuteW @@ -188,7 +197,8 @@ IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData, IN HINSTANCE hComCtl32, - IN LPCWSTR lpMachineName); + IN LPCWSTR lpMachineName, + IN DWORD dwFlags); /* MISC.C */ _____ Modified: trunk/reactos/lib/devmgr/stubs.c --- trunk/reactos/lib/devmgr/stubs.c 2005-12-03 11:55:07 UTC (rev 19836) +++ trunk/reactos/lib/devmgr/stubs.c 2005-12-03 14:07:38 UTC (rev 19837) @@ -544,79 +544,3 @@ UNIMPLEMENTED; return FALSE; } - - -/********************************************************************** ***** - * NAME EXPORTED - * DevicePropertiesExA - * - * DESCRIPTION - * Invokes the extended device properties dialog - * - * ARGUMENTS - * hWndParent: Handle to the parent window - * hInst: Handle to the application instance - * lpMachineName: Machine Name, NULL is the local machine - * lpDeviceID: Specifies the device whose properties are to be shown - * Unknown: Unknown parameter, see NOTEs - * - * RETURN VALUE - * >=0: if no errors occured - * -1: if errors occured - * - * REVISIONS - * - * NOTE - * Unknown seems to be a BOOL, not sure what it affects - * - * @unimplemented - */ -int -WINAPI -DevicePropertiesExA(HWND hWndParent, - LPCSTR lpMachineName, - LPCSTR lpDeviceID, - HINSTANCE hInst, - DWORD Unknown) -{ - UNIMPLEMENTED; - return -1; -} - - -/********************************************************************** ***** - * NAME EXPORTED - * DevicePropertiesExW - * - * DESCRIPTION - * Invokes the extended device properties dialog - * - * ARGUMENTS - * hWndParent: Handle to the parent window - * hInst: Handle to the application instance - * lpMachineName: Machine Name, NULL is the local machine - * lpDeviceID: Specifies the device whose properties are to be shown - * Unknown: Unknown parameter, see NOTEs - * - * RETURN VALUE - * >=0: if no errors occured - * -1: if errors occured - * - * REVISIONS - * - * NOTE - * Unknown seems to be a BOOL, not sure what it affects - * - * @unimplemented - */ -int -WINAPI -DevicePropertiesExW(HWND hWndParent, - LPCWSTR lpMachineName, - LPCWSTR lpDeviceID, - HINSTANCE hInst, - DWORD Unknown) -{ - UNIMPLEMENTED; - return -1; -}

1 0

← Newer
1
...
63
64
65
66
67
68
69
70
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2005