December 2007 - Wine-Commits

Rob Shearman : rpcrt4: Fix NdrFixedArrayUnmarshall to use buffer memory if applicable and to reuse memory for embedded pointers .
by Alexandre Julliard Dec. 8, 2007

Dec. 8, 2007

Module: wine Branch: master Commit: a5f9ed81e317d44c33725e84ba73af0e0e151417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5f9ed81e317d44c33725e84b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 8 17:14:16 2007 +0000 rpcrt4: Fix NdrFixedArrayUnmarshall to use buffer memory if applicable and to reuse memory for embedded pointers. --- dlls/rpcrt4/ndr_marshall.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index f7c6104..0a5bd9c 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -4059,6 +4059,7 @@ unsigned char * WINAPI NdrFixedArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, { const NDR_SMFARRAY_FORMAT *pSmFArrayFormat = (const NDR_SMFARRAY_FORMAT *)pFormat; unsigned long total_size; + unsigned char *saved_buffer; TRACE("(%p, %p, %p, %d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); @@ -4084,12 +4085,22 @@ unsigned char * WINAPI NdrFixedArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, pFormat = (const unsigned char *)(pLgFArrayFormat + 1); } - if (fMustAlloc || !*ppMemory) + if (fMustAlloc) *ppMemory = NdrAllocate(pStubMsg, total_size); - pStubMsg->BufferMark = pStubMsg->Buffer; - safe_copy_from_buffer(pStubMsg, *ppMemory, total_size); + else + { + if (!pStubMsg->IsClient && !*ppMemory) + /* for servers, we just point straight into the RPC buffer */ + *ppMemory = pStubMsg->Buffer; + } + + saved_buffer = pStubMsg->BufferMark = pStubMsg->Buffer; + safe_buffer_increment(pStubMsg, total_size); + pFormat = EmbeddedPointerUnmarshall(pStubMsg, saved_buffer, *ppMemory, pFormat, fMustAlloc); - pFormat = EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, *ppMemory, pFormat, TRUE /* FIXME */); + TRACE("copying %p to %p\n", saved_buffer, *ppMemory); + if (*ppMemory != saved_buffer) + memcpy(*ppMemory, saved_buffer, total_size); return NULL; }

1 0

Rob Shearman : rpcrt4: Fix NdrConformantArrayUnmarshall to use buffer memory if applicable and to reuse memory for embedded pointers .
by Alexandre Julliard Dec. 8, 2007

Dec. 8, 2007

Module: wine Branch: master Commit: abbceb137a36e99a388d080ec29f4d16f4e8efb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abbceb137a36e99a388d080ec… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 8 17:14:10 2007 +0000 rpcrt4: Fix NdrConformantArrayUnmarshall to use buffer memory if applicable and to reuse memory for embedded pointers. --- dlls/rpcrt4/ndr_marshall.c | 21 +++++++++++++++------ dlls/rpcrt4/tests/ndr_marshall.c | 2 -- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index be18de8..f7c6104 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2585,6 +2585,7 @@ unsigned char * WINAPI NdrConformantArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, { DWORD size, esize = *(const WORD*)(pFormat+2); unsigned char alignment = pFormat[1] + 1; + unsigned char *saved_buffer; TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); if (pFormat[0] != RPC_FC_CARRAY) FIXME("format=%d\n", pFormat[0]); @@ -2592,16 +2593,24 @@ unsigned char * WINAPI NdrConformantArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, pFormat = ReadConformance(pStubMsg, pFormat+4); size = safe_multiply(esize, pStubMsg->MaxCount); + ALIGN_POINTER(pStubMsg->Buffer, alignment); - if (fMustAlloc || !*ppMemory) + if (fMustAlloc) *ppMemory = NdrAllocate(pStubMsg, size); + else + { + if (!pStubMsg->IsClient && !*ppMemory) + /* for servers, we just point straight into the RPC buffer */ + *ppMemory = pStubMsg->Buffer; + } - ALIGN_POINTER(pStubMsg->Buffer, alignment); - - pStubMsg->BufferMark = pStubMsg->Buffer; - safe_copy_from_buffer(pStubMsg, *ppMemory, size); + saved_buffer = pStubMsg->BufferMark = pStubMsg->Buffer; + safe_buffer_increment(pStubMsg, size); + EmbeddedPointerUnmarshall(pStubMsg, saved_buffer, *ppMemory, pFormat, fMustAlloc); - EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, *ppMemory, pFormat, TRUE /* FIXME */); + TRACE("copying %p to %p\n", saved_buffer, *ppMemory); + if (*ppMemory != saved_buffer) + memcpy(*ppMemory, saved_buffer, size); return NULL; } diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index d72d76f..51aecd5 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1072,10 +1072,8 @@ static void test_conformant_array(void) mem = NULL; StubMsg.Buffer = StubMsg.BufferStart; NdrConformantArrayUnmarshall( &StubMsg, &mem, fmtstr_conf_array, 0); -todo_wine { ok(mem == StubMsg.BufferStart + 4, "mem not pointing at buffer\n"); ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); -} my_alloc_called = 0; mem = NULL; StubMsg.Buffer = StubMsg.BufferStart;

1 0

Rob Shearman : widl: Don't override the pointer type in top-level arrays.
by Alexandre Julliard Dec. 8, 2007

Dec. 8, 2007

Module: wine Branch: master Commit: a513ff4926ba1862b19cd7e342ccbea14f4232f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a513ff4926ba1862b19cd7e34… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 8 17:13:45 2007 +0000 widl: Don't override the pointer type in top-level arrays. --- tools/widl/parser.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 3d643c1..06f0035 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1329,7 +1329,7 @@ static void set_type(var_t *v, type_t *type, int ptr_level, array_dims_t *arr, } } - if (ptr_type) + if (ptr_type && !arr) { if (is_ptr(v->type)) {

1 0

Detlef Riekenberg : Assorted spelling fixes.
by Alexandre Julliard Dec. 8, 2007

Dec. 8, 2007

Module: wine Branch: master Commit: efb13b28df2147b4d7928e3f9f74d5189d76333d URL: http://source.winehq.org/git/wine.git/?a=commit;h=efb13b28df2147b4d7928e3f9… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Dec 7 21:01:34 2007 +0100 Assorted spelling fixes. --- dlls/comctl32/propsheet.c | 2 +- dlls/dbghelp/msc.c | 2 +- dlls/gdi32/bidi.c | 2 +- dlls/gdi32/font.c | 2 +- dlls/kernel32/tests/drive.c | 4 ++-- dlls/opengl32/make_opengl | 4 ++-- dlls/opengl32/opengl_ext.c | 2 +- dlls/wined3d/device.c | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index a1a765f..1f675cd 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2081,7 +2081,7 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg, index = PROPSHEET_FindPageByResId(psInfo, result); if(index >= psInfo->nPages) { index = old_index; - WARN("Tried to skip to nonexistant page by res id\n"); + WARN("Tried to skip to nonexistent page by res id\n"); break; } continue; diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index c04fa79..5e6f8a8 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -355,7 +355,7 @@ static int codeview_add_type(unsigned int typeno, struct symt* dt) if (cv_current_module->defined_types[typeno - FIRST_DEFINABLE_TYPE]) { if (cv_current_module->defined_types[typeno - FIRST_DEFINABLE_TYPE] != dt) - FIXME("Overwritting at %x\n", typeno); + FIXME("Overwriting at %x\n", typeno); } cv_current_module->defined_types[typeno - FIRST_DEFINABLE_TYPE] = dt; return TRUE; diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 7505a91..5b787d3 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -231,7 +231,7 @@ static void SetDeferredRun(WORD *pval, int cval, int iStart, int nval) Output: revised character count - Note: This is a very simplfistic function. In effect it restricts + Note: This is a very simplistic function. In effect it restricts the action of the algorithm to the first paragraph in the input where a paragraph ends at the end of the first block separator or at the end of the input text. diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 1a179d5..9fba58e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2780,7 +2780,7 @@ DWORD WINAPI GetKerningPairsW( HDC hDC, DWORD cPairs, * TranslateCharsetInfo [GDI32.@] * * Fills a CHARSETINFO structure for a character set, code page, or - * font. This allows making the correspondance between different labelings + * font. This allows making the correspondence between different labelings * (character set, Windows, ANSI, and OEM codepages, and Unicode ranges) * of the same encoding. * diff --git a/dlls/kernel32/tests/drive.c b/dlls/kernel32/tests/drive.c index 52afc93..a8cc165 100644 --- a/dlls/kernel32/tests/drive.c +++ b/dlls/kernel32/tests/drive.c @@ -43,7 +43,7 @@ static void test_GetDriveTypeA(void) if (!(logical_drives & 1)) ok(type == DRIVE_NO_ROOT_DIR, - "GetDriveTypeA should return DRIVE_NO_ROOT_DIR for inexistant drive %c: but not %u\n", + "GetDriveTypeA should return DRIVE_NO_ROOT_DIR for inexistent drive %c: but not %u\n", drive[0], type); logical_drives >>= 1; @@ -71,7 +71,7 @@ static void test_GetDriveTypeW(void) if (!(logical_drives & 1)) ok(type == DRIVE_NO_ROOT_DIR, - "GetDriveTypeW should return DRIVE_NO_ROOT_DIR for inexistant drive %c: but not %u\n", + "GetDriveTypeW should return DRIVE_NO_ROOT_DIR for inexistent drive %c: but not %u\n", drive[0], type); logical_drives >>= 1; diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 824dd1c..2fb447b 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -702,8 +702,8 @@ foreach (sort keys %ext_functions) { print EXT "\nstatic ", GenerateThunk($ext_functions{$_}, 0, $ext_prefix, $gen_thread_safe, $local_var); } -# Then the table giving the string <-> function correspondance */ -print EXT "\n\n/* The table giving the correspondance between names and functions */\n"; +# Then the table giving the string <-> function correspondence */ +print EXT "\n\n/* The table giving the correspondence between names and functions */\n"; print EXT "const OpenGL_extension extension_registry[$count] = {\n"; my $i = 0; foreach (sort keys %ext_functions) { diff --git a/dlls/opengl32/opengl_ext.c b/dlls/opengl32/opengl_ext.c index fc870ee..5a37ed9 100644 --- a/dlls/opengl32/opengl_ext.c +++ b/dlls/opengl32/opengl_ext.c @@ -9706,7 +9706,7 @@ static void WINAPI wine_glWriteMaskEXT( GLuint res, GLuint in, GLenum outX, GLen } -/* The table giving the correspondance between names and functions */ +/* The table giving the correspondence between names and functions */ const OpenGL_extension extension_registry[1197] = { { "glActiveStencilFaceEXT", "GL_EXT_stencil_two_side", (void *) wine_glActiveStencilFaceEXT }, { "glActiveTexture", "GL_VERSION_1_3", (void *) wine_glActiveTexture }, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 622d892..2a80636 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5761,7 +5761,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DeletePatch(IWineD3DDevice *iface, UINT } /* TODO: Write a test for the return value */ - FIXME("Attempt to destroy nonexistant patch\n"); + FIXME("Attempt to destroy nonexistent patch\n"); return WINED3DERR_INVALIDCALL; }

1 0

Michael Stefaniuc : riched20: Remove the RTFAlloc() wrapper around heap_alloc().
by Alexandre Julliard Dec. 8, 2007

Dec. 8, 2007

Module: wine Branch: master Commit: 0a92e10640a78dd3b67eddab990d33e024f77c3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a92e10640a78dd3b67eddab9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 7 23:45:40 2007 +0100 riched20: Remove the RTFAlloc() wrapper around heap_alloc(). --- dlls/riched20/reader.c | 56 ++++++++++++++++++----------------------------- dlls/riched20/rtf.h | 2 +- 2 files changed, 23 insertions(+), 35 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index de8cadd..f46a8cc 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -76,18 +76,6 @@ static void RTFPutCodePageChar(RTF_Info *info, int c); /* ---------------------------------------------------------------------- */ -/* - * Memory allocation routines - */ - - -/* - * Return pointer to block of size bytes, or NULL if there's - * not enough memory available. - */ -#define RTFAlloc(size) heap_alloc(size) -#define RTFReAlloc(ptr, size) heap_realloc(ptr, size) -#define RTFFree(ptr) heap_free(ptr) /* * Saves a string on the heap and returns a pointer to it. @@ -96,7 +84,7 @@ static inline char *RTFStrSave(const char *s) { char *p; - p = RTFAlloc (lstrlenA(s) + 1); + p = heap_alloc (lstrlenA(s) + 1); if (p == NULL) return NULL; return lstrcpyA (p, s); @@ -143,14 +131,14 @@ RTFDestroyAttrs(RTF_Info *info) while (info->fontList) { fp = info->fontList->rtfNextFont; - RTFFree (info->fontList->rtfFName); - RTFFree (info->fontList); + heap_free (info->fontList->rtfFName); + heap_free (info->fontList); info->fontList = fp; } while (info->colorList) { cp = info->colorList->rtfNextColor; - RTFFree (info->colorList); + heap_free (info->colorList); info->colorList = cp; } while (info->styleList) @@ -160,12 +148,12 @@ RTFDestroyAttrs(RTF_Info *info) while (eltList) { ep = eltList->rtfNextSE; - RTFFree (eltList->rtfSEText); - RTFFree (eltList); + heap_free (eltList->rtfSEText); + heap_free (eltList); eltList = ep; } - RTFFree (info->styleList->rtfSName); - RTFFree (info->styleList); + heap_free (info->styleList->rtfSName); + heap_free (info->styleList); info->styleList = sp; } } @@ -176,11 +164,11 @@ RTFDestroy(RTF_Info *info) { if (info->rtfTextBuf) { - RTFFree(info->rtfTextBuf); - RTFFree(info->pushedTextBuf); + heap_free(info->rtfTextBuf); + heap_free(info->pushedTextBuf); } RTFDestroyAttrs(info); - RTFFree(info->cpOutputBuffer); + heap_free(info->cpOutputBuffer); } @@ -196,15 +184,15 @@ void RTFInit(RTF_Info *info) if (info->rtfTextBuf == NULL) /* initialize the text buffers */ { - info->rtfTextBuf = RTFAlloc (rtfBufSiz); - info->pushedTextBuf = RTFAlloc (rtfBufSiz); + info->rtfTextBuf = heap_alloc (rtfBufSiz); + info->pushedTextBuf = heap_alloc (rtfBufSiz); if (info->rtfTextBuf == NULL || info->pushedTextBuf == NULL) ERR ("Cannot allocate text buffers.\n"); info->rtfTextBuf[0] = info->pushedTextBuf[0] = '\0'; } - RTFFree (info->inputName); - RTFFree (info->outputName); + heap_free (info->inputName); + heap_free (info->outputName); info->inputName = info->outputName = NULL; for (i = 0; i < rtfMaxClass; i++) @@ -245,7 +233,7 @@ void RTFInit(RTF_Info *info) if (!info->cpOutputBuffer) { info->dwMaxCPOutputCount = 0x1000; - info->cpOutputBuffer = RTFAlloc(info->dwMaxCPOutputCount); + info->cpOutputBuffer = heap_alloc(info->dwMaxCPOutputCount); } } @@ -2300,9 +2288,9 @@ void LookupInit(void) rp->rtfKHash = Hash (rp->rtfKStr); index = rp->rtfKHash % (RTF_KEY_COUNT * 2); if (!rtfHashTable[index].count) - rtfHashTable[index].value = RTFAlloc(sizeof(RTFKey *)); + rtfHashTable[index].value = heap_alloc(sizeof(RTFKey *)); else - rtfHashTable[index].value = RTFReAlloc(rtfHashTable[index].value, sizeof(RTFKey *) * (rtfHashTable[index].count + 1)); + rtfHashTable[index].value = heap_realloc(rtfHashTable[index].value, sizeof(RTFKey *) * (rtfHashTable[index].count + 1)); rtfHashTable[index].value[rtfHashTable[index].count++] = rp; } } @@ -2313,7 +2301,7 @@ void LookupCleanup(void) for (i=0; i<RTF_KEY_COUNT*2; i++) { - RTFFree( rtfHashTable[i].value ); + heap_free( rtfHashTable[i].value ); rtfHashTable[i].value = NULL; rtfHashTable[i].count = 0; } @@ -2682,7 +2670,7 @@ static void RTFFlushCPOutputBuffer(RTF_Info *info) { int bufferMax = info->dwCPOutputCount * 2 * sizeof(WCHAR); - WCHAR *buffer = RTFAlloc(bufferMax); + WCHAR *buffer = heap_alloc(bufferMax); int length; length = MultiByteToWideChar(info->codePage, 0, info->cpOutputBuffer, @@ -2690,7 +2678,7 @@ RTFFlushCPOutputBuffer(RTF_Info *info) info->dwCPOutputCount = 0; RTFPutUnicodeString(info, buffer, length); - RTFFree((char *)buffer); + heap_free((char *)buffer); } void @@ -2719,7 +2707,7 @@ RTFPutCodePageChar(RTF_Info *info, int c) if (info->dwCPOutputCount >= info->dwMaxCPOutputCount) { info->dwMaxCPOutputCount *= 2; - info->cpOutputBuffer = RTFReAlloc(info->cpOutputBuffer, info->dwMaxCPOutputCount); + info->cpOutputBuffer = heap_realloc(info->cpOutputBuffer, info->dwMaxCPOutputCount); } info->cpOutputBuffer[info->dwCPOutputCount++] = c; } diff --git a/dlls/riched20/rtf.h b/dlls/riched20/rtf.h index 7234b43..9befae7 100644 --- a/dlls/riched20/rtf.h +++ b/dlls/riched20/rtf.h @@ -1005,7 +1005,7 @@ struct RTFStyleElt * if no memory available. */ -# define New(t) ((t *) RTFAlloc ((int) sizeof (t))) +# define New(t) (heap_alloc (sizeof (t))) /* Parser stack size */

1 0

Michael Stefaniuc : riched20: Rename the wrappers around HeapAlloc() &Co to use the new standard naming.
by Alexandre Julliard Dec. 8, 2007

Dec. 8, 2007

Module: wine Branch: master Commit: 4210cafc04535a3ad0e3c4c16d1c5c20d1fab488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4210cafc04535a3ad0e3c4c16… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 7 23:42:22 2007 +0100 riched20: Rename the wrappers around HeapAlloc() &Co to use the new standard naming. --- dlls/riched20/clipboard.c | 8 ++++---- dlls/riched20/editor.c | 13 +++++++------ dlls/riched20/editor.h | 12 ++++++------ dlls/riched20/reader.c | 6 +++--- dlls/riched20/richole.c | 4 ++-- 5 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/riched20/clipboard.c b/dlls/riched20/clipboard.c index 376a2e5..e9b5cd0 100644 --- a/dlls/riched20/clipboard.c +++ b/dlls/riched20/clipboard.c @@ -77,7 +77,7 @@ static ULONG WINAPI EnumFormatImpl_Release(IEnumFORMATETC *iface) if(!ref) { GlobalFree(This->fmtetc); - richedit_free(This); + heap_free(This); } return ref; @@ -152,7 +152,7 @@ static HRESULT EnumFormatImpl_Create(const FORMATETC *fmtetc, UINT fmtetc_cnt, I EnumFormatImpl *ret; TRACE("\n"); - ret = richedit_alloc(sizeof(EnumFormatImpl)); + ret = heap_alloc(sizeof(EnumFormatImpl)); ret->lpVtbl = &VT_EnumFormatImpl; ret->ref = 1; ret->cur = 0; @@ -195,7 +195,7 @@ static ULONG WINAPI DataObjectImpl_Release(IDataObject* iface) if(This->unicode) GlobalFree(This->unicode); if(This->rtf) GlobalFree(This->rtf); if(This->fmtetc) GlobalFree(This->fmtetc); - richedit_free(This); + heap_free(This); } return ref; @@ -388,7 +388,7 @@ HRESULT ME_GetDataObject(ME_TextEditor *editor, const CHARRANGE *lpchrg, LPDATAO DataObjectImpl *obj; TRACE("(%p,%d,%d)\n", editor, lpchrg->cpMin, lpchrg->cpMax); - obj = richedit_alloc(sizeof(DataObjectImpl)); + obj = heap_alloc(sizeof(DataObjectImpl)); if(cfRTF == 0) cfRTF = RegisterClipboardFormatA("Rich Text Format"); diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d30ba9d..10aaaa9 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2013,8 +2013,9 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, LPWSTR bufferW = NULL; if (unicode) - bufferW = richedit_alloc((wParam + 2) * sizeof(WCHAR)); - else bufferA = richedit_alloc(wParam + 2); + bufferW = heap_alloc((wParam + 2) * sizeof(WCHAR)); + else + bufferA = heap_alloc(wParam + 2); ex.cb = wParam + (unicode ? 2*sizeof(WCHAR) : 2); ex.flags = GT_USECRLF; @@ -2033,8 +2034,8 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, memcpy((LPSTR)lParam, bufferA, wParam); if (strlen(bufferA) >= wParam) rc = 0; } - if (bufferA != NULL) richedit_free(bufferA); - if (bufferW != NULL) richedit_free(bufferW); + heap_free(bufferA); + heap_free(bufferW); return rc; } case EM_GETTEXTEX: @@ -2066,7 +2067,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, /* potentially each char may be a CR, why calculate the exact value with O(N) when we can just take a bigger buffer? :) */ int crlfmul = (ex->flags & GT_USECRLF) ? 2 : 1; - LPWSTR buffer = richedit_alloc((crlfmul*nCount + 1) * sizeof(WCHAR)); + LPWSTR buffer = heap_alloc((crlfmul*nCount + 1) * sizeof(WCHAR)); DWORD buflen = ex->cb; LRESULT rc; DWORD flags = 0; @@ -2075,7 +2076,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, rc = WideCharToMultiByte(ex->codepage, flags, buffer, -1, (LPSTR)lParam, ex->cb, ex->lpDefaultChar, ex->lpUsedDefaultChar); if (rc) rc--; /* do not count 0 terminator */ - richedit_free(buffer); + heap_free(buffer); return rc; } } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 83dee76..010494a 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -23,24 +23,24 @@ extern HANDLE me_heap; -static inline void *richedit_alloc( size_t len ) +static inline void *heap_alloc( size_t len ) { return HeapAlloc( me_heap, 0, len ); } -static inline BOOL richedit_free( void *ptr ) +static inline BOOL heap_free( void *ptr ) { return HeapFree( me_heap, 0, ptr ); } -static inline void *richedit_realloc( void *ptr, size_t len ) +static inline void *heap_realloc( void *ptr, size_t len ) { return HeapReAlloc( me_heap, 0, ptr, len ); } -#define ALLOC_OBJ(type) richedit_alloc(sizeof(type)) -#define ALLOC_N_OBJ(type, count) richedit_alloc((count)*sizeof(type)) -#define FREE_OBJ(ptr) richedit_free(ptr) +#define ALLOC_OBJ(type) heap_alloc(sizeof(type)) +#define ALLOC_N_OBJ(type, count) heap_alloc((count)*sizeof(type)) +#define FREE_OBJ(ptr) heap_free(ptr) #define RUN_IS_HIDDEN(run) ((run)->style->fmt.dwMask & CFM_HIDDEN \ && (run)->style->fmt.dwEffects & CFE_HIDDEN) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index e0a9e1a..de8cadd 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -85,9 +85,9 @@ static void RTFPutCodePageChar(RTF_Info *info, int c); * Return pointer to block of size bytes, or NULL if there's * not enough memory available. */ -#define RTFAlloc(size) richedit_alloc(size) -#define RTFReAlloc(ptr, size) richedit_realloc(ptr, size) -#define RTFFree(ptr) richedit_free(ptr) +#define RTFAlloc(size) heap_alloc(size) +#define RTFReAlloc(ptr, size) heap_realloc(ptr, size) +#define RTFFree(ptr) heap_free(ptr) /* * Saves a string on the heap and returns a pointer to it. diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 0585e43..9bd44aa 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -112,7 +112,7 @@ IRichEditOle_fnRelease(IRichEditOle *me) if (!ref) { TRACE ("Destroying %p\n", This); - richedit_free(This); + heap_free(This); } return ref; } @@ -529,7 +529,7 @@ LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *ppObj) { IRichEditOleImpl *reo; - reo = richedit_alloc(sizeof(IRichEditOleImpl)); + reo = heap_alloc(sizeof(IRichEditOleImpl)); if (!reo) return 0;

1 0

Alexander Nicolaysen Sørnes : comdlg32: PageSetupDlgA: Read margins from correct edit boxes.
by Alexandre Julliard Dec. 8, 2007

Dec. 8, 2007

Module: wine Branch: master Commit: 51086b5513a436f51460d006f4fa7156e9d58a92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51086b5513a436f51460d006f… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Dec 8 13:53:32 2007 +0100 comdlg32: PageSetupDlgA: Read margins from correct edit boxes. --- dlls/comdlg32/printdlg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index e04e145..5baa90e 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2890,10 +2890,10 @@ PRINTDLG_PS_WMCommandA( GETVAL(id, pda->curdlg.rtMargin.left); break; case edt5: - GETVAL(id, pda->curdlg.rtMargin.right); + GETVAL(id, pda->curdlg.rtMargin.top); break; case edt6: - GETVAL(id, pda->curdlg.rtMargin.top); + GETVAL(id, pda->curdlg.rtMargin.right); break; case edt7: GETVAL(id, pda->curdlg.rtMargin.bottom);

1 0

Marcus Meissner : server: Removed superflous async->queue NULL tests.
by Alexandre Julliard Dec. 8, 2007

Dec. 8, 2007

Module: wine Branch: master Commit: edd3f264d95c0c6bed9c18f51e42a9523bd305eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=edd3f264d95c0c6bed9c18f51… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Dec 8 12:25:14 2007 +0100 server: Removed superflous async->queue NULL tests. --- server/async.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/async.c b/server/async.c index 9ca239c..ae58636 100644 --- a/server/async.c +++ b/server/async.c @@ -147,7 +147,7 @@ void async_terminate( struct async *async, unsigned int status ) } /* send error completion event */ - if (status != STATUS_ALERTED && async->data.cvalue && async->queue && async->queue->fd) + if (status != STATUS_ALERTED && async->data.cvalue && async->queue->fd) fd_add_completion( async->queue->fd, async->data.cvalue, status, 0 ); memset( &data, 0, sizeof(data) ); @@ -257,7 +257,7 @@ void async_set_result( struct object *obj, unsigned int status, unsigned long to if (async->timeout) remove_timeout_user( async->timeout ); async->timeout = NULL; async->status = status; - if (async->data.cvalue && async->queue && async->queue->fd) + if (async->data.cvalue && async->queue->fd) fd_add_completion( async->queue->fd, async->data.cvalue, status, total ); if (async->data.apc) {

1 0

Alexander Dorofeyev : ddraw: Fix wrong initialization order in IDirect3DDevice vtable.
by Alexandre Julliard Dec. 8, 2007

Dec. 8, 2007

Module: wine Branch: master Commit: 4051a09eb2b06556eff77d5faaaaae7fe562e7b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4051a09eb2b06556eff77d5fa… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sat Dec 8 18:00:28 2007 -0800 ddraw: Fix wrong initialization order in IDirect3DDevice vtable. --- dlls/ddraw/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 53ef2f1..fa471ef 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5477,8 +5477,8 @@ const IDirect3DDeviceVtbl IDirect3DDevice1_Vtbl = IDirect3DDeviceImpl_1_SetMatrix, IDirect3DDeviceImpl_1_GetMatrix, IDirect3DDeviceImpl_1_DeleteMatrix, - Thunk_IDirect3DDeviceImpl_1_EndScene, Thunk_IDirect3DDeviceImpl_1_BeginScene, + Thunk_IDirect3DDeviceImpl_1_EndScene, Thunk_IDirect3DDeviceImpl_1_GetDirect3D };

1 0

Alex Villacís Lasso : riched20: Invalidate all the text on bogus last selection.
by Alexandre Julliard Dec. 8, 2007

Dec. 8, 2007

Module: wine Branch: master Commit: 42d6cc7cf57221293839e79788b59d4c4cb26a10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42d6cc7cf57221293839e7978… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sat Dec 8 00:31:10 2007 -0500 riched20: Invalidate all the text on bogus last selection. --- dlls/riched20/paint.c | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 7c40814..5f1d5b6 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -558,25 +558,26 @@ ME_InvalidateSelection(ME_TextEditor *editor) assert(para2->type == diParagraph); /* last selection markers aren't always updated, which means they can point past the end of the document */ - if (editor->nLastSelStart > len) - editor->nLastSelEnd = len; - if (editor->nLastSelEnd > len) - editor->nLastSelEnd = len; - - /* if the start part of selection is being expanded or contracted... */ - if (nStart < editor->nLastSelStart) { - ME_MarkForPainting(editor, para1, ME_FindItemFwd(editor->pLastSelStartPara, diParagraphOrEnd)); - } else - if (nStart > editor->nLastSelStart) { - ME_MarkForPainting(editor, editor->pLastSelStartPara, ME_FindItemFwd(para1, diParagraphOrEnd)); - } + if (editor->nLastSelStart > len || editor->nLastSelEnd > len) { + ME_MarkForPainting(editor, + ME_FindItemFwd(editor->pBuffer->pFirst, diParagraph), + ME_FindItemFwd(editor->pBuffer->pFirst, diTextEnd)); + } else { + /* if the start part of selection is being expanded or contracted... */ + if (nStart < editor->nLastSelStart) { + ME_MarkForPainting(editor, para1, ME_FindItemFwd(editor->pLastSelStartPara, diParagraphOrEnd)); + } else + if (nStart > editor->nLastSelStart) { + ME_MarkForPainting(editor, editor->pLastSelStartPara, ME_FindItemFwd(para1, diParagraphOrEnd)); + } - /* if the end part of selection is being contracted or expanded... */ - if (nEnd < editor->nLastSelEnd) { - ME_MarkForPainting(editor, para2, ME_FindItemFwd(editor->pLastSelEndPara, diParagraphOrEnd)); - } else - if (nEnd > editor->nLastSelEnd) { - ME_MarkForPainting(editor, editor->pLastSelEndPara, ME_FindItemFwd(para2, diParagraphOrEnd)); + /* if the end part of selection is being contracted or expanded... */ + if (nEnd < editor->nLastSelEnd) { + ME_MarkForPainting(editor, para2, ME_FindItemFwd(editor->pLastSelEndPara, diParagraphOrEnd)); + } else + if (nEnd > editor->nLastSelEnd) { + ME_MarkForPainting(editor, editor->pLastSelEndPara, ME_FindItemFwd(para2, diParagraphOrEnd)); + } } ME_InvalidateMarkedParagraphs(editor);

1 0