wine-commits December 2008

wine-commits@winehq.org

2 participants
1225 discussions

Stefan Dösinger : wined3d: Set up the shaders when delaying fixed func applying.
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: 6ec741e766629c38287dd5c25e15f92a6118cc00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ec741e766629c38287dd5c25… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 11 14:16:25 2008 +0100 wined3d: Set up the shaders when delaying fixed func applying. --- dlls/wined3d/arb_program_shader.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e64cd0e..6fda3ef 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2903,6 +2903,8 @@ static void fragment_prog_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, } state_texfactor_arbfp(STATE_RENDER(WINED3DRS_TEXTUREFACTOR), stateblock, context); state_arb_specularenable(STATE_RENDER(WINED3DRS_SPECULARENABLE), stateblock, context); + } else if(use_pshader && !isStateDirty(context, device->StateTable[STATE_VSHADER].representative)) { + device->shader_backend->shader_select((IWineD3DDevice *)stateblock->wineD3DDevice, use_pshader, use_vshader); } return; }

1 0

Stefan Dösinger : wined3d: Fake GL_ARB_multitexture.
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: 199a3468bfd06ec7165a124fc566e9508c6553bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=199a3468bfd06ec7165a124fc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 16 13:18:49 2008 +0100 wined3d: Fake GL_ARB_multitexture. --- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/context.c | 58 +++++------ dlls/wined3d/device.c | 24 ++--- dlls/wined3d/directx.c | 26 +----- dlls/wined3d/drawprim.c | 12 +-- dlls/wined3d/gl_compat.c | 181 ++++++++++++++++++++++++++++++++++ dlls/wined3d/nvidia_texture_shader.c | 13 +-- dlls/wined3d/state.c | 82 ++++------------ dlls/wined3d/surface.c | 14 +-- dlls/wined3d/wined3d_private.h | 2 +- 10 files changed, 253 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=199a3468bfd06ec7165a1…

1 0

Andrew Talbot : user32: Sign-compare warnings fix.
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: b5081dacc09d2502c78ba39fe8e62943a4db5439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5081dacc09d2502c78ba39fe… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 15 21:21:07 2008 +0000 user32: Sign-compare warnings fix. --- dlls/user32/menu.c | 14 +++++++------- dlls/user32/spy.c | 5 +++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index ed93eff..3fbb941 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1111,7 +1111,7 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) { MENUITEM *lpitem; HDC hdc; - int start, i; + UINT start, i; int orgX, orgY, maxX, maxTab, maxTabWidth, maxHeight; lppop->Width = lppop->Height = 0; @@ -1199,7 +1199,8 @@ static void MENU_MenuBarCalcSize( HDC hdc, LPRECT lprect, LPPOPUPMENU lppop, HWND hwndOwner ) { MENUITEM *lpitem; - int start, i, orgX, orgY, maxY, helpPos; + UINT start, i, helpPos; + int orgX, orgY, maxY; if ((lprect == NULL) || (lppop == NULL)) return; if (lppop->nItems == 0) return; @@ -1208,7 +1209,7 @@ static void MENU_MenuBarCalcSize( HDC hdc, LPRECT lprect, lppop->Height = 0; maxY = lprect->top+1; start = 0; - helpPos = -1; + helpPos = ~0U; lppop->maxBmpSize.cx = 0; lppop->maxBmpSize.cy = 0; while (start < lppop->nItems) @@ -1220,7 +1221,7 @@ static void MENU_MenuBarCalcSize( HDC hdc, LPRECT lprect, /* Parse items until line break or end of menu */ for (i = start; i < lppop->nItems; i++, lpitem++) { - if ((helpPos == -1) && (lpitem->fType & MF_RIGHTJUSTIFY)) helpPos = i; + if ((helpPos == ~0U) && (lpitem->fType & MF_RIGHTJUSTIFY)) helpPos = i; if ((i != start) && (lpitem->fType & (MF_MENUBREAK | MF_MENUBARBREAK))) break; @@ -1246,12 +1247,11 @@ static void MENU_MenuBarCalcSize( HDC hdc, LPRECT lprect, /* Flush right all items between the MF_RIGHTJUSTIFY and */ /* the last item (if several lines, only move the last line) */ + if (helpPos == ~0U) return; lpitem = &lppop->items[lppop->nItems-1]; orgY = lpitem->rect.top; orgX = lprect->right; for (i = lppop->nItems - 1; i >= helpPos; i--, lpitem--) { - if ( (helpPos==-1) || (helpPos>i) ) - break; /* done */ if (lpitem->rect.top != orgY) break; /* Other line */ if (lpitem->rect.right >= orgX) break; /* Too far right already */ lpitem->rect.left += orgX - lpitem->rect.right; @@ -2671,7 +2671,7 @@ static LRESULT MENU_DoNextMenu( MTRACKER* pmt, UINT vk, UINT wFlags ) icons such as MDI maximize, restore or close) */ else if ((vk == VK_RIGHT) && !IS_SYSTEM_MENU(menu)) { - int i = menu->FocusedItem + 1; + UINT i = menu->FocusedItem + 1; while (i < menu->nItems) { if ((menu->items[i].wID >= SC_SIZE && menu->items[i].wID <= SC_RESTORE)) { diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 2aed057..59fa410 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -2653,7 +2653,8 @@ void SPY_ExitMessage( INT iFlag, HWND hWnd, UINT msg, LRESULT lReturn, */ int SPY_Init(void) { - int i, j; + int i; + UINT j; char buffer[1024]; const SPY_NOTIFY *p; const USER_MSG *q; @@ -2700,7 +2701,7 @@ int SPY_Init(void) p = &spnfy_array[0]; j = 0xffffffff; while (p->name) { - if ((UINT)p->value > (UINT)j) { + if (p->value > j) { ERR("Notify message array out of order\n"); ERR(" between values [%08x] %s and [%08x] %s\n", j, (p-1)->name, p->value, p->name);

1 0

Dan Kegel : msvcrt: fread: Exhaust buffered data before using unbuffered data in ascii mode.
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: 72ffe1da676b673f6caa84f1859a601f6935dd99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ffe1da676b673f6caa84f18… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Dec 15 21:47:56 2008 -0800 msvcrt: fread: Exhaust buffered data before using unbuffered data in ascii mode. --- dlls/msvcrt/file.c | 2 ++ dlls/msvcrt/tests/file.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 76c4ea7..055ccac 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2597,6 +2597,7 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm /* first buffered data */ if(file->_cnt>0) { + while (file->_cnt>0 && rcnt > 0) { int pcnt= (rcnt>file->_cnt)? file->_cnt:rcnt; memcpy(ptr, file->_ptr, pcnt); file->_cnt -= pcnt; @@ -2606,6 +2607,7 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm read += pcnt ; rcnt -= pcnt ; ptr = (char*)ptr + pcnt; + } } else if(!(file->_flag & MSVCRT__IOREAD )) { if(file->_flag & MSVCRT__IORW) { file->_flag |= MSVCRT__IOREAD; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 9642d75..6f3fc85 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -306,6 +306,44 @@ static void test_asciimode(void) unlink("ascii.tst"); } +static void test_asciimode2(void) +{ + /* Error sequence from one app was getchar followed by small fread + * with one \r removed had last byte of buffer filled with + * next byte of *unbuffered* data rather than next byte from buffer + * Test case is a short string of one byte followed by a newline + * followed by filler to fill out the sector, then a sector of + * some different byte. + */ + + FILE *fp; + char ibuf[4]; + int i; + static const char obuf[] = +"00\n\ +000000000000000000000000000000000000000000000000000000000000000000000000000000\n\ +000000000000000000000000000000000000000000000000000000000000000000000000000000\n\ +000000000000000000000000000000000000000000000000000000000000000000000000000000\n\ +000000000000000000000000000000000000000000000000000000000000000000000000000000\n\ +000000000000000000000000000000000000000000000000000000000000000000000000000000\n\ +000000000000000000000000000000000000000000000000000000000000000000000000000000\n\ +000000000000000000\n\ +1111111111111111111"; + + fp = fopen("ascii2.tst", "wt"); + fwrite(obuf, 1, sizeof(obuf), fp); + fclose(fp); + + fp = fopen("ascii2.tst", "rt"); + ok(getc(fp) == '0', "first char not 0"); + memset(ibuf, 0, sizeof(ibuf)); + i = fread(ibuf, 1, sizeof(ibuf), fp); + ok(i == sizeof(ibuf), "fread i %d != sizeof(ibuf) %d\n", i, sizeof(ibuf)); + ok(0 == strncmp(ibuf, obuf+1, sizeof(ibuf)), "ibuf != obuf\n"); + fclose(fp); + unlink("ascii2.tst"); +} + static WCHAR* AtoW( const char* p ) { WCHAR* buffer; @@ -1113,6 +1151,7 @@ START_TEST(file) test_fopen_fclose_fcloseall(); test_fileops(); test_asciimode(); + test_asciimode2(); test_readmode(FALSE); /* binary mode */ test_readmode(TRUE); /* ascii mode */ test_fgetc();

1 0

Alexander Morozov : ntoskrnl.exe: Add stubs for Io{Allocate, Get}DriverObjectExtension.
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: 902443579f3a165120b2ffa0462e2c8389cec63f URL: http://source.winehq.org/git/wine.git/?a=commit;h=902443579f3a165120b2ffa04… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Tue Dec 16 12:19:08 2008 +0300 ntoskrnl.exe: Add stubs for Io{Allocate,Get}DriverObjectExtension. --- dlls/ntoskrnl.exe/ntoskrnl.c | 25 +++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- include/ddk/wdm.h | 2 ++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 652f5ff..a669d3b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -260,6 +260,31 @@ NTSTATUS wine_ntoskrnl_main_loop( HANDLE stop_event ) /*********************************************************************** + * IoAllocateDriverObjectExtension (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoAllocateDriverObjectExtension( PDRIVER_OBJECT DriverObject, + PVOID ClientIdentificationAddress, + ULONG DriverObjectExtensionSize, + PVOID *DriverObjectExtension ) +{ + FIXME( "%p, %p, %u, %p\n", DriverObject, ClientIdentificationAddress, + DriverObjectExtensionSize, DriverObjectExtension ); + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** + * IoGetDriverObjectExtension (NTOSKRNL.EXE.@) + */ +PVOID WINAPI IoGetDriverObjectExtension( PDRIVER_OBJECT DriverObject, + PVOID ClientIdentificationAddress ) +{ + FIXME( "%p, %p\n", DriverObject, ClientIdentificationAddress ); + return NULL; +} + + +/*********************************************************************** * IoInitializeIrp (NTOSKRNL.EXE.@) */ void WINAPI IoInitializeIrp( IRP *irp, USHORT size, CCHAR stack_size ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index cf4c86e..946249d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -309,7 +309,7 @@ @ stub IoAdapterObjectType @ stub IoAllocateAdapterChannel @ stub IoAllocateController -@ stub IoAllocateDriverObjectExtension +@ stdcall IoAllocateDriverObjectExtension(ptr ptr long ptr) @ stub IoAllocateErrorLogEntry @ stdcall IoAllocateIrp(long long) @ stdcall IoAllocateMdl(ptr long long long ptr) @@ -387,7 +387,7 @@ @ stub IoGetDeviceToVerify @ stub IoGetDiskDeviceObject @ stub IoGetDmaAdapter -@ stub IoGetDriverObjectExtension +@ stdcall IoGetDriverObjectExtension(ptr ptr) @ stub IoGetFileObjectGenericMapping @ stub IoGetInitialStack @ stub IoGetLowerDeviceObject diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index efc3f6a..0f241b6 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1026,6 +1026,7 @@ PVOID WINAPI ExAllocatePoolWithQuotaTag(POOL_TYPE,SIZE_T,ULONG); void WINAPI ExFreePool(PVOID); void WINAPI ExFreePoolWithTag(PVOID,ULONG); +NTSTATUS WINAPI IoAllocateDriverObjectExtension(PDRIVER_OBJECT,PVOID,ULONG,PVOID*); PIRP WINAPI IoAllocateIrp(CCHAR,BOOLEAN); NTSTATUS WINAPI IoCreateDevice(DRIVER_OBJECT*,ULONG,UNICODE_STRING*,DEVICE_TYPE,ULONG,BOOLEAN,DEVICE_OBJECT**); NTSTATUS WINAPI IoCreateDriver(UNICODE_STRING*,PDRIVER_INITIALIZE); @@ -1036,6 +1037,7 @@ NTSTATUS WINAPI IoDeleteSymbolicLink(UNICODE_STRING*); void WINAPI IoFreeIrp(IRP*); PEPROCESS WINAPI IoGetCurrentProcess(void); NTSTATUS WINAPI IoGetDeviceObjectPointer(UNICODE_STRING*,ACCESS_MASK,PFILE_OBJECT*,PDEVICE_OBJECT*); +PVOID WINAPI IoGetDriverObjectExtension(PDRIVER_OBJECT,PVOID); PDEVICE_OBJECT WINAPI IoGetRelatedDeviceObject(PFILE_OBJECT); void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR);

1 0

Dylan Smith : richedit: Move implementation of WM_CHAR to its own function.
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: c87ca3d9e80bf02700412cc896444d1968edfa62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c87ca3d9e80bf02700412cc89… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Dec 16 03:43:33 2008 -0500 richedit: Move implementation of WM_CHAR to its own function. --- dlls/riched20/editor.c | 339 ++++++++++++++++++++++++------------------------ 1 files changed, 172 insertions(+), 167 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c87ca3d9e80bf02700412…

1 0

Dylan Smith : richedit: Removed some unnecessary SendMessage calls to itself.
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: e5f5dc60a7d271504d61dd63ff8737f547d7be59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f5dc60a7d271504d61dd63f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Dec 16 03:43:43 2008 -0500 richedit: Removed some unnecessary SendMessage calls to itself. --- dlls/riched20/caret.c | 6 ++---- dlls/riched20/editor.c | 11 ++++++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 4a3ec8c..6cb3cbb 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1565,11 +1565,9 @@ void ME_SendSelChange(ME_TextEditor *editor) if (!(editor->nEventMask & ENM_SELCHANGE)) return; - - sc.nmhdr.hwndFrom = editor->hWnd; - sc.nmhdr.idFrom = GetWindowLongW(editor->hWnd, GWLP_ID); + sc.nmhdr.code = EN_SELCHANGE; - SendMessageW(editor->hWnd, EM_EXGETSEL, 0, (LPARAM)&sc.chrg); + ME_GetSelection(editor, &sc.chrg.cpMin, &sc.chrg.cpMax); sc.seltyp = SEL_EMPTY; if (sc.chrg.cpMin != sc.chrg.cpMax) sc.seltyp |= SEL_TEXT; diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d5d382b..b1b956d 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1426,7 +1426,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre ME_DisplayItem *para_item; style = editor->pBuffer->pDefaultStyle; ME_AddRefStyle(style); - SendMessageA(editor->hWnd, EM_SETSEL, 0, 0); + ME_SetSelection(editor, 0, 0); ME_InternalDeleteText(editor, 0, ME_GetTextLength(editor), FALSE); from = to = 0; ME_ClearTempStyle(editor); @@ -1559,7 +1559,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre ME_GetSelection(editor, &to, &to2); /* put the cursor at the top */ if (!(format & SFF_SELECTION)) - SendMessageA(editor->hWnd, EM_SETSEL, 0, 0); + ME_SetSelection(editor, 0, 0); } /* Restore saved undo mode */ @@ -4063,7 +4063,12 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, LRESULT ret; int mask = 0; int changes = 0; - ret = RichEditWndProc_common(hWnd, WM_GETTEXTLENGTH, 0, 0, unicode); + GETTEXTLENGTHEX how; + + /* CR/LF conversion required in 2.0 mode, verbatim in 1.0 mode */ + how.flags = GTL_CLOSE | (editor->bEmulateVersion10 ? 0 : GTL_USECRLF) | GTL_NUMCHARS; + how.codepage = unicode ? 1200 : CP_ACP; + ret = ME_GetTextLengthEx(editor, &how); if (!ret) { /*Check for valid wParam*/

1 0

Dylan Smith : richedit: Move implementation of EM_GETTEXTEX to its own function.
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: c7c2ff1fbcb836efd8c157b43b4c9a7f211f8798 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7c2ff1fbcb836efd8c157b43… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Dec 16 03:43:24 2008 -0500 richedit: Move implementation of EM_GETTEXTEX to its own function. --- dlls/riched20/editor.c | 98 +++++++++++++++++++++++++----------------------- 1 files changed, 51 insertions(+), 47 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b79fe16..d5d382b 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1938,6 +1938,54 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH return -1; } +static int ME_GetTextEx(ME_TextEditor *editor, GETTEXTEX *ex, LPARAM pText) +{ + int nStart, nCount; /* in chars */ + + if (ex->flags & ~(GT_SELECTION | GT_USECRLF)) + FIXME("GETTEXTEX flags 0x%08x not supported\n", ex->flags & ~(GT_SELECTION | GT_USECRLF)); + + if (ex->flags & GT_SELECTION) + { + ME_GetSelection(editor, &nStart, &nCount); + nCount -= nStart; + } + else + { + nStart = 0; + nCount = 0x7fffffff; + } + if (ex->codepage == 1200) + { + nCount = min(nCount, ex->cb / sizeof(WCHAR) - 1); + return ME_GetTextW(editor, (LPWSTR)pText, nStart, nCount, ex->flags & GT_USECRLF); + } + else + { + /* potentially each char may be a CR, why calculate the exact value with O(N) when + we can just take a bigger buffer? :) + The above assumption still holds with CR/LF counters, since CR->CRLF expansion + occurs only in richedit 2.0 mode, in which line breaks have only one CR + */ + int crlfmul = (ex->flags & GT_USECRLF) ? 2 : 1; + LPWSTR buffer; + DWORD buflen = ex->cb; + LRESULT rc; + DWORD flags = 0; + + nCount = min(nCount, ex->cb - 1); + buffer = heap_alloc((crlfmul*nCount + 1) * sizeof(WCHAR)); + + buflen = ME_GetTextW(editor, buffer, nStart, nCount, ex->flags & GT_USECRLF); + rc = WideCharToMultiByte(ex->codepage, flags, buffer, buflen+1, + (LPSTR)pText, ex->cb, ex->lpDefaultChar, ex->lpUsedDefChar); + if (rc) rc--; /* do not count 0 terminator */ + + heap_free(buffer); + return rc; + } +} + static int ME_GetTextRange(ME_TextEditor *editor, TEXTRANGEW *rng, BOOL unicode) { if (unicode) @@ -3207,7 +3255,8 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, ex.codepage = unicode ? 1200 : CP_ACP; ex.lpDefaultChar = NULL; ex.lpUsedDefChar = NULL; - rc = RichEditWndProc_common(hWnd, EM_GETTEXTEX, (WPARAM)&ex, unicode ? (LPARAM)bufferW : (LPARAM)bufferA, unicode); + + rc = ME_GetTextEx(editor, &ex, unicode ? (LPARAM)bufferW : (LPARAM)bufferA); if (unicode) { @@ -3224,52 +3273,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, return rc; } case EM_GETTEXTEX: - { - GETTEXTEX *ex = (GETTEXTEX*)wParam; - int nStart, nCount; /* in chars */ - - if (ex->flags & ~(GT_SELECTION | GT_USECRLF)) - FIXME("GETTEXTEX flags 0x%08x not supported\n", ex->flags & ~(GT_SELECTION | GT_USECRLF)); - - if (ex->flags & GT_SELECTION) - { - ME_GetSelection(editor, &nStart, &nCount); - nCount -= nStart; - } - else - { - nStart = 0; - nCount = 0x7fffffff; - } - if (ex->codepage == 1200) - { - nCount = min(nCount, ex->cb / sizeof(WCHAR) - 1); - return ME_GetTextW(editor, (LPWSTR)lParam, nStart, nCount, ex->flags & GT_USECRLF); - } - else - { - /* potentially each char may be a CR, why calculate the exact value with O(N) when - we can just take a bigger buffer? :) - The above assumption still holds with CR/LF counters, since CR->CRLF expansion - occurs only in richedit 2.0 mode, in which line breaks have only one CR - */ - int crlfmul = (ex->flags & GT_USECRLF) ? 2 : 1; - LPWSTR buffer; - DWORD buflen = ex->cb; - LRESULT rc; - DWORD flags = 0; - - nCount = min(nCount, ex->cb - 1); - buffer = heap_alloc((crlfmul*nCount + 1) * sizeof(WCHAR)); - - buflen = ME_GetTextW(editor, buffer, nStart, nCount, ex->flags & GT_USECRLF); - rc = WideCharToMultiByte(ex->codepage, flags, buffer, buflen+1, (LPSTR)lParam, ex->cb, ex->lpDefaultChar, ex->lpUsedDefChar); - if (rc) rc--; /* do not count 0 terminator */ - - heap_free(buffer); - return rc; - } - } + return ME_GetTextEx(editor, (GETTEXTEX*)wParam, lParam); case EM_GETSELTEXT: { int from, to;

1 0

Dylan Smith : richedit: Move implementation of EM_GETTEXTRANGE to its own function.
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: 4f41972b15b865c792ecebce41f63243bdf5def4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f41972b15b865c792ecebce4… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Dec 16 03:43:13 2008 -0500 richedit: Move implementation of EM_GETTEXTRANGE to its own function. The RichEditWndProc_common function is big enough already by handling all the window messages, so moving code to handle a message to its own function makes the code more readable. --- dlls/riched20/editor.c | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 55bc9b8..b79fe16 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1938,6 +1938,25 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH return -1; } +static int ME_GetTextRange(ME_TextEditor *editor, TEXTRANGEW *rng, BOOL unicode) +{ + if (unicode) + return ME_GetTextW(editor, rng->lpstrText, rng->chrg.cpMin, + rng->chrg.cpMax-rng->chrg.cpMin, 0); + else + { + int nLen = rng->chrg.cpMax-rng->chrg.cpMin; + WCHAR *p = ALLOC_N_OBJ(WCHAR, nLen+1); + int nChars = ME_GetTextW(editor, p, rng->chrg.cpMin, nLen, 0); + /* FIXME this is a potential security hole (buffer overrun) + if you know more about wchar->mbyte conversion please explain + */ + WideCharToMultiByte(CP_ACP, 0, p, nChars+1, (char *)rng->lpstrText, nLen+1, NULL, NULL); + FREE_OBJ(p); + return nChars; + } +} + typedef struct tagME_GlobalDestStruct { HGLOBAL hData; @@ -3259,7 +3278,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, tr.chrg.cpMin = from; tr.chrg.cpMax = to; tr.lpstrText = (WCHAR *)lParam; - return RichEditWndProc_common(hWnd, EM_GETTEXTRANGE, 0, (LPARAM)&tr, unicode); + return ME_GetTextRange(editor, &tr, unicode); } case EM_GETSCROLLPOS: { @@ -3274,20 +3293,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, TRACE("EM_GETTEXTRANGE min=%d max=%d unicode=%d emul1.0=%d length=%d\n", rng->chrg.cpMin, rng->chrg.cpMax, unicode, editor->bEmulateVersion10, ME_GetTextLength(editor)); - if (unicode) - return ME_GetTextW(editor, rng->lpstrText, rng->chrg.cpMin, rng->chrg.cpMax-rng->chrg.cpMin, 0); - else - { - int nLen = rng->chrg.cpMax-rng->chrg.cpMin; - WCHAR *p = ALLOC_N_OBJ(WCHAR, nLen+1); - int nChars = ME_GetTextW(editor, p, rng->chrg.cpMin, nLen, 0); - /* FIXME this is a potential security hole (buffer overrun) - if you know more about wchar->mbyte conversion please explain - */ - WideCharToMultiByte(CP_ACP, 0, p, nChars+1, (char *)rng->lpstrText, nLen+1, NULL, NULL); - FREE_OBJ(p); - return nChars; - } + return ME_GetTextRange(editor, rng, unicode); } case EM_GETLINE: {

1 0

Jeremy Drake : oleaut32/tests: Fix double GlobalFree in olepicture tests.
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: 970a500fb431b7d729c8ddb959d3c2a80403e28d URL: http://source.winehq.org/git/wine.git/?a=commit;h=970a500fb431b7d729c8ddb95… Author: Jeremy Drake <wine(a)jdrake.com> Date: Mon Dec 15 23:41:47 2008 -0800 oleaut32/tests: Fix double GlobalFree in olepicture tests. --- dlls/oleaut32/tests/olepicture.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 89e99dd..2b5b8bb 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -525,8 +525,6 @@ static void test_apm() ole_expect(IPicture_get_hPal(pict, &handle), E_FAIL); IPicture_Release(pict); IStream_Release(stream); - GlobalUnlock(hglob); - GlobalFree(hglob); } static void test_metafile(void) @@ -545,8 +543,6 @@ static void test_metafile(void) ole_expect(OleLoadPictureEx(stream, sizeof(metafile), TRUE, &IID_IPicture, 100, 100, 0, (LPVOID *)&pict), E_FAIL); IStream_Release(stream); - GlobalUnlock(hglob); - GlobalFree(hglob); } static void test_enhmetafile(void) @@ -584,8 +580,6 @@ static void test_enhmetafile(void) IPicture_Release(pict); IStream_Release(stream); - GlobalUnlock(hglob); - GlobalFree(hglob); } static void test_Render(void)

1 0

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

2003

2002

2001

wine-commits December 2008