April 2007 - Wine-commits - list.winehq.org

appdb/include objectManager.php sidebar_admin. ...
by WineHQ 21 Apr '07

21 Apr '07

ChangeSet ID: 31060 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/20 20:02:10 Modified files: include : objectManager.php sidebar_admin.php sidebar_login.php sidebar_maintainer_admin.php testData.php testData_queue.php version_queue.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> More fixes and uses for objectManager's version/testData queues Patch: http://cvs.winehq.org/patch.py?id=31060 Old revision New revision Changes Path 1.12 1.13 +3 -0 appdb/include/objectManager.php 1.40 1.41 +5 -5 appdb/include/sidebar_admin.php 1.24 1.25 +8 -0 appdb/include/sidebar_login.php 1.9 1.10 +1 -1 appdb/include/sidebar_maintainer_admin.php 1.42 1.43 +44 -16 appdb/include/testData.php 1.2 1.3 +23 -7 appdb/include/testData_queue.php 1.1 1.2 +7 -5 appdb/include/version_queue.php

1 0

appdb/unit_test test_om_objects.php
by WineHQ 21 Apr '07

21 Apr '07

ChangeSet ID: 31059 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/20 19:58:08 Modified files: unit_test : test_om_objects.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Test version/testData queues. Test version_queue and testData_queue with the objectManager tests Patch: http://cvs.winehq.org/patch.py?id=31059 Old revision New revision Changes Path 1.8 1.9 +29 -24 appdb/unit_test/test_om_objects.php Index: appdb/unit_test/test_om_objects.php diff -u -p appdb/unit_test/test_om_objects.php:1.8 appdb/unit_test/test_om_objects.php:1.9 --- appdb/unit_test/test_om_objects.php:1.8 21 Apr 2007 0:58: 8 -0000 +++ appdb/unit_test/test_om_objects.php 21 Apr 2007 0:58: 8 -0000 @@ -7,6 +7,8 @@ require_once("test_common.php"); require_once(BASE.'include/objectManager.php'); require_once(BASE.'include/application.php'); require_once(BASE.'include/maintainer.php'); +require_once(BASE.'include/testData_queue.php'); +require_once(BASE.'include/version_queue.php'); /* internal function */ function test_class($sClassName, $aTestMethods) @@ -119,31 +121,34 @@ function test_object_methods() { test_start(__FUNCTION__); - $aTestMethods = array("objectGetHeader", "objectOutputTableRow", - "objectGetEntries", "display", - "objectGetInstanceFromRow", "outputEditor", "canEdit", - "getOutputEditorValues", "objectMakeUrl", "objectMakeLink"); + $aTestMethods = array("canEdit", + "display", + "getOutputEditorValues", + "objectGetEntries", + "objectGetHeader", + "objectGetInstanceFromRow", + "objectOutputTableRow", + "objectMakeLink", + "objectMakeUrl", + "outputEditor", + ); + + $aTestClasses = array("application", + "distribution", + "maintainer", + "screenshot", + "testData", + "testData_queue", + "vendor", + "version", + "version_queue" + ); - if(!test_class("distribution", $aTestMethods)) - return FALSE; - - if(!test_class("vendor", $aTestMethods)) - return FALSE; - - if(!test_class("maintainer", $aTestMethods)) - return FALSE; - - if(!test_class("screenshot", $aTestMethods)) - return FALSE; - - if(!test_class("application", $aTestMethods)) - return FALSE; - - if(!test_class("testData", $aTestMethods)) - return FALSE; - - if(!test_class("version", $aTestMethods)) - return FALSE; + foreach($aTestClasses as $sTestClass) + { + if(!test_class($sTestClass, $aTestMethods)) + return FALSE; + } return true; }

1 0

Stefan Dösinger : wined3d: The cursor texture doesn' t have GL_APPLE_client_storage backing.
by Alexandre Julliard 20 Apr '07

20 Apr '07

Module: wine Branch: master Commit: c42a1dc2260c5e0094e129c71d3fdc415482fe46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c42a1dc2260c5e0094e129c71… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 19 22:52:11 2007 +0200 wined3d: The cursor texture doesn't have GL_APPLE_client_storage backing. --- dlls/wined3d/device.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 90c311e..e878c4a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5602,6 +5602,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetCursorProperties(IWineD3DDevice* i memcpy(&mem[width * bpp * i], &bits[rect.Pitch * i], width * bpp); IWineD3DSurface_UnlockRect(pCursorBitmap); ENTER_GL(); + + if(GL_SUPPORT(APPLE_CLIENT_STORAGE)) { + glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); + checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE)"); + } + /* Make sure that a proper texture unit is selected */ if (GL_SUPPORT(ARB_MULTITEXTURE)) { GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); @@ -5617,6 +5623,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetCursorProperties(IWineD3DDevice* i glTexImage2D(GL_TEXTURE_2D, 0, intfmt, width, height, 0, format, type, mem); HeapFree(GetProcessHeap(), 0, mem); checkGLcall("glTexImage2D"); + + if(GL_SUPPORT(APPLE_CLIENT_STORAGE)) { + glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); + checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE)"); + } + LEAVE_GL(); } else

1 0

Rolf Kalbermatter : advapi32: Implement QueryServiceStatusEx.
by Alexandre Julliard 20 Apr '07

20 Apr '07

Module: wine Branch: master Commit: af5f6325e5e22fb53c772ea17d004dc19a18b115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af5f6325e5e22fb53c772ea17… Author: Rolf Kalbermatter <r.kalbermatter(a)hccnet.nl> Date: Fri Apr 20 10:36:19 2007 +0200 advapi32: Implement QueryServiceStatusEx. Based on a patch by Anastasius Focht. --- dlls/advapi32/service.c | 71 +++++++++++++++++++++++++++++++++++++++++++++-- include/winsvc.h | 9 ++++++ 2 files changed, 77 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 60f8dca..53ec9fc 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1635,9 +1635,74 @@ BOOL WINAPI QueryServiceStatusEx(SC_HANDLE hService, SC_STATUS_TYPE InfoLevel, LPBYTE lpBuffer, DWORD cbBufSize, LPDWORD pcbBytesNeeded) { - FIXME("stub\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + struct sc_service *hsvc; + DWORD size, type, val; + HANDLE pipe; + LONG r; + LPSERVICE_STATUS_PROCESS pSvcStatusData; + + TRACE("%p %d %p %d %p\n", hService, InfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); + + if (InfoLevel != SC_STATUS_PROCESS_INFO) + { + SetLastError( ERROR_INVALID_LEVEL); + return FALSE; + } + + pSvcStatusData = (LPSERVICE_STATUS_PROCESS) lpBuffer; + if (pSvcStatusData == NULL) + { + SetLastError( ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (cbBufSize < sizeof(SERVICE_STATUS_PROCESS)) + { + if( pcbBytesNeeded != NULL) + *pcbBytesNeeded = sizeof(SERVICE_STATUS_PROCESS); + + SetLastError( ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + hsvc = sc_handle_get_handle_data(hService, SC_HTYPE_SERVICE); + if (!hsvc) + { + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; + } + + /* FIXME: this would be the pid from service_start_process() */ + pSvcStatusData->dwProcessId = 0; + /* service is running in a process that is not a system process */ + pSvcStatusData->dwServiceFlags = 0; + + pipe = service_open_pipe(hsvc->name); + if (pipe != INVALID_HANDLE_VALUE) + { + r = service_get_status(pipe, &pSvcStatusData->status); + CloseHandle(pipe); + if (r) + return TRUE; + } + + TRACE("Failed to read service status\n"); + + /* read the service type from the registry */ + size = sizeof(val); + r = RegQueryValueExA(hsvc->hkey, "Type", NULL, &type, (LPBYTE)&val, &size); + if (r != ERROR_SUCCESS || type != REG_DWORD) + val = 0; + + pSvcStatusData->status.dwServiceType = val; + pSvcStatusData->status.dwCurrentState = SERVICE_STOPPED; /* stopped */ + pSvcStatusData->status.dwControlsAccepted = 0; + pSvcStatusData->status.dwWin32ExitCode = ERROR_SERVICE_NEVER_STARTED; + pSvcStatusData->status.dwServiceSpecificExitCode = 0; + pSvcStatusData->status.dwCheckPoint = 0; + pSvcStatusData->status.dwWaitHint = 0; + + return TRUE; } /****************************************************************************** diff --git a/include/winsvc.h b/include/winsvc.h index 93ccaf6..eeb9539 100644 --- a/include/winsvc.h +++ b/include/winsvc.h @@ -131,6 +131,15 @@ typedef struct _SERVICE_STATUS { DWORD dwWaitHint; } SERVICE_STATUS, *LPSERVICE_STATUS; +/* Service status process structure */ + +typedef struct _SERVICE_STATUS_PROCESS +{ + SERVICE_STATUS status; + DWORD dwProcessId; + DWORD dwServiceFlags; +} SERVICE_STATUS_PROCESS, *LPSERVICE_STATUS_PROCESS; + typedef enum _SC_STATUS_TYPE { SC_STATUS_PROCESS_INFO = 0 } SC_STATUS_TYPE;

1 0

Rolf Kalbermatter : advapi32: Make QueryServiceStatus use QueryServiceStatusEx.
by Alexandre Julliard 20 Apr '07

20 Apr '07

Module: wine Branch: master Commit: 6c33eb4410d955ec9407b17c9f7353bca021ca4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c33eb4410d955ec9407b17c9… Author: Rolf Kalbermatter <r.kalbermatter(a)hccnet.nl> Date: Fri Apr 20 10:42:12 2007 +0200 advapi32: Make QueryServiceStatus use QueryServiceStatusEx. --- dlls/advapi32/service.c | 48 ++++++++-------------------------------------- 1 files changed, 9 insertions(+), 39 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 53ec9fc..34cb96a 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1566,55 +1566,25 @@ BOOL WINAPI StartServiceW(SC_HANDLE hService, DWORD dwNumServiceArgs, * QueryServiceStatus [ADVAPI32.@] * * PARAMS - * hService [] - * lpservicestatus [] + * hService [I] Handle to service to get information about + * lpservicestatus [O] buffer to receive the status information for the service * */ BOOL WINAPI QueryServiceStatus(SC_HANDLE hService, LPSERVICE_STATUS lpservicestatus) { - struct sc_service *hsvc; - DWORD size, type, val; - HANDLE pipe; - LONG r; + SERVICE_STATUS_PROCESS SvcStatusData; + BOOL ret; TRACE("%p %p\n", hService, lpservicestatus); - hsvc = sc_handle_get_handle_data(hService, SC_HTYPE_SERVICE); - if (!hsvc) - { - SetLastError( ERROR_INVALID_HANDLE ); - return FALSE; - } - - pipe = service_open_pipe(hsvc->name); - if (pipe != INVALID_HANDLE_VALUE) - { - r = service_get_status(pipe, lpservicestatus); - CloseHandle(pipe); - if (r) - return TRUE; - } - - TRACE("Failed to read service status\n"); - - /* read the service type from the registry */ - size = sizeof(val); - r = RegQueryValueExA(hsvc->hkey, "Type", NULL, &type, (LPBYTE)&val, &size); - if(r!=ERROR_SUCCESS || type!=REG_DWORD) - val = 0; - - lpservicestatus->dwServiceType = val; - lpservicestatus->dwCurrentState = SERVICE_STOPPED; /* stopped */ - lpservicestatus->dwControlsAccepted = 0; - lpservicestatus->dwWin32ExitCode = ERROR_SERVICE_NEVER_STARTED; - lpservicestatus->dwServiceSpecificExitCode = 0; - lpservicestatus->dwCheckPoint = 0; - lpservicestatus->dwWaitHint = 0; - - return TRUE; + ret = QueryServiceStatusEx(hService, SC_STATUS_PROCESS_INFO, (LPBYTE)&SvcStatusData, + sizeof(SERVICE_STATUS_PROCESS), NULL); + if (ret) *lpservicestatus = SvcStatusData.status; + return ret; } + /****************************************************************************** * QueryServiceStatusEx [ADVAPI32.@] *

1 0

Huw Davies : user32: Keep track of whether the app has asked for the text buffer handle.
by Alexandre Julliard 20 Apr '07

20 Apr '07

Module: wine Branch: master Commit: c79ce3cdbe84f8b02938748a05fe89f722278370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c79ce3cdbe84f8b02938748a0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 19 14:47:12 2007 +0100 user32: Keep track of whether the app has asked for the text buffer handle. --- dlls/user32/edit.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index bbd8a05..1207d05 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -83,7 +83,8 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); #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. */ typedef enum { END_0 = 0, /* line ends with terminating '\0' character */ @@ -2713,6 +2714,7 @@ static HLOCAL EDIT_EM_GetHandle(EDITSTATE *es) hLocal = es->hloc32A; } + es->flags |= EF_APP_HAS_HANDLE; TRACE("Returning %p, LocalSize() = %ld\n", hLocal, LocalSize(hLocal)); return hLocal; } @@ -2777,6 +2779,7 @@ static HLOCAL16 EDIT_EM_GetHandle16(EDITSTATE *es) WideCharToMultiByte(CP_ACP, 0, es->text, -1, textA, countA, NULL, NULL); LocalUnlock16(es->hloc16); + es->flags |= EF_APP_HAS_HANDLE; TRACE("Returning %04X, LocalSize() = %d\n", es->hloc16, LocalSize16(es->hloc16)); @@ -3534,6 +3537,7 @@ static void EDIT_EM_SetHandle(EDITSTATE *es, HLOCAL hloc) es->buffer_size = LocalSize(es->hloc32W)/sizeof(WCHAR) - 1; + es->flags |= EF_APP_HAS_HANDLE; EDIT_LockBuffer(es); es->x_offset = es->y_offset = 0; @@ -3605,6 +3609,7 @@ static void EDIT_EM_SetHandle16(EDITSTATE *es, HLOCAL16 hloc) es->buffer_size = LocalSize(es->hloc32W)/sizeof(WCHAR) - 1; + es->flags |= EF_APP_HAS_HANDLE; EDIT_LockBuffer(es); es->x_offset = es->y_offset = 0;

1 0

Huw Davies : user32: Add a function to return the length of the text buffer .
by Alexandre Julliard 20 Apr '07

20 Apr '07

Module: wine Branch: master Commit: a0dbcb2595bedf5936ea00bf999a758ddbbfc809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0dbcb2595bedf5936ea00bf9… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 19 14:52:51 2007 +0100 user32: Add a function to return the length of the text buffer. --- dlls/user32/edit.c | 49 ++++++++++++++++++++++++++----------------------- 1 files changed, 26 insertions(+), 23 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 1207d05..154e9d5 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -394,6 +394,10 @@ static DWORD get_app_version(void) return version; } +static inline UINT get_text_length(EDITSTATE *es) +{ + return strlenW(es->text); +} static HBRUSH EDIT_NotifyCtlColor(EDITSTATE *es, HDC hdc) { @@ -760,8 +764,7 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, break; case EM_POSFROMCHAR: - result = strlenW(es->text); - if ((INT)wParam >= result) result = -1; + if ((INT)wParam >= get_text_length(es)) result = -1; else result = EDIT_EM_PosFromChar(es, (INT)wParam, FALSE); break; @@ -895,8 +898,8 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, break; case WM_GETTEXTLENGTH: - if (unicode) result = strlenW(es->text); - else result = WideCharToMultiByte( CP_ACP, 0, es->text, strlenW(es->text), + if (unicode) result = get_text_length(es); + else result = WideCharToMultiByte( CP_ACP, 0, es->text, get_text_length(es), NULL, 0, NULL, NULL ); break; @@ -1571,7 +1574,7 @@ static INT EDIT_CharFromPos(EDITSTATE *es, INT x, INT y, LPBOOL after_wrap) else { INT low = es->x_offset; - INT high = strlenW(es->text) + 1; + INT high = get_text_length(es) + 1; while (low < high - 1) { INT mid = (low + high) / 2; @@ -1647,7 +1650,7 @@ static void EDIT_GetLineRect(EDITSTATE *es, INT line, INT scol, INT ecol, LPRECT static LPWSTR EDIT_GetPasswordPointer_SL(EDITSTATE *es) { if (es->style & ES_PASSWORD) { - INT len = strlenW(es->text); + INT len = get_text_length(es); LPWSTR text = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); text[len] = '\0'; while(len) text[--len] = es->password_char; @@ -1847,7 +1850,7 @@ static void EDIT_InvalidateText(EDITSTATE *es, INT start, INT end) return; if (end == -1) - end = strlenW(es->text); + end = get_text_length(es); if (end < start) { INT tmp = start; @@ -1995,7 +1998,7 @@ static void EDIT_MoveEnd(EDITSTATE *es, BOOL extend) e = EDIT_CharFromPos(es, 0x3fffffff, HIWORD(EDIT_EM_PosFromChar(es, es->selection_end, es->flags & EF_AFTER_WRAP)), &after_wrap); else - e = strlenW(es->text); + e = get_text_length(es); EDIT_EM_SetSel(es, extend ? es->selection_start : e, e, after_wrap); EDIT_EM_ScrollCaret(es); } @@ -2361,7 +2364,7 @@ static void EDIT_AdjustFormatRect(EDITSTATE *es) es->format_rect.bottom = min(es->format_rect.bottom, ClientRect.bottom); if ((es->style & ES_MULTILINE) && !(es->style & ES_AUTOHSCROLL)) - EDIT_BuildLineDefs_ML(es, 0, strlenW(es->text), 0, NULL); + EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); EDIT_SetCaretPos(es, es->selection_end, es->flags & EF_AFTER_WRAP); } @@ -2441,7 +2444,7 @@ static void EDIT_UnlockBuffer(EDITSTATE *es, BOOL force) if (es->hloc32W) { CHAR *textA = NULL; UINT countA = 0; - UINT countW = strlenW(es->text) + 1; + UINT countW = get_text_length(es) + 1; STACK16FRAME* stack16 = NULL; HANDLE16 oldDS = 0; @@ -2883,7 +2886,7 @@ static INT EDIT_EM_LineFromChar(EDITSTATE *es, INT index) if (!(es->style & ES_MULTILINE)) return 0; - if (index > (INT)strlenW(es->text)) + if (index > (INT)get_text_length(es)) return es->line_count - 1; if (index == -1) index = min(es->selection_start, es->selection_end); @@ -2945,7 +2948,7 @@ static INT EDIT_EM_LineLength(EDITSTATE *es, INT index) LINEDEF *line_def; if (!(es->style & ES_MULTILINE)) - return strlenW(es->text); + return get_text_length(es); if (index == -1) { /* get the number of remaining non-selected chars of selected lines */ @@ -3053,7 +3056,7 @@ static BOOL EDIT_EM_LineScroll_internal(EDITSTATE *es, INT dx, INT dy) */ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) { - INT len = strlenW(es->text); + INT len = get_text_length(es); INT l; INT li; INT x; @@ -3159,7 +3162,7 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, LPCWSTR lpsz_replace, BOOL send_update, BOOL honor_limit) { UINT strl = strlenW(lpsz_replace); - UINT tl = strlenW(es->text); + UINT tl = get_text_length(es); UINT utl; UINT s; UINT e; @@ -3208,7 +3211,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, LPCWSTR lpsz_replac } if (strl) { /* there is an insertion */ - tl = strlenW(es->text); + tl = get_text_length(es); TRACE("inserting stuff (tl %d, strl %d, selstart %d (%s), text %s)\n", tl, strl, s, debugstr_w(es->text + s), debugstr_w(es->text)); for (p = es->text + tl ; p >= es->text + s ; p--) p[strl] = p[0]; @@ -3452,7 +3455,7 @@ static void EDIT_EM_ScrollCaret(EDITSTATE *es) EDIT_UpdateText(es, NULL, TRUE); } else if (x > es->format_rect.right) { INT x_last; - INT len = strlenW(es->text); + INT len = get_text_length(es); goal = es->format_rect.right - format_width / HSCROLL_FRACTION; do { es->x_offset++; @@ -3545,7 +3548,7 @@ static void EDIT_EM_SetHandle(EDITSTATE *es, HLOCAL hloc) EDIT_EM_EmptyUndoBuffer(es); es->flags &= ~EF_MODIFIED; es->flags &= ~EF_UPDATE; - EDIT_BuildLineDefs_ML(es, 0, strlenW(es->text), 0, NULL); + EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); EDIT_UpdateText(es, NULL, TRUE); EDIT_EM_ScrollCaret(es); /* force scroll info update */ @@ -3617,7 +3620,7 @@ static void EDIT_EM_SetHandle16(EDITSTATE *es, HLOCAL16 hloc) EDIT_EM_EmptyUndoBuffer(es); es->flags &= ~EF_MODIFIED; es->flags &= ~EF_UPDATE; - EDIT_BuildLineDefs_ML(es, 0, strlenW(es->text), 0, NULL); + EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); EDIT_UpdateText(es, NULL, TRUE); EDIT_EM_ScrollCaret(es); /* force scroll info update */ @@ -3779,7 +3782,7 @@ static void EDIT_EM_SetSel(EDITSTATE *es, UINT start, UINT end, BOOL after_wrap) { UINT old_start = es->selection_start; UINT old_end = es->selection_end; - UINT len = strlenW(es->text); + UINT len = get_text_length(es); if (start == (UINT)-1) { start = es->selection_end; @@ -3894,7 +3897,7 @@ static void EDIT_EM_SetWordBreakProc(EDITSTATE *es, void *wbp) es->word_break_proc16 = NULL; if ((es->style & ES_MULTILINE) && !(es->style & ES_AUTOHSCROLL)) { - EDIT_BuildLineDefs_ML(es, 0, strlenW(es->text), 0, NULL); + EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); EDIT_UpdateText(es, NULL, TRUE); } } @@ -3913,7 +3916,7 @@ static void EDIT_EM_SetWordBreakProc16(EDITSTATE *es, EDITWORDBREAKPROC16 wbp) es->word_break_proc = NULL; es->word_break_proc16 = wbp; if ((es->style & ES_MULTILINE) && !(es->style & ES_AUTOHSCROLL)) { - EDIT_BuildLineDefs_ML(es, 0, strlenW(es->text), 0, NULL); + EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); EDIT_UpdateText(es, NULL, TRUE); } } @@ -4105,7 +4108,7 @@ static void EDIT_WM_ContextMenu(EDITSTATE *es, INT x, INT y) /* delete */ EnableMenuItem(popup, 5, MF_BYPOSITION | ((end - start) && !(es->style & ES_READONLY) ? MF_ENABLED : MF_GRAYED)); /* select all */ - EnableMenuItem(popup, 7, MF_BYPOSITION | (start || (end != strlenW(es->text)) ? MF_ENABLED : MF_GRAYED)); + EnableMenuItem(popup, 7, MF_BYPOSITION | (start || (end != get_text_length(es)) ? MF_ENABLED : MF_GRAYED)); if (x == -1 && y == -1) /* passed via VK_APPS press/release */ { @@ -4999,7 +5002,7 @@ static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw) EC_USEFONTINFO, EC_USEFONTINFO, FALSE); if (es->style & ES_MULTILINE) - EDIT_BuildLineDefs_ML(es, 0, strlenW(es->text), 0, NULL); + EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); else EDIT_CalcLineWidth_SL(es);

1 0

Huw Davies : user32: Cache the text buffer length to avoid excessive calls to strlenW.
by Alexandre Julliard 20 Apr '07

20 Apr '07

Module: wine Branch: master Commit: 6a94516cc48ac1681e4f527933061035b121c6c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a94516cc48ac1681e4f52793… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 19 15:01:13 2007 +0100 user32: Cache the text buffer length to avoid excessive calls to strlenW. --- dlls/user32/edit.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 154e9d5..658aaf8 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -107,6 +107,7 @@ typedef struct { BOOL is_unicode; /* how the control was created */ LPWSTR text; /* the actual contents of the control */ + UINT text_length; /* cached length of text buffer (in WCHARs) - use get_text_length() to retrieve */ UINT buffer_size; /* the size of the buffer in characters */ UINT buffer_limit; /* the maximum size to which the buffer may grow in characters */ HFONT font; /* NULL means standard system font */ @@ -396,7 +397,14 @@ static DWORD get_app_version(void) static inline UINT get_text_length(EDITSTATE *es) { - return strlenW(es->text); + if(es->text_length == (UINT)-1) + es->text_length = strlenW(es->text); + return es->text_length; +} + +static inline void text_buffer_changed(EDITSTATE *es) +{ + es->text_length = (UINT)-1; } static HBRUSH EDIT_NotifyCtlColor(EDITSTATE *es, HDC hdc) @@ -1748,6 +1756,7 @@ static void EDIT_LockBuffer(EDITSTATE *es) LocalUnlock(es->hloc32A); } } + if(es->flags & EF_APP_HAS_HANDLE) text_buffer_changed(es); es->lock_count++; } @@ -3208,6 +3217,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, LPCWSTR lpsz_replac buf[bufl] = 0; /* ensure 0 termination */ /* now delete */ strcpyW(es->text + s, es->text + e); + text_buffer_changed(es); } if (strl) { /* there is an insertion */ @@ -3221,6 +3231,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, LPCWSTR lpsz_replac CharUpperBuffW(p, strl); else if(es->style & ES_LOWERCASE) CharLowerBuffW(p, strl); + text_buffer_changed(es); } if (es->style & ES_MULTILINE) { @@ -3237,6 +3248,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, LPCWSTR lpsz_replac if (e != s) for (i = 0 , p = es->text ; i < e - s ; i++) p[i + s] = buf[i]; + text_buffer_changed(es); EDIT_BuildLineDefs_ML(es, s, e, abs(es->selection_end - es->selection_start) - strl, hrgn); strl = 0; @@ -3255,6 +3267,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, LPCWSTR lpsz_replac strl--; EDIT_CalcLineWidth_SL(es); } + text_buffer_changed(es); EDIT_NOTIFY_PARENT(es, EN_MAXTEXT); } }

1 0

Andrew Talbot : dbghelp: Constify some variables.
by Alexandre Julliard 20 Apr '07

20 Apr '07

Module: wine Branch: master Commit: a224fdb14e401bf001647b1799c63d9f285d67ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=a224fdb14e401bf001647b179… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Apr 19 22:00:04 2007 +0100 dbghelp: Constify some variables. --- dlls/dbghelp/dbghelp_private.h | 10 +++++----- dlls/dbghelp/storage.c | 8 ++++---- dlls/dbghelp/symbol.c | 10 +++++----- dlls/dbghelp/type.c | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 9eccde6..a84d91c 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -62,8 +62,8 @@ unsigned vector_length(const struct vector* v); void* vector_at(const struct vector* v, unsigned pos); void* vector_add(struct vector* v, struct pool* pool); /*void vector_pool_normalize(struct vector* v, struct pool* pool); */ -void* vector_iter_up(const struct vector* v, void* elt); -void* vector_iter_down(const struct vector* v, void* elt); +void* vector_iter_up(const struct vector* v, const void* elt); +void* vector_iter_down(const struct vector* v, const void* elt); struct sparse_array { @@ -557,10 +557,10 @@ extern struct symt_function_point* enum SymTagEnum point, const struct location* loc, const char* name); -extern BOOL symt_fill_func_line_info(struct module* module, - struct symt_function* func, +extern BOOL symt_fill_func_line_info(const struct module* module, + const struct symt_function* func, DWORD addr, IMAGEHLP_LINE* line); -extern BOOL symt_get_func_line_next(struct module* module, PIMAGEHLP_LINE line); +extern BOOL symt_get_func_line_next(const struct module* module, PIMAGEHLP_LINE line); extern struct symt_thunk* symt_new_thunk(struct module* module, struct symt_compiland* parent, diff --git a/dlls/dbghelp/storage.c b/dlls/dbghelp/storage.c index 2d88d8c..e196143 100644 --- a/dlls/dbghelp/storage.c +++ b/dlls/dbghelp/storage.c @@ -101,13 +101,13 @@ void* pool_alloc(struct pool* pool, unsigned len) return ret; } -static struct pool_arena* pool_is_last(struct pool* pool, void* p, unsigned old_size) +static struct pool_arena* pool_is_last(const struct pool* pool, const void* p, unsigned old_size) { struct pool_arena* arena; for (arena = pool->first; arena; arena = arena->next) { - if (arena->current == (char*)p + old_size) return arena; + if (arena->current == (const char*)p + old_size) return arena; } return NULL; } @@ -206,7 +206,7 @@ static unsigned vector_position(const struct vector* v, const void* elt) return 0; } -void* vector_iter_up(const struct vector* v, void* elt) +void* vector_iter_up(const struct vector* v, const void* elt) { unsigned pos; @@ -216,7 +216,7 @@ void* vector_iter_up(const struct vector* v, void* elt) return vector_at(v, pos); } -void* vector_iter_down(const struct vector* v, void* elt) +void* vector_iter_down(const struct vector* v, const void* elt) { unsigned pos; if (!elt) return vector_at(v, vector_length(v) - 1); diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 2907bf3..2af5c88 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -612,7 +612,7 @@ struct sym_enum char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME]; }; -static BOOL send_symbol(const struct sym_enum* se, struct module_pair* pair, +static BOOL send_symbol(const struct sym_enum* se, const struct module_pair* pair, const struct symt_function* func, const struct symt* sym) { symt_fill_sym_info(pair, func, sym, se->sym_info); @@ -622,7 +622,7 @@ static BOOL send_symbol(const struct sym_enum* se, struct module_pair* pair, return !se->cb(se->sym_info, se->sym_info->Size, se->user); } -static BOOL symt_enum_module(struct module_pair* pair, regex_t* regex, +static BOOL symt_enum_module(struct module_pair* pair, const regex_t* regex, const struct sym_enum* se) { void* ptr; @@ -752,7 +752,7 @@ struct symt_ht* symt_find_nearest(struct module* module, DWORD addr) static BOOL symt_enum_locals_helper(struct module_pair* pair, regex_t* preg, const struct sym_enum* se, - struct symt_function* func, struct vector* v) + struct symt_function* func, const struct vector* v) { struct symt** plsym = NULL; struct symt* lsym = NULL; @@ -1223,7 +1223,7 @@ BOOL WINAPI SymGetSymFromName(HANDLE hProcess, PCSTR Name, PIMAGEHLP_SYMBOL Symb * * fills information about a file */ -BOOL symt_fill_func_line_info(struct module* module, struct symt_function* func, +BOOL symt_fill_func_line_info(const struct module* module, const struct symt_function* func, DWORD addr, IMAGEHLP_LINE* line) { struct line_info* dli = NULL; @@ -1450,7 +1450,7 @@ BOOL WINAPI SymGetLinePrev64(HANDLE hProcess, PIMAGEHLP_LINE64 Line) return TRUE; } -BOOL symt_get_func_line_next(struct module* module, PIMAGEHLP_LINE line) +BOOL symt_get_func_line_next(const struct module* module, PIMAGEHLP_LINE line) { struct line_info* li; diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 7429b04..97c606a 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -100,7 +100,7 @@ const char* symt_get_name(const struct symt* sym) } } -static struct symt* symt_find_type_by_name(struct module* module, +static struct symt* symt_find_type_by_name(const struct module* module, enum SymTagEnum sym_tag, const char* typename) {

1 0

Stefan Dösinger : wined3d: Do not upload to the vbo if there's nothing to do.
by Alexandre Julliard 20 Apr '07

20 Apr '07

Module: wine Branch: master Commit: fe3ebb3c42a122b37beaee8e433890fc2c14553d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe3ebb3c42a122b37beaee8e4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 19 18:11:36 2007 +0200 wined3d: Do not upload to the vbo if there's nothing to do. --- dlls/wined3d/indexbuffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/indexbuffer.c b/dlls/wined3d/indexbuffer.c index f64d6aa..18cfce7 100644 --- a/dlls/wined3d/indexbuffer.c +++ b/dlls/wined3d/indexbuffer.c @@ -155,7 +155,7 @@ static HRESULT WINAPI IWineD3DIndexBufferImpl_Unlock(IWineD3DIndexBuffer *iface) TRACE("(%p)\n", This); /* For now load in unlock */ - if(locks == 0 && This->vbo) { + if(locks == 0 && This->vbo && (This->dirtyend - This->dirtystart) > 0) { IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; ENTER_GL();

1 0