Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 08:53:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Synced DIALOG_DlgDirListW() and DIALOG_DlgDirSelect() from Wine to get more user32.dll winetests to pass

Browse source 
* Fixed indentation in User32EnumWindows()
* Removed internal use of Set/GetLastError() from User32EnumWindows() - makes even more winetests pass

svn path=/trunk/; revision=33483
This commit is contained in:
Gregor Brunmar 2008-05-12 19:36:39 +00:00
parent 58f94d1774
commit 858f98f040
2 changed files with 37 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

43
reactos/dll/win32/user32/windows/dialog.c
View file

@ -1196,6 +1196,7 @@ static INT DIALOG_DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox,
{ {
WCHAR *p, *p2; WCHAR *p, *p2;
p = spec; p = spec;
if ((p2 = strchrW( p, ':' ))) p = p2 + 1;
if ((p2 = strrchrW( p, '\\' ))) p = p2; if ((p2 = strrchrW( p, '\\' ))) p = p2;
if ((p2 = strrchrW( p, '/' ))) p = p2; if ((p2 = strrchrW( p, '/' ))) p = p2;
if (p != spec) if (p != spec)
@ -1215,29 +1216,30 @@ static INT DIALOG_DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox,
if (idLBox && ((hwnd = GetDlgItem( hDlg, idLBox )) != 0)) if (idLBox && ((hwnd = GetDlgItem( hDlg, idLBox )) != 0))
{ {
if (attrib == DDL_DRIVES) attrib |= DDL_EXCLUSIVE;
SENDMSG( combo ? CB_RESETCONTENT : LB_RESETCONTENT, 0, 0 ); SENDMSG( combo ? CB_RESETCONTENT : LB_RESETCONTENT, 0, 0 );
if (attrib & DDL_DIRECTORY) if (attrib & DDL_DIRECTORY)
{ {
if (!(attrib & DDL_EXCLUSIVE)) if (!(attrib & DDL_EXCLUSIVE))
{ {
if (SENDMSG( combo ? CB_DIR : LB_DIR, SENDMSG( combo ? CB_DIR : LB_DIR,
attrib & ~(DDL_DIRECTORY | DDL_DRIVES), attrib & ~(DDL_DIRECTORY | DDL_DRIVES),
(LPARAM)spec ) == LB_ERR) (LPARAM)spec );
return FALSE;
} }
if (SENDMSG( combo ? CB_DIR : LB_DIR, SENDMSG( combo ? CB_DIR : LB_DIR,
(attrib & (DDL_DIRECTORY | DDL_DRIVES)) | DDL_EXCLUSIVE, (attrib & (DDL_DIRECTORY | DDL_DRIVES)) | DDL_EXCLUSIVE,
(LPARAM)any ) == LB_ERR) (LPARAM)any );
return FALSE;
} }
else else
{ {
if (SENDMSG( combo ? CB_DIR : LB_DIR, attrib, SENDMSG( combo ? CB_DIR : LB_DIR, attrib, (LPARAM)spec );
(LPARAM)spec ) == LB_ERR)
return FALSE;
} }
} }
/* Convert path specification to uppercase */
if (spec) CharUpperW(spec);
if (idStatic && ((hwnd = GetDlgItem( hDlg, idStatic )) != 0)) if (idStatic && ((hwnd = GetDlgItem( hDlg, idStatic )) != 0))
{ {
WCHAR temp[MAX_PATH]; WCHAR temp[MAX_PATH];
@ -1300,7 +1302,7 @@ static BOOL DIALOG_DlgDirSelect( HWND hwnd, LPWSTR str, INT len,
size = SendMessageW(listbox, combo ? CB_GETLBTEXTLEN : LB_GETTEXTLEN, 0, 0 ); size = SendMessageW(listbox, combo ? CB_GETLBTEXTLEN : LB_GETTEXTLEN, 0, 0 );
if (size == LB_ERR) return FALSE; if (size == LB_ERR) return FALSE;
if (!(buffer = HeapAlloc( GetProcessHeap(), 0, size+1 ))) return FALSE; if (!(buffer = HeapAlloc( GetProcessHeap(), 0, (size+2) * sizeof(WCHAR) ))) return FALSE;
SendMessageW( listbox, combo ? CB_GETLBTEXT : LB_GETTEXT, item, (LPARAM)buffer ); SendMessageW( listbox, combo ? CB_GETLBTEXT : LB_GETTEXT, item, (LPARAM)buffer );
@ -1318,14 +1320,25 @@ static BOOL DIALOG_DlgDirSelect( HWND hwnd, LPWSTR str, INT len,
ptr = buffer + 1; ptr = buffer + 1;
} }
} }
else ptr = buffer; else
{
/* Filenames without a dot extension must have one tacked at the end */
if (strchrW(buffer, '.') == NULL)
{
buffer[strlenW(buffer)+1] = '\0';
buffer[strlenW(buffer)] = '.';
}
ptr = buffer;
}
if (unicode) if (!unicode)
{ {
if (len > 0 && !WideCharToMultiByte( CP_ACP, 0, ptr, -1, (LPSTR)str, len, 0, 0 )) if (len > 0 && !WideCharToMultiByte( CP_ACP, 0, ptr, -1, (LPSTR)str, len, 0, 0 ))
((LPSTR)str)[len-1] = 0; ((LPSTR)str)[len-1] = 0;
} }
else lstrcpynW( str, ptr, len ); else
lstrcpynW( str, ptr, len );
HeapFree( GetProcessHeap(), 0, buffer ); HeapFree( GetProcessHeap(), 0, buffer );
TRACE("Returning %d '%s'\n", ret, str ); TRACE("Returning %d '%s'\n", ret, str );
return ret; return ret;

19
reactos/dll/win32/user32/windows/window.c
View file

@ -548,12 +548,12 @@ GetForegroundWindow(VOID)
static static
BOOL BOOL
User32EnumWindows ( User32EnumWindows (
HDESK hDesktop, HDESK hDesktop,
HWND hWndparent, HWND hWndparent,
WNDENUMPROC lpfn, WNDENUMPROC lpfn,
LPARAM lParam, LPARAM lParam,
DWORD dwThreadId, DWORD dwThreadId,
BOOL bChildren ) BOOL bChildren )
{ {
DWORD i, dwCount = 0; DWORD i, dwCount = 0;
HWND* pHwnd = NULL; HWND* pHwnd = NULL;
@ -569,10 +569,9 @@ User32EnumWindows (
sort of persistent buffer and only grow it ( requiring a 2nd sort of persistent buffer and only grow it ( requiring a 2nd
call ) when the buffer wasn't already big enough? */ call ) when the buffer wasn't already big enough? */
/* first get how many window entries there are */ /* first get how many window entries there are */
SetLastError(0);
dwCount = NtUserBuildHwndList ( dwCount = NtUserBuildHwndList (
hDesktop, hWndparent, bChildren, dwThreadId, lParam, NULL, 0 ); hDesktop, hWndparent, bChildren, dwThreadId, lParam, NULL, 0 );
if ( !dwCount || GetLastError() ) if ( !dwCount )
return FALSE; return FALSE;
/* allocate buffer to receive HWND handles */ /* allocate buffer to receive HWND handles */
@ -587,10 +586,10 @@ User32EnumWindows (
/* now call kernel again to fill the buffer this time */ /* now call kernel again to fill the buffer this time */
dwCount = NtUserBuildHwndList ( dwCount = NtUserBuildHwndList (
hDesktop, hWndparent, bChildren, dwThreadId, lParam, pHwnd, dwCount ); hDesktop, hWndparent, bChildren, dwThreadId, lParam, pHwnd, dwCount );
if ( !dwCount || GetLastError() ) if ( !dwCount )
{ {
if ( pHwnd ) if ( pHwnd )
HeapFree ( hHeap, 0, pHwnd ); HeapFree ( hHeap, 0, pHwnd );
return FALSE; return FALSE;
} }