January 2006 - Wine-Commits

Robert Shearman : widl: Fix the type offset used in marshaling/unmarshaling.
by Alexandre Julliard Jan. 31, 2006

Jan. 31, 2006

Module: wine Branch: refs/heads/master Commit: 35d1347cfacdc64499ee59877bf25ec4507dd4f5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=35d1347cfacdc64499ee598… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 31 18:05:33 2006 +0100 widl: Fix the type offset used in marshaling/unmarshaling. Make a copy of type_offset so that it only gets incremented once per function, instead of twice. --- tools/widl/client.c | 6 +++++- tools/widl/server.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index bc997f0..1c3d187 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -103,6 +103,7 @@ static void write_function_stubs(type_t { var_t *def = func->def; var_t* explicit_handle_var; + unsigned int type_offset_func; /* check for a defined binding handle */ explicit_handle_var = get_explicit_handle_var(func); @@ -194,8 +195,11 @@ static void write_function_stubs(type_t fprintf(client, "\n"); + /* make a copy so we don't increment the type offset twice */ + type_offset_func = type_offset; + /* marshal arguments */ - marshall_arguments(client, indent, func, &type_offset, PASS_IN); + marshall_arguments(client, indent, func, &type_offset_func, PASS_IN); /* send/receive message */ /* print_client("NdrNsSendReceive(\n"); */ diff --git a/tools/widl/server.c b/tools/widl/server.c index 6d6d0cc..8bac800 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -102,6 +102,7 @@ static void write_function_stubs(type_t { var_t *def = func->def; unsigned long buffer_size = 0; + unsigned int type_offset_func; /* check for a defined binding handle */ explicit_handle_var = get_explicit_handle_var(func); @@ -200,7 +201,10 @@ static void write_function_stubs(type_t indent -= 2; fprintf(server, "\n"); - unmarshall_arguments(server, indent, func, &type_offset, PASS_IN); + /* make a copy so we don't increment the type offset twice */ + type_offset_func = type_offset; + + unmarshall_arguments(server, indent, func, &type_offset_func, PASS_IN); } print_server("if (_StubMsg.Buffer > _StubMsg.BufferEnd)\n");

1 0

Robert Shearman : widl: Implement the writing of defaultvalue constants for enum values.
by Alexandre Julliard Jan. 31, 2006

Jan. 31, 2006

Module: wine Branch: refs/heads/master Commit: 2330d73f4a6e1ae9aa3bc71cf6dca627d323ec56 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2330d73f4a6e1ae9aa3bc71… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 31 18:04:20 2006 +0100 widl: Implement the writing of defaultvalue constants for enum values. --- tools/widl/write_msft.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index bf1806b..a9b9f34 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1362,18 +1362,28 @@ static HRESULT add_func_desc(msft_typein switch(attr->type) { case ATTR_DEFAULTVALUE_EXPR: { + int vt; expr_t *expr = (expr_t *)attr->u.pval; + if (arg->type->type == RPC_FC_ENUM16) + vt = VT_INT; + else + vt = get_var_vt(arg); paramflags |= 0x30; /* PARAMFLAG_FHASDEFAULT | PARAMFLAG_FOPT */ chat("default value %ld\n", expr->cval); - write_value(typeinfo->typelib, defaultdata, (*paramdata >> 16) & 0x1ff, &expr->cval); + write_value(typeinfo->typelib, defaultdata, vt, &expr->cval); break; } case ATTR_DEFAULTVALUE_STRING: { char *s = (char *)attr->u.pval; + int vt; + if (arg->type->type == RPC_FC_ENUM16) + vt = VT_INT; + else + vt = get_var_vt(arg); paramflags |= 0x30; /* PARAMFLAG_FHASDEFAULT | PARAMFLAG_FOPT */ chat("default value '%s'\n", s); - write_value(typeinfo->typelib, defaultdata, (*paramdata >> 16) & 0x1ff, s); + write_value(typeinfo->typelib, defaultdata, vt, s); break; } case ATTR_IN:

1 0

Robert Shearman : include: Add SC_ENUM_TYPE to winsvc.h.
by Alexandre Julliard Jan. 31, 2006

Jan. 31, 2006

Module: wine Branch: refs/heads/master Commit: fc6febc84bda1b17bf5e049c23cce71adf07d97f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fc6febc84bda1b17bf5e049… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 31 18:04:01 2006 +0100 include: Add SC_ENUM_TYPE to winsvc.h. --- include/winsvc.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/winsvc.h b/include/winsvc.h index 09640fb..65ec654 100644 --- a/include/winsvc.h +++ b/include/winsvc.h @@ -170,6 +170,10 @@ typedef struct _ENUM_SERVICE_STATUSW { SERVICE_STATUS ServiceStatus; } ENUM_SERVICE_STATUSW, *LPENUM_SERVICE_STATUSW; +typedef enum _SC_ENUM_TYPE { + SC_ENUM_PROCESS_INFO = 0 +} SC_ENUM_TYPE; + DECL_WINELIB_TYPE_AW(ENUM_SERVICE_STATUS) DECL_WINELIB_TYPE_AW(LPENUM_SERVICE_STATUS)

1 0

Alexandre Julliard : kernel: Set the overlapped structure status in ReadDirectoryChanges.
by Alexandre Julliard Jan. 31, 2006

Jan. 31, 2006

Module: wine Branch: refs/heads/master Commit: 096000df90fbd047bd7893fbd344572514167d9b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=096000df90fbd047bd7893f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 31 18:03:35 2006 +0100 kernel: Set the overlapped structure status in ReadDirectoryChanges. --- dlls/kernel/change.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel/change.c b/dlls/kernel/change.c index b2fed36..573e94c 100644 --- a/dlls/kernel/change.c +++ b/dlls/kernel/change.c @@ -150,6 +150,8 @@ BOOL WINAPI ReadDirectoryChangesW( HANDL } else if (!overlapped) WaitForSingleObject( event, INFINITE ); + else + overlapped->Internal = STATUS_PENDING; if (!overlapped) CloseHandle( event );

1 0

Michael Jung : unixfs: Only append '/' to base path if not already present in
by Alexandre Julliard Jan. 31, 2006

Jan. 31, 2006

Module: wine Branch: refs/heads/master Commit: e2d1c1038a5c535e6f7ea979a6cef457e790df6a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e2d1c1038a5c535e6f7ea97… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Tue Jan 31 18:03:45 2006 +0100 unixfs: Only append '/' to base path if not already present in UNIXFS_get_unix_path. --- dlls/shell32/shfldr_unixfs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 4279965..b0a513a 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -435,7 +435,7 @@ static BOOL UNIXFS_get_unix_path(LPCWSTR HeapFree(GetProcessHeap(), 0, pszUnixPath); if (!pElement) return FALSE; strcpy(szPath, pElement); - strcat(szPath, "/"); + if (szPath[strlen(szPath)-1] != '/') strcat(szPath, "/"); free(pElement); /* Append the part relative to the drive symbolic link target. */

1 0

Robert Shearman : stdole2.tlb: Remove hack due to unimplemented widl functionality.
by Alexandre Julliard Jan. 31, 2006

Jan. 31, 2006

Module: wine Branch: refs/heads/master Commit: bff55580f73a7dd2b20c2c174b3bf4880fe99926 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bff55580f73a7dd2b20c2c1… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 31 18:03:52 2006 +0100 stdole2.tlb: Remove hack due to unimplemented widl functionality. --- dlls/stdole2.tlb/std_ole_v2.idl | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/stdole2.tlb/std_ole_v2.idl b/dlls/stdole2.tlb/std_ole_v2.idl index e685c6c..c5e1ae0 100644 --- a/dlls/stdole2.tlb/std_ole_v2.idl +++ b/dlls/stdole2.tlb/std_ole_v2.idl @@ -405,8 +405,7 @@ library stdole HRESULT LoadPicture([in, optional] VARIANT filename, [in, optional, defaultvalue(0)] int widthDesired, [in, optional, defaultvalue(0)] int heightDesired, - /* FIXME: widl can't cope with a defaultvalue of an enum parameter yet. */ - [in, optional/*, defaultvalue(0)*/] enum LoadPictureConstants flags, + [in, optional, defaultvalue(Default)] enum LoadPictureConstants flags, [out, retval] IPictureDisp **retval); [ entry("OleSavePictureFile"),

1 0

Gerald Pfeifer : ntdll: tape.c portability fixes.
by Alexandre Julliard Jan. 31, 2006

Jan. 31, 2006

Module: wine Branch: refs/heads/master Commit: c0ca7172a22b2570ce3d3c664a6417d54573a905 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c0ca7172a22b2570ce3d3c6… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Jan 31 13:02:10 2006 +0100 ntdll: tape.c portability fixes. Accept MTCOMP as an alias for MTCOMPRESSION on those systems, having the former, but not the latter. Only enable operations supported by the host OS in TAPE_CreatePartition() and TAPE_Prepare(). --- dlls/ntdll/tape.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tape.c b/dlls/ntdll/tape.c index 9925832..41d4131 100644 --- a/dlls/ntdll/tape.c +++ b/dlls/ntdll/tape.c @@ -30,6 +30,11 @@ #include <sys/mtio.h> #endif +/* FreeBSD, for example, has MTCOMP instead of MTCOMPRESSION. */ +#if !defined(MTCOMPRESSION) && defined(MTCOMP) +#define MTCOMPRESSION MTCOMP +#endif + #define NONAMELESSUNION #define NONAMELESSSTRUCT #include "ntstatus.h" @@ -95,6 +100,7 @@ static NTSTATUS TAPE_CreatePartition( in switch (data->Method) { +#ifdef MTMKPART case TAPE_FIXED_PARTITIONS: case TAPE_SELECT_PARTITIONS: cmd.mt_op = MTMKPART; @@ -104,6 +110,7 @@ static NTSTATUS TAPE_CreatePartition( in cmd.mt_op = MTMKPART; cmd.mt_count = data->Size; break; +#endif default: ERR( "Unhandled method: 0x%08lx\n", data->Method ); return STATUS_INVALID_PARAMETER; @@ -240,6 +247,7 @@ static NTSTATUS TAPE_GetPosition( int fd data->Type = type; data->Partition = get.mt_resid; data->OffsetLow = pos.mt_blkno; + break; case TAPE_LOGICAL_BLOCK: case TAPE_PSEUDO_LOGICAL_BLOCK: WARN( "Positioning type not supported\n" ); @@ -269,21 +277,31 @@ static NTSTATUS TAPE_Prepare( int fd, TA switch (data->Operation) { +#ifdef MTLOAD case TAPE_LOAD: cmd.mt_op = MTLOAD; break; +#endif +#ifdef MTUNLOAD case TAPE_UNLOAD: cmd.mt_op = MTUNLOAD; break; +#endif +#ifdef MTRETEN case TAPE_TENSION: cmd.mt_op = MTRETEN; break; +#endif +#ifdef MTLOCK case TAPE_LOCK: cmd.mt_op = MTLOCK; break; +#endif +#ifdef MTUNLOCK case TAPE_UNLOCK: cmd.mt_op = MTUNLOCK; break; +#endif case TAPE_FORMAT: /* Native ignores this if the drive doesn't support it */ return STATUS_SUCCESS; @@ -364,13 +382,17 @@ static NTSTATUS TAPE_SetPosition( int fd case TAPE_REWIND: cmd.mt_op = MTREW; break; +#ifdef MTSEEK case TAPE_ABSOLUTE_BLOCK: cmd.mt_op = MTSEEK; cmd.mt_count = data->Offset.u.LowPart; break; +#endif +#ifdef MTEOM case TAPE_SPACE_END_OF_DATA: cmd.mt_op = MTEOM; break; +#endif case TAPE_SPACE_FILEMARKS: if (data->Offset.u.LowPart >= 0) { cmd.mt_op = MTFSF; @@ -380,6 +402,7 @@ static NTSTATUS TAPE_SetPosition( int fd cmd.mt_op = MTBSF; cmd.mt_count = -data->Offset.u.LowPart; } + break; case TAPE_SPACE_SETMARKS: if (data->Offset.u.LowPart >= 0) { cmd.mt_op = MTFSS; @@ -389,6 +412,7 @@ static NTSTATUS TAPE_SetPosition( int fd cmd.mt_op = MTBSS; cmd.mt_count = -data->Offset.u.LowPart; } + break; case TAPE_LOGICAL_BLOCK: case TAPE_PSEUDO_LOGICAL_BLOCK: case TAPE_SPACE_RELATIVE_BLOCKS: @@ -421,10 +445,12 @@ static NTSTATUS TAPE_WriteMarks( int fd, switch (data->Type) { +#ifdef MTWSM case TAPE_SETMARKS: cmd.mt_op = MTWSM; cmd.mt_count = data->Count; break; +#endif case TAPE_FILEMARKS: case TAPE_SHORT_FILEMARKS: case TAPE_LONG_FILEMARKS:

1 0

Phil Krylov : riched20: Added support for hidden text.
by Alexandre Julliard Jan. 31, 2006

Jan. 31, 2006

Module: wine Branch: refs/heads/master Commit: f0d6519ef59431927093bed1f5a1839329c7a8bb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f0d6519ef59431927093bed… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Tue Jan 31 13:01:26 2006 +0100 riched20: Added support for hidden text. --- dlls/riched20/caret.c | 57 ++++++++++++++++++++++++++--------------------- dlls/riched20/editor.c | 4 +++ dlls/riched20/editor.h | 3 ++ dlls/riched20/editstr.h | 2 ++ dlls/riched20/paint.c | 3 ++ dlls/riched20/run.c | 21 +++++++++++++---- dlls/riched20/style.c | 1 + 7 files changed, 60 insertions(+), 31 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 077affa..9865581 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -434,34 +434,37 @@ void ME_InsertTextFromCursor(ME_TextEdit static BOOL ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs) { - ME_DisplayItem *pRun; + ME_DisplayItem *pRun = pCursor->pRun; if (nRelOfs == -1) { if (!pCursor->nOffset) { - pRun = ME_FindItemBack(pCursor->pRun, diRunOrParagraph); - assert(pRun); - switch (pRun->type) - { - case diRun: - pCursor->pRun = pRun; - pCursor->nOffset = pRun->member.run.strText->nLen; - break; - case diParagraph: - if (pRun->member.para.prev_para->type == diTextStart) + do { + pRun = ME_FindItemBack(pRun, diRunOrParagraph); + assert(pRun); + switch (pRun->type) + { + case diRun: + break; + case diParagraph: + if (pRun->member.para.prev_para->type == diTextStart) + return FALSE; + pRun = ME_FindItemBack(pRun, diRunOrParagraph); + /* every paragraph ought to have at least one run */ + assert(pRun && pRun->type == diRun); + assert(pRun->member.run.nFlags & MERF_ENDPARA); + break; + default: + assert(pRun->type != diRun && pRun->type != diParagraph); return FALSE; - pRun = ME_FindItemBack(pRun, diRunOrParagraph); - /* every paragraph ought to have at least one run */ - assert(pRun && pRun->type == diRun); - assert(pRun->member.run.nFlags & MERF_ENDPARA); - pCursor->pRun = pRun; - pCursor->nOffset = 0; - break; - default: - assert(pRun->type != diRun && pRun->type != diParagraph); - return FALSE; - } + } + } while (RUN_IS_HIDDEN(&pRun->member.run)); + pCursor->pRun = pRun; + if (pRun->member.run.nFlags & MERF_ENDPARA) + pCursor->nOffset = 0; + else + pCursor->nOffset = pRun->member.run.strText->nLen; } if (pCursor->nOffset) @@ -470,17 +473,19 @@ ME_MoveCursorChars(ME_TextEditor *editor } else { - if (!(pCursor->pRun->member.run.nFlags & MERF_ENDPARA)) + if (!(pRun->member.run.nFlags & MERF_ENDPARA)) { - int new_ofs = ME_StrRelPos2(pCursor->pRun->member.run.strText, pCursor->nOffset, nRelOfs); + int new_ofs = ME_StrRelPos2(pRun->member.run.strText, pCursor->nOffset, nRelOfs); - if (new_ofs < pCursor->pRun->member.run.strText->nLen) + if (new_ofs < pRun->member.run.strText->nLen) { pCursor->nOffset = new_ofs; return TRUE; } } - pRun = ME_FindItemFwd(pCursor->pRun, diRun); + do { + pRun = ME_FindItemFwd(pRun, diRun); + } while (pRun && RUN_IS_HIDDEN(&pRun->member.run)); if (pRun) { pCursor->pRun = pRun; diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 135fe8e..da5e996 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -350,6 +350,10 @@ static void ME_RTFCharAttrHook(RTF_Info if (info->rtfMinor == rtfSuperScrShrink) fmt.dwEffects = CFE_SUPERSCRIPT; if (info->rtfMinor == rtfNoSuperSub) fmt.dwEffects = 0; break; + case rtfInvisible: + fmt.dwMask = CFM_HIDDEN; + fmt.dwEffects = info->rtfParam ? fmt.dwMask : 0; + break; case rtfBackColor: fmt.dwMask = CFM_BACKCOLOR; fmt.dwEffects = 0; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 95b0a5e..f3d9b07 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -24,6 +24,9 @@ #define ALLOC_N_OBJ(type, count) HeapAlloc(me_heap, 0, (count)*sizeof(type)) #define FREE_OBJ(ptr) HeapFree(me_heap, 0, ptr) +#define RUN_IS_HIDDEN(run) ((run)->style->fmt.dwMask & CFM_HIDDEN \ + && (run)->style->fmt.dwEffects & CFE_HIDDEN) + /* style.c */ ME_Style *ME_MakeStyle(CHARFORMAT2W *style); void ME_AddRefStyle(ME_Style *item); diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 37af096..919dd02 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -103,6 +103,8 @@ typedef enum { #define MERF_CALCBYWRAP 0x0F0000 /* the "end of paragraph" run, contains 1 character */ #define MERF_ENDPARA 0x100000 +/* run is hidden */ +#define MERF_HIDDEN 0x200000 /* runs with any of these flags set cannot be joined */ #define MERF_NOJOIN (MERF_GRAPHICS|MERF_TAB|MERF_ENDPARA) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index ad4733f..d35c539 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -226,6 +226,9 @@ static void ME_DrawRun(ME_Context *c, in int nSelFrom, nSelTo; const WCHAR wszSpace[] = {' ', 0}; + if (run->nFlags & MERF_HIDDEN) + return; + ME_GetSelection(c->editor, &nSelFrom, &nSelTo); /* Draw selected end-of-paragraph mark */ diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 5c97941..b9c33a5 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -340,6 +340,12 @@ ME_InsertRunAtCursor(ME_TextEditor *edit void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) { assert(run->nCharOfs != -1); + + if (RUN_IS_HIDDEN(run)) + run->nFlags |= MERF_HIDDEN; + else + run->nFlags &= ~MERF_HIDDEN; + if (ME_IsSplitable(run->strText)) run->nFlags |= MERF_SPLITTABLE; else @@ -539,11 +545,16 @@ SIZE ME_GetRunSize(ME_Context *c, ME_Par void ME_CalcRunExtent(ME_Context *c, ME_Paragraph *para, ME_Run *run) { - int nEnd = ME_StrVLen(run->strText); - SIZE size = ME_GetRunSizeCommon(c, para, run, nEnd, &run->nAscent, &run->nDescent); - run->nWidth = size.cx; - if (!size.cx) - WARN("size.cx == 0\n"); + if (run->nFlags & MERF_HIDDEN) + run->nWidth = 0; + else + { + int nEnd = ME_StrVLen(run->strText); + SIZE size = ME_GetRunSizeCommon(c, para, run, nEnd, &run->nAscent, &run->nDescent); + run->nWidth = size.cx; + if (!size.cx) + WARN("size.cx == 0\n"); + } } void ME_MustBeWrapped(ME_Context *c, ME_DisplayItem *para) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 11fd56b..56f9842 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -237,6 +237,7 @@ void ME_DumpStyleToBuf(CHARFORMAT2W *pFm ME_DumpStyleEffect(&p, "Font italic:", pFmt, CFM_ITALIC); ME_DumpStyleEffect(&p, "Font underline:", pFmt, CFM_UNDERLINE); ME_DumpStyleEffect(&p, "Font strikeout:", pFmt, CFM_STRIKEOUT); + ME_DumpStyleEffect(&p, "Hidden text:", pFmt, CFM_HIDDEN); p += sprintf(p, "Text color: "); if (pFmt->dwMask & CFM_COLOR) {

1 0

Phil Krylov : riched20: Paint the selection while it's being extended by dragging.
by Alexandre Julliard Jan. 31, 2006

Jan. 31, 2006

Module: wine Branch: refs/heads/master Commit: 17a83dc3e3e036d359b77ae2be59dffec61d4d1a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=17a83dc3e3e036d359b77ae… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Tue Jan 31 12:58:59 2006 +0100 riched20: Paint the selection while it's being extended by dragging. --- dlls/riched20/caret.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index df99987..077affa 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -751,16 +751,18 @@ void ME_MouseMove(ME_TextEditor *editor, y += ME_GetYScrollPos(editor); tmp_cursor = editor->pCursors[0]; - if (!ME_FindPixelPos(editor, x, y, &editor->pCursors[0], &editor->bCaretAtEnd)) + if (!ME_FindPixelPos(editor, x, y, &tmp_cursor, &editor->bCaretAtEnd)) /* return */; if (tmp_cursor.pRun == editor->pCursors[0].pRun && tmp_cursor.nOffset == editor->pCursors[0].nOffset) return; - HideCaret(editor->hWnd); ME_InvalidateSelection(editor); + editor->pCursors[0] = tmp_cursor; + HideCaret(editor->hWnd); ME_MoveCaret(editor); + ME_InvalidateSelection(editor); ShowCaret(editor->hWnd); ME_SendSelChange(editor); }

1 0

Tobias Loew : gdi: viewportExt changed after call to StrokePath.
by Alexandre Julliard Jan. 31, 2006

Jan. 31, 2006

Module: wine Branch: refs/heads/master Commit: 033ca37367d91d98d539f894f3454c0dc959bde7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=033ca37367d91d98d539f89… Author: Tobias Loew <tobi(a)die-loews.de> Date: Tue Jan 31 12:57:14 2006 +0100 gdi: viewportExt changed after call to StrokePath. --- dlls/gdi/path.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi/path.c b/dlls/gdi/path.c index e7bfb07..6df155a 100644 --- a/dlls/gdi/path.c +++ b/dlls/gdi/path.c @@ -1780,10 +1780,10 @@ static BOOL PATH_StrokePath(DC *dc, GdiP /* Restore the old mapping mode */ SetMapMode(dc->hSelf, mapMode); - SetViewportExtEx(dc->hSelf, szViewportExt.cx, szViewportExt.cy, NULL); - SetViewportOrgEx(dc->hSelf, ptViewportOrg.x, ptViewportOrg.y, NULL); SetWindowExtEx(dc->hSelf, szWindowExt.cx, szWindowExt.cy, NULL); SetWindowOrgEx(dc->hSelf, ptWindowOrg.x, ptWindowOrg.y, NULL); + SetViewportExtEx(dc->hSelf, szViewportExt.cx, szViewportExt.cy, NULL); + SetViewportOrgEx(dc->hSelf, ptViewportOrg.x, ptViewportOrg.y, NULL); /* Go to GM_ADVANCED temporarily to restore the world transform */ graphicsMode=GetGraphicsMode(dc->hSelf);

1 0