Ros-diffs June 2013

ros-diffs@reactos.org

14 participants
274 discussions

[hbelusca] 59164: [RTL] Clarify the code a bit, no logical changes.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 2 22:44:09 2013 New Revision: 59164 URL: http://svn.reactos.org/svn/reactos?rev=59164&view=rev Log: [RTL] Clarify the code a bit, no logical changes. Modified: trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=5916… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/unicode.c [iso-8859-1] Sun Jun 2 22:44:09 2013 @@ -875,24 +875,24 @@ RtlPrefixUnicodeString( PCUNICODE_STRING String1, PCUNICODE_STRING String2, - BOOLEAN CaseInsensitive) + BOOLEAN CaseInsensitive) { PWCHAR pc1; PWCHAR pc2; - ULONG Length; + ULONG NumChars; if (String2->Length < String1->Length) return FALSE; - Length = String1->Length / 2; + NumChars = String1->Length / sizeof(WCHAR); pc1 = String1->Buffer; - pc2 = String2->Buffer; + pc2 = String2->Buffer; if (pc1 && pc2) { if (CaseInsensitive) { - while (Length--) + while (NumChars--) { if (RtlUpcaseUnicodeChar(*pc1++) != RtlUpcaseUnicodeChar(*pc2++)) @@ -901,9 +901,9 @@ } else { - while (Length--) + while (NumChars--) { - if( *pc1++ != *pc2++ ) + if (*pc1++ != *pc2++) return FALSE; } }

11 years, 6 months

[hbelusca] 59163: [RTL] Use RtlDowncaseUnicodeChar instead of towlower

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 2 22:11:50 2013 New Revision: 59163 URL: http://svn.reactos.org/svn/reactos?rev=59163&view=rev Log: [RTL] Use RtlDowncaseUnicodeChar instead of towlower Modified: trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=59163&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Sun Jun 2 22:11:50 2013 @@ -164,7 +164,7 @@ { /* Get the next lower case character */ End++; - c = towlower(*End); + c = RtlDowncaseUnicodeChar(*End); /* Check if it's a DOS device (LPT, COM, PRN, AUX, or NUL) */ if ((End < &PathCopy.Buffer[OriginalLength / sizeof(WCHAR)]) && @@ -190,7 +190,7 @@ } /* Get the next lower case character and check if it's a DOS device */ - c = towlower(*PathCopy.Buffer); + c = RtlDowncaseUnicodeChar(*PathCopy.Buffer); if ((c != 'l') && (c != 'c') && (c != 'p') && (c != 'a') && (c != 'n')) { /* Not LPT, COM, PRN, AUX, or NUL */

11 years, 6 months

[ekohl] 59162: [NETAPI32] - Remove obsolete WINE code. - Implement NetUserDel.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jun 2 21:53:52 2013 New Revision: 59162 URL: http://svn.reactos.org/svn/reactos?rev=59162&view=rev Log: [NETAPI32] - Remove obsolete WINE code. - Implement NetUserDel. Modified: trunk/reactos/dll/win32/netapi32/user.c Modified: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Sun Jun 2 21:53:52 2013 @@ -21,7 +21,6 @@ /* * TODO: * Implement NetUserChangePassword - * Implement NetUserDel * Implement NetUserGetGroups * Implement NetUserSetGroups * Implement NetUserSetInfo @@ -48,75 +47,6 @@ BOOLEAN BuiltinDone; } ENUM_CONTEXT, *PENUM_CONTEXT; - - -/* NOTE: So far, this is implemented to support tests that require user logins, - * but not designed to handle real user databases. Those should probably - * be synced with either the host's user database or with Samba. - * - * FIXME: The user database should hold all the information the USER_INFO_4 struct - * needs, but for the first try, I will just implement the USER_INFO_1 fields. - */ - -struct sam_user -{ - struct list entry; - WCHAR user_name[LM20_UNLEN+1]; - WCHAR user_password[PWLEN + 1]; - DWORD sec_since_passwd_change; - DWORD user_priv; - LPWSTR home_dir; - LPWSTR user_comment; - DWORD user_flags; - LPWSTR user_logon_script_path; -}; - -static struct list user_list = LIST_INIT( user_list ); - -BOOL NETAPI_IsLocalComputer(LPCWSTR ServerName); - -/************************************************************ - * NETAPI_ValidateServername - * - * Validates server name - */ -static NET_API_STATUS NETAPI_ValidateServername(LPCWSTR ServerName) -{ - if (ServerName) - { - if (ServerName[0] == 0) - return ERROR_BAD_NETPATH; - else if ( - ((ServerName[0] == '\\') && - (ServerName[1] != '\\')) - || - ((ServerName[0] == '\\') && - (ServerName[1] == '\\') && - (ServerName[2] == 0)) - ) - return ERROR_INVALID_NAME; - } - return NERR_Success; -} - -/************************************************************ - * NETAPI_FindUser - * - * Looks for a user in the user database. - * Returns a pointer to the entry in the user list when the user - * is found, NULL otherwise. - */ -static struct sam_user* NETAPI_FindUser(LPCWSTR UserName) -{ - struct sam_user *user; - - LIST_FOR_EACH_ENTRY(user, &user_list, struct sam_user, entry) - { - if(lstrcmpW(user->user_name, UserName) == 0) - return user; - } - return NULL; -} static PSID @@ -988,6 +918,61 @@ } done: + return ApiStatus; +} + + +static +NET_API_STATUS +OpenUserByName(SAM_HANDLE DomainHandle, + PUNICODE_STRING UserName, + ULONG DesiredAccess, + PSAM_HANDLE UserHandle) +{ + PULONG RelativeIds = NULL; + PSID_NAME_USE Use = NULL; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + + /* Get the RID for the given user name */ + Status = SamLookupNamesInDomain(DomainHandle, + 1, + UserName, + &RelativeIds, + &Use); + if (!NT_SUCCESS(Status)) + { + ERR("SamLookupNamesInDomain failed (Status %08lx)\n", Status); + return NetpNtStatusToApiStatus(Status); + } + + /* Fail, if it is not an alias account */ + if (Use[0] != SidTypeUser) + { + ERR("Object is not a user!\n"); + ApiStatus = NERR_GroupNotFound; + goto done; + } + + /* Open the alias account */ + Status = SamOpenUser(DomainHandle, + DesiredAccess, + RelativeIds[0], + UserHandle); + if (!NT_SUCCESS(Status)) + { + ERR("SamOpenUser failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + +done: + if (RelativeIds != NULL) + SamFreeMemory(RelativeIds); + + if (Use != NULL) + SamFreeMemory(Use); + return ApiStatus; } @@ -1110,24 +1095,7 @@ LPCWSTR oldpassword, LPCWSTR newpassword) { - struct sam_user *user; - TRACE("(%s, %s, ..., ...)\n", debugstr_w(domainname), debugstr_w(username)); - - if(domainname) - FIXME("Ignoring domainname %s.\n", debugstr_w(domainname)); - - if((user = NETAPI_FindUser(username)) == NULL) - return NERR_UserNotFound; - - if(lstrcmpW(user->user_password, oldpassword) != 0) - return ERROR_INVALID_PASSWORD; - - if(lstrlenW(newpassword) > PWLEN) - return ERROR_PASSWORD_RESTRICTION; - - lstrcpyW(user->user_password, newpassword); - return NERR_Success; } @@ -1140,25 +1108,109 @@ NetUserDel(LPCWSTR servername, LPCWSTR username) { - NET_API_STATUS status; - struct sam_user *user; + UNICODE_STRING ServerName; + UNICODE_STRING UserName; + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE DomainHandle = NULL; + SAM_HANDLE UserHandle = NULL; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; TRACE("(%s, %s)\n", debugstr_w(servername), debugstr_w(username)); - if((status = NETAPI_ValidateServername(servername))!= NERR_Success) - return status; - - if ((user = NETAPI_FindUser(username)) == NULL) - return NERR_UserNotFound; - - list_remove(&user->entry); - - HeapFree(GetProcessHeap(), 0, user->home_dir); - HeapFree(GetProcessHeap(), 0, user->user_comment); - HeapFree(GetProcessHeap(), 0, user->user_logon_script_path); - HeapFree(GetProcessHeap(), 0, user); - - return NERR_Success; + if (servername != NULL) + RtlInitUnicodeString(&ServerName, servername); + + RtlInitUnicodeString(&UserName, username); + + /* Connect to the SAM Server */ + Status = SamConnect((servername != NULL) ? &ServerName : NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("SamConnect failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the Builtin Domain */ + Status = OpenBuiltinDomain(ServerHandle, + DOMAIN_LOOKUP, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("OpenBuiltinDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the user account in the builtin domain */ + ApiStatus = OpenUserByName(DomainHandle, + &UserName, + DELETE, + &UserHandle); + if (ApiStatus != NERR_Success && ApiStatus != ERROR_NONE_MAPPED) + { + TRACE("OpenUserByName failed (ApiStatus %lu)\n", ApiStatus); + goto done; + } + + if (UserHandle == NULL) + { + if (DomainHandle != NULL) + { + SamCloseHandle(DomainHandle); + DomainHandle = NULL; + } + + /* Open the Acount Domain */ + Status = OpenAccountDomain(ServerHandle, + (servername != NULL) ? &ServerName : NULL, + DOMAIN_LOOKUP, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("OpenAccountDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the user account in the account domain */ + ApiStatus = OpenUserByName(DomainHandle, + &UserName, + DELETE, + &UserHandle); + if (ApiStatus != NERR_Success) + { + ERR("OpenUserByName failed (ApiStatus %lu)\n", ApiStatus); + if (ApiStatus == ERROR_NONE_MAPPED) + ApiStatus = NERR_GroupNotFound; + goto done; + } + } + + /* Delete the user */ + Status = SamDeleteUser(UserHandle); + if (!NT_SUCCESS(Status)) + { + ERR("SamDeleteUser failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + +done: + if (UserHandle != NULL) + SamCloseHandle(UserHandle); + + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + if (ServerHandle != NULL) + SamCloseHandle(ServerHandle); + + return ApiStatus; }

11 years, 6 months

[akhaldi] 59161: * I missed this in r59152. Spotted by Robert Naumann. CORE-7257 #resolve #comment Thanks !

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jun 2 21:40:32 2013 New Revision: 59161 URL: http://svn.reactos.org/svn/reactos?rev=59161&view=rev Log: * I missed this in r59152. Spotted by Robert Naumann. CORE-7257 #resolve #comment Thanks ! Modified: trunk/reactos/media/inf/syssetup.inf Modified: trunk/reactos/media/inf/syssetup.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf?rev… ============================================================================== --- trunk/reactos/media/inf/syssetup.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/syssetup.inf [iso-8859-1] Sun Jun 2 21:40:32 2013 @@ -24,7 +24,7 @@ unknown.inf usbport.inf audio.inf -ks.inf +;ks.inf c_image.inf [RegistrationPhase2]

11 years, 6 months

[jimtabor] 59160: [User32] - Patch by Sergey Guralnik : Init standard scrollbars during WM_NCCREATE. - Modified for ReactOS.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Jun 2 20:52:54 2013 New Revision: 59160 URL: http://svn.reactos.org/svn/reactos?rev=59160&view=rev Log: [User32] - Patch by Sergey Guralnik : Init standard scrollbars during WM_NCCREATE. - Modified for ReactOS. Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Sun Jun 2 20:52:54 2013 @@ -1893,6 +1893,17 @@ { case WM_NCCREATE: { + if ( Wnd && + Wnd->style & (WS_HSCROLL | WS_VSCROLL) ) + { + if (!Wnd->pSBInfo) + { + SCROLLINFO si = {sizeof si, SIF_ALL, 0, 100, 0, 0, 0}; + SetScrollInfo( hWnd, SB_HORZ, &si, FALSE ); + SetScrollInfo( hWnd, SB_VERT, &si, FALSE ); + } + } + if (lParam) { LPCREATESTRUCTA cs = (LPCREATESTRUCTA)lParam; @@ -2060,6 +2071,17 @@ { case WM_NCCREATE: { + if ( Wnd && + Wnd->style & (WS_HSCROLL | WS_VSCROLL) ) + { + if (!Wnd->pSBInfo) + { + SCROLLINFO si = {sizeof si, SIF_ALL, 0, 100, 0, 0, 0}; + SetScrollInfo( hWnd, SB_HORZ, &si, FALSE ); + SetScrollInfo( hWnd, SB_VERT, &si, FALSE ); + } + } + if (lParam) { LPCREATESTRUCTW cs = (LPCREATESTRUCTW)lParam;

11 years, 6 months

[jimtabor] 59159: [User32] - Sync port to 1.5.31.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Jun 2 20:48:12 2013 New Revision: 59159 URL: http://svn.reactos.org/svn/reactos?rev=59159&view=rev Log: [User32] - Sync port to 1.5.31. Modified: trunk/reactos/win32ss/user/user32/controls/listbox.c Modified: trunk/reactos/win32ss/user/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/listbox.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/listbox.c [iso-8859-1] Sun Jun 2 20:48:12 2013 @@ -27,8 +27,6 @@ * If you discover missing features, or bugs, please note them below. * * TODO: - * - GetListBoxInfo() ReactOS - * - LB_GETLISTBOXINFO ReactOS * - LBS_NODATA ReactOS */ @@ -81,6 +79,7 @@ INT nb_tabs; /* Number of tabs in array */ INT *tabs; /* Array of tabs */ INT avg_char_width; /* Average width of characters */ + INT wheel_remain; /* Left over scroll amount */ BOOL caret_on; /* Is caret on? */ BOOL captured; /* Is mouse captured? */ BOOL in_focus; @@ -291,20 +290,12 @@ if (index < 0) index = 0; if (descr->style & LBS_MULTICOLUMN) index -= index % descr->page_size; if (descr->top_item == index) return LB_OKAY; - if (descr->style & LBS_MULTICOLUMN) - { - INT diff = (descr->top_item - index) / descr->page_size * descr->column_width; - if (scroll && (abs(diff) < descr->width)) - ScrollWindowEx( descr->self, diff, 0, NULL, NULL, 0, NULL, - SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN ); - - else - scroll = FALSE; - } - else if (scroll) + if (scroll) { INT diff; - if (descr->style & LBS_OWNERDRAWVARIABLE) + if (descr->style & LBS_MULTICOLUMN) + diff = (descr->top_item - index) / descr->page_size * descr->column_width; + else if (descr->style & LBS_OWNERDRAWVARIABLE) { INT i; diff = 0; @@ -322,11 +313,8 @@ else diff = (descr->top_item - index) * descr->item_height; - if (abs(diff) < descr->height) - ScrollWindowEx( descr->self, 0, diff, NULL, NULL, 0, NULL, - SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN ); - else - scroll = FALSE; + ScrollWindowEx( descr->self, 0, diff, NULL, NULL, 0, NULL, + SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN ); } if (!scroll) InvalidateRect( descr->self, NULL, TRUE ); descr->top_item = index; @@ -1774,6 +1762,8 @@ if ((ret = LISTBOX_RemoveItem( descr, (descr->nb_items - 1) )) < 0) return ret; } + + InvalidateRect( descr->self, NULL, TRUE ); return LB_OKAY; } @@ -1996,18 +1986,24 @@ static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) { - short gcWheelDelta = 0; UINT pulScrollLines = 3; SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); - gcWheelDelta -= delta; - - if (abs(gcWheelDelta) >= WHEEL_DELTA && pulScrollLines) - { - int cLineScroll = (int) min((UINT) descr->page_size, pulScrollLines); - cLineScroll *= (gcWheelDelta / WHEEL_DELTA); - LISTBOX_SetTopItem( descr, descr->top_item + cLineScroll, TRUE ); + /* if scrolling changes direction, ignore left overs */ + if ((delta < 0 && descr->wheel_remain < 0) || + (delta > 0 && descr->wheel_remain > 0)) + descr->wheel_remain += delta; + else + descr->wheel_remain = delta; + + if (descr->wheel_remain && pulScrollLines) + { + int cLineScroll; + pulScrollLines = min((UINT) descr->page_size, pulScrollLines); + cLineScroll = pulScrollLines * (float)descr->wheel_remain / WHEEL_DELTA; + descr->wheel_remain -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + LISTBOX_SetTopItem( descr, descr->top_item - cLineScroll, TRUE ); } return 0; } @@ -2500,6 +2496,7 @@ descr->horz_pos = 0; descr->nb_tabs = 0; descr->tabs = NULL; + descr->wheel_remain = 0; descr->caret_on = lphc ? FALSE : TRUE; if (descr->style & LBS_NOSEL) descr->caret_on = FALSE; descr->in_focus = FALSE; @@ -3009,11 +3006,11 @@ LISTBOX_RepaintItem( descr, descr->focus_item, ODA_FOCUS ); return LB_OKAY; - case LB_GETLISTBOXINFO: //// ReactOS - if (descr->style & LBS_MULTICOLUMN) - return descr->column_width; + case LB_GETLISTBOXINFO: + if (descr->style & LBS_MULTICOLUMN) //// ReactOS + return descr->page_size * descr->column_width; else - return descr->nb_items; + return descr->page_size; case WM_DESTROY: return LISTBOX_Destroy( descr ); @@ -3056,6 +3053,7 @@ return 0; case WM_KILLFOCUS: descr->in_focus = FALSE; + descr->wheel_remain = 0; if ((descr->focus_item != -1) && descr->caret_on) LISTBOX_RepaintItem( descr, descr->focus_item, ODA_FOCUS ); SEND_NOTIFICATION( descr, LBN_KILLFOCUS );

11 years, 6 months

[jimtabor] 59158: [User32] - Sync port to 1.5.31.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Jun 2 20:47:56 2013 New Revision: 59158 URL: http://svn.reactos.org/svn/reactos?rev=59158&view=rev Log: [User32] - Sync port to 1.5.31. Modified: trunk/reactos/win32ss/user/user32/controls/edit.c Modified: trunk/reactos/win32ss/user/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/edit.c [iso-8859-1] Sun Jun 2 20:47:56 2013 @@ -68,9 +68,7 @@ #define EF_AFTER_WRAP 0x0080 /* the caret is displayed after the last character of a wrapped line, instead of in front of the next character */ #define EF_USE_SOFTBRK 0x0100 /* Enable soft breaks in text. */ -#define EF_APP_HAS_HANDLE 0x0200 /* Set when an app sends EM_[G|S]ETHANDLE. We are in sole control of - the text buffer if this is clear. */ -#define EF_DIALOGMODE 0x0400 /* Indicates that we are inside a dialog window */ +#define EF_DIALOGMODE 0x0200 /* Indicates that we are inside a dialog window */ typedef enum { @@ -129,6 +127,7 @@ Even if parent will change, EN_* messages should be sent to the first parent. */ HWND hwndListBox; /* handle of ComboBox's listbox or NULL */ + INT wheelDeltaRemainder; /* scroll wheel delta left over after scrolling whole lines */ /* * only for multi line controls */ @@ -139,6 +138,7 @@ HLOCAL hloc32W; /* our unicode local memory block */ HLOCAL hloc32A; /* alias for ANSI control receiving EM_GETHANDLE or EM_SETHANDLE */ + HLOCAL hlocapp; /* The text buffer handle belongs to the app */ /* * IME Data */ @@ -391,6 +391,7 @@ HFONT old_font = NULL; HDC udc = dc; SCRIPT_TABDEF tabdef; + HRESULT hr; if (!udc) udc = GetDC(es->hwndSelf); @@ -401,10 +402,19 @@ tabdef.iScale = 0; tabdef.pTabStops = es->tabs; tabdef.iTabOrigin = 0; - - ScriptStringAnalyse(udc, &es->text[index], line_def->net_length, (3*line_def->net_length/2+16), -1, SSA_LINK|SSA_FALLBACK|SSA_GLYPHS|SSA_TAB, -1, NULL, NULL, NULL, &tabdef, NULL, &line_def->ssa); - - if (es->font) + //// ReactOS r57679 + hr = ScriptStringAnalyse(udc, &es->text[index], line_def->net_length, + (3*line_def->net_length/2+16), -1, + SSA_LINK|SSA_FALLBACK|SSA_GLYPHS|SSA_TAB, -1, + NULL, NULL, NULL, &tabdef, NULL, &line_def->ssa); + //// + if (FAILED(hr)) + { + WARN("ScriptStringAnalyse failed (%x)\n",hr); + line_def->ssa = NULL; + } + + if (es->font) SelectObject(udc, old_font); if (udc != dc) ReleaseDC(es->hwndSelf, udc); @@ -435,12 +445,12 @@ udc = GetDC(es->hwndSelf); if (es->font) old_font = SelectObject(udc, es->font); - + //// ReactOS r57677 if (es->style & ES_PASSWORD) ScriptStringAnalyse(udc, &es->password_char, length, (3*length/2+16), -1, SSA_LINK|SSA_FALLBACK|SSA_GLYPHS|SSA_PASSWORD, -1, NULL, NULL, NULL, NULL, NULL, &es->ssa); else ScriptStringAnalyse(udc, es->text, length, (3*length/2+16), -1, SSA_LINK|SSA_FALLBACK|SSA_GLYPHS, -1, NULL, NULL, NULL, NULL, NULL, &es->ssa); - + //// if (es->font) SelectObject(udc, old_font); if (udc != dc) @@ -562,9 +572,9 @@ cp = current_position; while (*cp) { if (*cp == '\n') break; - if ((*cp == '\r') && (*(cp + 1) == '\n')) - break; - cp++; + if ((*cp == '\r') && (*(cp + 1) == '\n')) + break; + cp++; } /* Mark type of line termination */ @@ -587,9 +597,13 @@ const SIZE *sz; EDIT_InvalidateUniscribeData_linedef(current_line); EDIT_UpdateUniscribeData_linedef(es, NULL, current_line); - sz = ScriptString_pSize(current_line->ssa); - /* Calculate line width */ - current_line->width = sz->cx; + if (current_line->ssa) + { + sz = ScriptString_pSize(current_line->ssa); + /* Calculate line width */ + current_line->width = sz->cx; + } + else current_line->width = es->char_width * current_line->net_length; } else current_line->width = 0; @@ -617,7 +631,9 @@ current_line->net_length = prev; EDIT_InvalidateUniscribeData_linedef(current_line); EDIT_UpdateUniscribeData_linedef(es, NULL, current_line); - sz = ScriptString_pSize(current_line->ssa); + if (current_line->ssa) + sz = ScriptString_pSize(current_line->ssa); + else sz = 0; if (sz) current_line->width = sz->cx; else @@ -633,18 +649,23 @@ EDIT_InvalidateUniscribeData_linedef(current_line); EDIT_UpdateUniscribeData_linedef(es, NULL, current_line); - count = ScriptString_pcOutChars(current_line->ssa); - piDx = HeapAlloc(GetProcessHeap(),0,sizeof(INT) * (*count)); - ScriptStringGetLogicalWidths(current_line->ssa,piDx); - - prev = current_line->net_length-1; - do { - current_line->width -= piDx[prev]; - prev--; - } while ( prev > 0 && current_line->width > fw); - if (prev<=0) - prev = 1; - HeapFree(GetProcessHeap(),0,piDx); + if (current_line->ssa) + { + count = ScriptString_pcOutChars(current_line->ssa); + piDx = HeapAlloc(GetProcessHeap(),0,sizeof(INT) * (*count)); + ScriptStringGetLogicalWidths(current_line->ssa,piDx); + + prev = current_line->net_length-1; + do { + current_line->width -= piDx[prev]; + prev--; + } while ( prev > 0 && current_line->width > fw); + if (prev<=0) + prev = 1; + HeapFree(GetProcessHeap(),0,piDx); + } + else + prev = (fw / es->char_width); } /* If the first line we are calculating, wrapped before istart, we must @@ -669,8 +690,13 @@ if (current_line->net_length > 0) { EDIT_UpdateUniscribeData_linedef(es, NULL, current_line); - sz = ScriptString_pSize(current_line->ssa); - current_line->width = sz->cx; + if (current_line->ssa) + { + sz = ScriptString_pSize(current_line->ssa); + current_line->width = sz->cx; + } + else + current_line->width = 0; } else current_line->width = 0; } @@ -1228,6 +1254,8 @@ */ static void EDIT_LockBuffer(EDITSTATE *es) { + if (es->hlocapp) return; + if (!es->text) { CHAR *textA = NULL; // ReactOS Hacked! r45670 @@ -1247,7 +1275,7 @@ return; } - if(textA) + if (textA) //// ReactOS { HLOCAL hloc32W_new; UINT countW_new = MultiByteToWideChar(CP_ACP, 0, textA, -1, NULL, 0); @@ -1271,7 +1299,6 @@ } else es->text = LocalLock(es->hloc32W); } - if(es->flags & EF_APP_HAS_HANDLE) text_buffer_changed(es); es->lock_count++; } @@ -2463,7 +2490,11 @@ hLocal = es->hloc32A; } - es->flags |= EF_APP_HAS_HANDLE; + EDIT_UnlockBuffer(es, TRUE); + + /* The text buffer handle belongs to the app */ + es->hlocapp = hLocal; + TRACE("Returning %p, LocalSize() = %ld\n", hLocal, LocalSize(hLocal)); return hLocal; } @@ -2804,8 +2835,11 @@ es->buffer_size = LocalSize(es->hloc32W)/sizeof(WCHAR) - 1; - es->flags |= EF_APP_HAS_HANDLE; + /* The text buffer handle belongs to the control */ + es->hlocapp = NULL; + EDIT_LockBuffer(es); + text_buffer_changed(es); es->x_offset = es->y_offset = 0; es->selection_start = es->selection_end = 0; @@ -3575,6 +3609,8 @@ if(!(es->style & ES_NOHIDESEL)) EDIT_InvalidateText(es, es->selection_start, es->selection_end); EDIT_NOTIFY_PARENT(es, EN_KILLFOCUS); + /* throw away left over scroll when we lose focus */ + es->wheelDeltaRemainder = 0; return 0; } @@ -4618,12 +4654,14 @@ { LINEDEF *pc, *pp; - if (es->hloc32W) { - LocalFree(es->hloc32W); - } - if (es->hloc32A) { - LocalFree(es->hloc32A); - } + /* The app can own the text buffer handle */ + if (es->hloc32W && (es->hloc32W != es->hlocapp)) { + LocalFree(es->hloc32W); + } + if (es->hloc32A && (es->hloc32A != es->hlocapp)) { + LocalFree(es->hloc32A); + } + EDIT_InvalidateUniscribeData(es); pc = es->first_line_def; while (pc) { @@ -4632,7 +4670,6 @@ pc = pp; } - EDIT_InvalidateUniscribeData(es); SetWindowLongPtrW( es->hwndSelf, 0, 0 ); HeapFree(GetProcessHeap(), 0, es->undo_text); HeapFree(GetProcessHeap(), 0, es); @@ -5155,7 +5192,7 @@ case WM_MOUSEWHEEL: { - int gcWheelDelta = 0; + int wheelDelta; UINT pulScrollLines = 3; SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); @@ -5163,12 +5200,20 @@ result = DefWindowProcW(hwnd, msg, wParam, lParam); break; } - gcWheelDelta -= GET_WHEEL_DELTA_WPARAM(wParam); - if (abs(gcWheelDelta) >= WHEEL_DELTA && pulScrollLines) + wheelDelta = GET_WHEEL_DELTA_WPARAM(wParam); + /* if scrolling changes direction, ignore left overs */ + if ((wheelDelta < 0 && es->wheelDeltaRemainder < 0) || + (wheelDelta > 0 && es->wheelDeltaRemainder > 0)) + es->wheelDeltaRemainder += wheelDelta; + else + es->wheelDeltaRemainder = wheelDelta; + if (es->wheelDeltaRemainder && pulScrollLines) { - int cLineScroll= (int) min((UINT) es->line_count, pulScrollLines); - cLineScroll *= (gcWheelDelta / WHEEL_DELTA); - result = EDIT_EM_LineScroll(es, 0, cLineScroll); + int cLineScroll; + pulScrollLines = (int) min((UINT) es->line_count, pulScrollLines); + cLineScroll = pulScrollLines * (float)es->wheelDeltaRemainder / WHEEL_DELTA; + es->wheelDeltaRemainder -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + result = EDIT_EM_LineScroll(es, 0, -cLineScroll); } } break; @@ -5204,6 +5249,28 @@ case WM_IME_CONTROL: break; + + case WM_IME_REQUEST: + switch (wParam) + { + case IMR_QUERYCHARPOSITION: + { + LRESULT pos; + IMECHARPOSITION *chpos = (IMECHARPOSITION *)lParam; + + pos = EDIT_EM_PosFromChar(es, es->selection_start + chpos->dwCharPos, FALSE); + chpos->pt.x = LOWORD(pos); + chpos->pt.y = HIWORD(pos); + chpos->cLineHeight = es->line_height; + chpos->rcDocument = es->format_rect; + MapWindowPoints(hwnd, 0, &chpos->pt, 1); + MapWindowPoints(hwnd, 0, (POINT*)&chpos->rcDocument, 2); + result = 1; + break; + } + } + break; + default: result = DefWindowProcT(hwnd, msg, wParam, lParam, unicode);

11 years, 6 months

[jimtabor] 59157: [User32] - Sync port to 1.5.31.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Jun 2 20:47:12 2013 New Revision: 59157 URL: http://svn.reactos.org/svn/reactos?rev=59157&view=rev Log: [User32] - Sync port to 1.5.31. Modified: trunk/reactos/win32ss/user/user32/controls/combo.c Modified: trunk/reactos/win32ss/user/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/combo.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/combo.c [iso-8859-1] Sun Jun 2 20:47:12 2013 @@ -1042,17 +1042,23 @@ } } + r.left = rect.left; + r.top = rect.bottom; + r.right = r.left + lphc->droppedRect.right - lphc->droppedRect.left; + r.bottom = r.top + nDroppedHeight; + /*If height of dropped rectangle gets beyond a screen size it should go up, otherwise down.*/ monitor = MonitorFromRect( &rect, MONITOR_DEFAULTTOPRIMARY ); mon_info.cbSize = sizeof(mon_info); GetMonitorInfoW( monitor, &mon_info ); - if( (rect.bottom + nDroppedHeight) >= mon_info.rcWork.bottom ) - rect.bottom = rect.top - nDroppedHeight; - - SetWindowPos( lphc->hWndLBox, HWND_TOPMOST, rect.left, rect.bottom, - lphc->droppedRect.right - lphc->droppedRect.left, - nDroppedHeight, + if (r.bottom > mon_info.rcWork.bottom ) + { + r.top = max( rect.top - nDroppedHeight, mon_info.rcWork.top ); + r.bottom = min( r.top + nDroppedHeight, mon_info.rcWork.bottom ); + } + //// ReactOS : Use HWND_TOPMOST See Bug 5705 or CORE-5186.... + SetWindowPos( lphc->hWndLBox, HWND_TOPMOST, r.left, r.top, r.right - r.left, r.bottom - r.top, SWP_NOACTIVATE | SWP_SHOWWINDOW); @@ -1506,7 +1512,7 @@ /*********************************************************************** * COMBO_Size */ -static void COMBO_Size( LPHEADCOMBO lphc, LPARAM lParam ) +static void COMBO_Size( LPHEADCOMBO lphc ) { /* * Those controls are always the same height. So we have to make sure @@ -1514,8 +1520,12 @@ */ if( CB_GETTYPE(lphc) != CBS_SIMPLE ) { - int newComboHeight; - + int newComboHeight, curComboHeight, curComboWidth; + RECT rc; + + GetWindowRect(lphc->self, &rc); + curComboHeight = rc.bottom - rc.top; + curComboWidth = rc.right - rc.left; newComboHeight = CBGetTextAreaHeight(lphc->self, lphc) + 2*COMBO_YBORDERSIZE(); /* @@ -1526,18 +1536,18 @@ * the actual control, for example, to do the layout of a dialog that is * resized, the height of the dropdown is not changed. */ - if( HIWORD(lParam) > newComboHeight ) + if( curComboHeight > newComboHeight ) { TRACE("oldComboHeight=%d, newComboHeight=%d, oldDropBottom=%d, oldDropTop=%d\n", - HIWORD(lParam), newComboHeight, lphc->droppedRect.bottom, + curComboHeight, newComboHeight, lphc->droppedRect.bottom, lphc->droppedRect.top); - lphc->droppedRect.bottom = lphc->droppedRect.top + HIWORD(lParam) - newComboHeight; + lphc->droppedRect.bottom = lphc->droppedRect.top + curComboHeight - newComboHeight; } /* * Restore original height */ - if( HIWORD(lParam) != newComboHeight ) - SetWindowPos(lphc->self, 0, 0, 0, LOWORD(lParam), newComboHeight, + if( curComboHeight != newComboHeight ) + SetWindowPos(lphc->self, 0, 0, 0, curComboWidth, newComboHeight, SWP_NOZORDER|SWP_NOMOVE|SWP_NOACTIVATE|SWP_NOREDRAW); } @@ -1885,7 +1895,7 @@ } case WM_SIZE: if( lphc->hWndLBox && - !(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc, lParam ); + !(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc ); return TRUE; case WM_SETFONT: COMBO_Font( lphc, (HFONT)wParam, (BOOL)lParam );

11 years, 6 months

[jimtabor] 59156: [WineTests] - Sync to 1.5.31.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Jun 2 20:45:51 2013 New Revision: 59156 URL: http://svn.reactos.org/svn/reactos?rev=59156&view=rev Log: [WineTests] - Sync to 1.5.31. Modified: trunk/rostests/winetests/user32/edit.c trunk/rostests/winetests/user32/listbox.c trunk/rostests/winetests/user32/scroll.c Modified: trunk/rostests/winetests/user32/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/edit.c?r… ============================================================================== --- trunk/rostests/winetests/user32/edit.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/edit.c [iso-8859-1] Sun Jun 2 20:45:51 2013 @@ -2530,6 +2530,120 @@ destroy_child_editcontrol(hwEdit); } +static void test_EM_GETHANDLE(void) +{ + static const char str0[] = "untouched"; + static const char str1[] = "1111+1111+1111#"; + static const char str2[] = "2222-2222-2222-2222#"; + static const char str3[] = "3333*3333*3333*3333*3333#"; + CHAR current[42]; + HWND hEdit; + HLOCAL hmem; + HLOCAL hmem2; + HLOCAL halloc; + char *buffer; + int len; + int r; + + trace("EDIT: EM_GETHANDLE\n"); + + /* EM_GETHANDLE is not supported for a single line edit control */ + hEdit = create_editcontrol(WS_BORDER, 0); + ok(hEdit != NULL, "got %p (expected != NULL)\n", hEdit); + + hmem = (HGLOBAL) SendMessage(hEdit, EM_GETHANDLE, 0, 0); + ok(hmem == NULL, "got %p (expected NULL)\n", hmem); + DestroyWindow(hEdit); + + + /* EM_GETHANDLE needs a multiline edit control */ + hEdit = create_editcontrol(WS_BORDER | ES_MULTILINE, 0); + ok(hEdit != NULL, "got %p (expected != NULL)\n", hEdit); + + /* set some text */ + r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str1); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok((r == 1) && (len == lstrlenA(str1)), "got %d and %d (expected 1 and %d)\n", r, len, lstrlenA(str1)); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); + ok((r == lstrlenA(str1)) && !lstrcmpA(current, str1), + "got %d and \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1), str1); + + hmem = (HGLOBAL) SendMessage(hEdit, EM_GETHANDLE, 0, 0); + ok(hmem != NULL, "got %p (expected != NULL)\n", hmem); + /* The buffer belongs to the app now. According to MSDN, the app has to LocalFree the + buffer, LocalAlloc a new buffer and pass it to the edit control with EM_SETHANDLE. */ + + buffer = LocalLock(hmem); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + len = lstrlenA(buffer); + ok((len == lstrlenA(str1)) && !lstrcmpA(buffer, str1), + "got %d and \"%s\" (expected %d and \"%s\")\n", len, buffer, lstrlenA(str1), str1); + LocalUnlock(hmem); + + /* use LocalAlloc first to get a different handle */ + halloc = LocalAlloc(LMEM_MOVEABLE, 42); + ok(halloc != NULL, "got %p (expected != NULL)\n", halloc); + /* prepare our new memory */ + buffer = LocalLock(halloc); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + lstrcpyA(buffer, str2); + LocalUnlock(halloc); + + /* LocalFree the old memory handle before EM_SETHANDLE the new handle */ + LocalFree(hmem); + /* use LocalAlloc after the LocalFree to likely consume the handle */ + hmem2 = LocalAlloc(LMEM_MOVEABLE, 42); + ok(hmem2 != NULL, "got %p (expected != NULL)\n", hmem2); + + SendMessage(hEdit, EM_SETHANDLE, (WPARAM)halloc, 0); + + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok(len == lstrlenA(str2), "got %d (expected %d)\n", len, lstrlenA(str2)); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); + ok((r == lstrlenA(str2)) && !lstrcmpA(current, str2), + "got %d and \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str2), str2); + + /* set a different text */ + r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str3); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok((r == 1) && (len == lstrlenA(str3)), "got %d and %d (expected 1 and %d)\n", r, len, lstrlenA(str3)); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); + ok((r == lstrlenA(str3)) && !lstrcmpA(current, str3), + "got %d and \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str3), str3); + + LocalFree(hmem2); + DestroyWindow(hEdit); + + /* Some apps have bugs ... */ + hEdit = create_editcontrol(WS_BORDER | ES_MULTILINE, 0); + + /* set some text */ + r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str1); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok((r == 1) && (len == lstrlenA(str1)), "got %d and %d (expected 1 and %d)\n", r, len, lstrlenA(str1)); + + /* everything is normal upto EM_GETHANDLE */ + hmem = (HGLOBAL) SendMessage(hEdit, EM_GETHANDLE, 0, 0); + /* Some messages still work while other messages fail. + After LocalFree the memory handle, messages can crash the app */ + + /* A buggy editor used EM_GETHANDLE twice */ + hmem2 = (HGLOBAL) SendMessage(hEdit, EM_GETHANDLE, 0, 0); + ok(hmem2 == hmem, "got %p (expected %p)\n", hmem2, hmem); + + /* Let the edit control free the memory handle */ + SendMessage(hEdit, EM_SETHANDLE, (WPARAM)hmem2, 0); + + DestroyWindow(hEdit); +} + + START_TEST(edit) { BOOL b; @@ -2568,5 +2682,7 @@ else win_skip("EndMenu is not available\n"); + test_EM_GETHANDLE(); + UnregisterWindowClasses(); } Modified: trunk/rostests/winetests/user32/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/listbox.… ============================================================================== --- trunk/rostests/winetests/user32/listbox.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/listbox.c [iso-8859-1] Sun Jun 2 20:45:51 2013 @@ -274,30 +274,42 @@ return DefWindowProc(hwnd, msg, wparam, lparam); } -static void test_ownerdraw(void) +static HWND create_parent( void ) { WNDCLASS cls; - HWND parent, hLB; - INT ret; - RECT rc; - - cls.style = 0; - cls.lpfnWndProc = main_window_proc; - cls.cbClsExtra = 0; - cls.cbWndExtra = 0; - cls.hInstance = GetModuleHandle(0); - cls.hIcon = 0; - cls.hCursor = LoadCursor(0, IDC_ARROW); - cls.hbrBackground = GetStockObject(WHITE_BRUSH); - cls.lpszMenuName = NULL; - cls.lpszClassName = "main_window_class"; - ok (RegisterClass(&cls), "RegisterClass failed\n"); + HWND parent; + static ATOM class; + + if (!class) + { + cls.style = 0; + cls.lpfnWndProc = main_window_proc; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandle(0); + cls.hIcon = 0; + cls.hCursor = LoadCursor(0, IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "main_window_class"; + class = RegisterClass( &cls ); + } parent = CreateWindowEx(0, "main_window_class", NULL, WS_POPUP | WS_VISIBLE, 100, 100, 400, 400, GetDesktopWindow(), 0, GetModuleHandle(0), NULL); + return parent; +} + +static void test_ownerdraw(void) +{ + HWND parent, hLB; + INT ret; + RECT rc; + + parent = create_parent(); assert(parent); hLB = create_listbox(LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE, parent); @@ -1496,6 +1508,84 @@ "GetLastError should return 0x589, got 0x%X\n",GetLastError()); DestroyWindow(hWnd); +} + +static void test_set_count( void ) +{ + HWND parent, listbox; + LONG ret; + RECT r; + + parent = create_parent(); + listbox = create_listbox( LBS_OWNERDRAWFIXED | LBS_NODATA | WS_CHILD | WS_VISIBLE, parent ); + + UpdateWindow( listbox ); + GetUpdateRect( listbox, &r, TRUE ); + ok( IsRectEmpty( &r ), "got non-empty rect\n"); + + ret = SendMessage( listbox, LB_SETCOUNT, 100, 0 ); + ok( ret == 0, "got %d\n", ret ); + ret = SendMessage( listbox, LB_GETCOUNT, 0, 0 ); + ok( ret == 100, "got %d\n", ret ); + + GetUpdateRect( listbox, &r, TRUE ); + ok( !IsRectEmpty( &r ), "got empty rect\n"); + + ValidateRect( listbox, NULL ); + GetUpdateRect( listbox, &r, TRUE ); + ok( IsRectEmpty( &r ), "got non-empty rect\n"); + + ret = SendMessage( listbox, LB_SETCOUNT, 99, 0 ); + ok( ret == 0, "got %d\n", ret ); + + GetUpdateRect( listbox, &r, TRUE ); + ok( !IsRectEmpty( &r ), "got empty rect\n"); + + DestroyWindow( listbox ); + DestroyWindow( parent ); +} + +static DWORD (WINAPI *pGetListBoxInfo)(HWND); +static int lb_getlistboxinfo; + +static LRESULT WINAPI listbox_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + + if (message == LB_GETLISTBOXINFO) + lb_getlistboxinfo++; + + return CallWindowProcA(oldproc, hwnd, message, wParam, lParam); +} + +static void test_GetListBoxInfo(void) +{ + HWND listbox, parent; + WNDPROC oldproc; + DWORD ret; + + pGetListBoxInfo = (void*)GetProcAddress(GetModuleHandle("user32"), "GetListBoxInfo"); + + if (!pGetListBoxInfo) + { + win_skip("GetListBoxInfo() not available\n"); + return; + } + + parent = create_parent(); + listbox = create_listbox(WS_CHILD | WS_VISIBLE, parent); + + oldproc = (WNDPROC)SetWindowLongPtrA(listbox, GWLP_WNDPROC, (LONG_PTR)listbox_subclass_proc); + SetWindowLongPtrA(listbox, GWLP_USERDATA, (LONG_PTR)oldproc); + + lb_getlistboxinfo = 0; + ret = pGetListBoxInfo(listbox); + ok(ret > 0, "got %d\n", ret); +todo_wine + ok(lb_getlistboxinfo == 0, "got %d\n", lb_getlistboxinfo); + + DestroyWindow(listbox); + DestroyWindow(parent); } START_TEST(listbox) @@ -1576,4 +1666,6 @@ test_listbox_item_data(); test_listbox_LB_DIR(); test_listbox_dlgdir(); -} + test_set_count(); + test_GetListBoxInfo(); +} Modified: trunk/rostests/winetests/user32/scroll.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/scroll.c… ============================================================================== --- trunk/rostests/winetests/user32/scroll.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/scroll.c [iso-8859-1] Sun Jun 2 20:45:51 2013 @@ -241,7 +241,6 @@ ok( min == 0 && max == 0, "Scroll bar range is %d,%d. Expected 0,0. Style %08x\n", min, max, style); else -todo_wine ok(( min == 0 && max == 100) || broken( min == 0 && max == 0), /* Win 9x/ME */ "Scroll bar range is %d,%d. Expected 0,100. Style %08x\n", min, max, style); @@ -253,7 +252,6 @@ ok( min == 0 && max == 0, "Scroll bar range is %d,%d. Expected 0,0. Style %08x\n", min, max, style); else -todo_wine ok(( min == 0 && max == 100) || broken( min == 0 && max == 0), /* Win 9x/ME */ "Scroll bar range is %d,%d. Expected 0,100. Style %08x\n", min, max, style); @@ -263,7 +261,6 @@ if( !( style & ( WS_VSCROLL | WS_HSCROLL))) ok( !ret, "GetScrollInfo succeeded unexpectedly. Style is %08x\n", style); else -todo_wine ok( ret || broken( !ret), /* Win 9x/ME */ "GetScrollInfo failed unexpectedly. Style is %08x\n", style); @@ -273,7 +270,6 @@ if( !( style & ( WS_VSCROLL | WS_HSCROLL))) ok( !ret, "GetScrollInfo succeeded unexpectedly. Style is %08x\n", style); else -todo_wine ok( ret || broken( !ret), /* Win 9x/ME */ "GetScrollInfo failed unexpectedly. Style is %08x\n", style); @@ -396,6 +392,98 @@ DestroyWindow( hwnd); } +static LRESULT CALLBACK scroll_init_proc(HWND hwnd, UINT msg, + WPARAM wparam, LPARAM lparam) +{ + SCROLLINFO horz, vert; + CREATESTRUCTA *cs = (CREATESTRUCTA *)lparam; + BOOL h_ret, v_ret; + + switch(msg) + { + case WM_NCCREATE: + return cs->lpCreateParams ? DefWindowProcA(hwnd, msg, wparam, lparam) : + TRUE; + + case WM_CREATE: + horz.cbSize = sizeof horz; + horz.fMask = SIF_ALL; + horz.nMin = 0xdeadbeaf; + horz.nMax = 0xbaadc0de; + vert = horz; + h_ret = GetScrollInfo(hwnd, SB_HORZ, &horz); + v_ret = GetScrollInfo(hwnd, SB_VERT, &vert); + + if(cs->lpCreateParams) + { + /* WM_NCCREATE was passed to DefWindowProc */ + if(cs->style & (WS_VSCROLL | WS_HSCROLL)) + { + ok(h_ret && v_ret, "GetScrollInfo() should return NON-zero " + "but got h_ret=%d v_ret=%d\n", h_ret, v_ret); + ok(vert.nMin == 0 && vert.nMax == 100, + "unexpected init values(SB_VERT): min=%d max=%d\n", + vert.nMin, vert.nMax); + ok(horz.nMin == 0 && horz.nMax == 100, + "unexpected init values(SB_HORZ): min=%d max=%d\n", + horz.nMin, horz.nMax); + } + else + { + ok(!h_ret && !v_ret, "GetScrollInfo() should return zeru, " + "but got h_ret=%d v_ret=%d\n", h_ret, v_ret); + ok(vert.nMin == 0xdeadbeaf && vert.nMax == 0xbaadc0de, + "unexpected initialization(SB_VERT): min=%d max=%d\n", + vert.nMin, vert.nMax); + ok(horz.nMin == 0xdeadbeaf && horz.nMax == 0xbaadc0de, + "unexpected initialization(SB_HORZ): min=%d max=%d\n", + horz.nMin, horz.nMax); + } + } + else + { + ok(!h_ret && !v_ret, "GetScrollInfo() should return zeru, " + "but got h_ret=%d v_ret=%d\n", h_ret, v_ret); + ok(horz.nMin == 0xdeadbeaf && horz.nMax == 0xbaadc0de && + vert.nMin == 0xdeadbeaf && vert.nMax == 0xbaadc0de, + "unexpected initialization\n"); + } + return FALSE; /* abort creation */ + + default: + /* need for WM_GETMINMAXINFO, which precedes WM_NCCREATE */ + return 0; + } +} + +static void scrollbar_test_init(void) +{ + WNDCLASSEXA wc; + CHAR cls_name[] = "scroll_test_class"; + LONG style[] = {WS_VSCROLL, WS_HSCROLL, WS_VSCROLL | WS_HSCROLL, 0}; + int i; + + memset( &wc, 0, sizeof wc ); + wc.cbSize = sizeof wc; + wc.style = CS_VREDRAW | CS_HREDRAW; + wc.hInstance = GetModuleHandleA(0); + wc.hCursor = LoadCursorA(NULL, IDC_ARROW); + wc.hbrBackground = GetStockObject(WHITE_BRUSH); + wc.lpszClassName = cls_name; + wc.lpfnWndProc = scroll_init_proc; + RegisterClassExA(&wc); + + for(i = 0; i < sizeof style / sizeof style[0]; i++) + { + /* need not to destroy these windows due creation abort */ + CreateWindowExA(0, cls_name, NULL, style[i], + 100, 100, 100, 100, NULL, NULL, wc.hInstance, (LPVOID)TRUE); + CreateWindowExA(0, cls_name, NULL, style[i], + 100, 100, 100, 100, NULL, NULL, wc.hInstance, (LPVOID)FALSE); + } + UnregisterClassA(cls_name, wc.hInstance); +} + START_TEST ( scroll ) { WNDCLASSA wc; @@ -444,6 +532,8 @@ scrollbar_test_default( WS_VSCROLL); scrollbar_test_default( WS_HSCROLL | WS_VSCROLL); + scrollbar_test_init(); + DestroyWindow(hScroll); DestroyWindow(hMainWnd); }

11 years, 6 months

[tkreuzer] 59155: [RTL] Fix another warning

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jun 2 19:25:38 2013 New Revision: 59155 URL: http://svn.reactos.org/svn/reactos?rev=59155&view=rev Log: [RTL] Fix another warning Modified: trunk/reactos/lib/rtl/bootdata.c Modified: trunk/reactos/lib/rtl/bootdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bootdata.c?rev=591… ============================================================================== --- trunk/reactos/lib/rtl/bootdata.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/bootdata.c [iso-8859-1] Sun Jun 2 19:25:38 2013 @@ -706,6 +706,7 @@ NULL); AllocationSize.QuadPart = 0x800; + DBG_UNREFERENCED_LOCAL_VARIABLE(AllocationSize); /* Create the boot status data file */ Status = ZwCreateFile(&FileHandle,

11 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2013