January 2008 - Wine-Commits

Rob Shearman : rpcrt4: Move the receiving of an individual fragment to a separate function.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: 2b0d3b7400df71803a5ed40be4ad0ba06e724bca URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b0d3b7400df71803a5ed40be… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 21 10:31:55 2008 +0000 rpcrt4: Move the receiving of an individual fragment to a separate function. --- dlls/rpcrt4/rpc_message.c | 188 +++++++++++++++++++++++++++++++-------------- 1 files changed, 131 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b0d3b7400df71803a5ed…

1 0

Rob Shearman : rpcrt4: Remove some unimplemented win9x-only spec entries.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: e2578c5bb6e9abdfd56ad04a46a930279f5c1be5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2578c5bb6e9abdfd56ad04a4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 21 10:58:05 2008 +0000 rpcrt4: Remove some unimplemented win9x-only spec entries. We're never going to implement the undocumented ones and we're moving more and more towards the architecture of the more recent versions of native rpcrt4. --- dlls/rpcrt4/rpcrt4.spec | 38 -------------------------------------- 1 files changed, 0 insertions(+), 38 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 3dc9edc..a235302 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -21,7 +21,6 @@ @ stdcall I_RpcAbortAsyncCall(ptr long) I_RpcAsyncAbortCall @ stdcall I_RpcAllocate(long) @ stdcall I_RpcAsyncAbortCall(ptr long) -@ stub I_RpcAsyncSendReceive # NT4 @ stdcall I_RpcAsyncSetHandle(ptr ptr) @ stub I_RpcBCacheAllocate @ stub I_RpcBCacheFree @@ -39,7 +38,6 @@ @ stdcall I_RpcBindingSetAsync(ptr ptr) @ stub I_RpcBindingToStaticStringBindingW @ stub I_RpcClearMutex -@ stub I_RpcConnectionInqSockBuffSize2 @ stub I_RpcConnectionInqSockBuffSize @ stub I_RpcConnectionSetSockBuffSize @ stub I_RpcDeleteMutex @@ -48,19 +46,13 @@ @ stdcall I_RpcFree(ptr) @ stdcall I_RpcFreeBuffer(ptr) @ stub I_RpcFreePipeBuffer -@ stub I_RpcGetAssociationContext @ stdcall I_RpcGetBuffer(ptr) @ stub I_RpcGetBufferWithObject @ stdcall I_RpcGetCurrentCallHandle() @ stub I_RpcGetExtendedError -@ stub I_RpcGetServerContextList -@ stub I_RpcGetThreadEvent # win9x -@ stub I_RpcGetThreadWindowHandle # win9x @ stub I_RpcIfInqTransferSyntaxes -@ stub I_RpcLaunchDatagramReceiveThread # win9x @ stub I_RpcLogEvent @ stdcall I_RpcMapWin32Status(long) -@ stub I_RpcMonitorAssociation @ stub I_RpcNegotiateTransferSyntax # wxp @ stub I_RpcNsBindingSetEntryName @ stub I_RpcNsBindingSetEntryNameA @@ -83,46 +75,24 @@ @ stub I_RpcServerSetAddressChangeFn @ stdcall I_RpcServerStartListening(ptr) # win9x @ stdcall I_RpcServerStopListening() # win9x -@ stub I_RpcServerUnregisterEndpointA # win9x -@ stub I_RpcServerUnregisterEndpointW # win9x @ stub I_RpcServerUseProtseq2A @ stub I_RpcServerUseProtseq2W @ stub I_RpcServerUseProtseqEp2A @ stub I_RpcServerUseProtseqEp2W -@ stub I_RpcSetAssociationContext # win9x @ stub I_RpcSetAsyncHandle -@ stub I_RpcSetServerContextList -@ stub I_RpcSetThreadParams # win9x -@ stub I_RpcSetWMsgEndpoint # NT4 @ stub I_RpcSsDontSerializeContext -@ stub I_RpcStopMonitorAssociation @ stub I_RpcSystemFunction001 # wxp (oh, brother!) -@ stub I_RpcTransCancelMigration # win9x -@ stub I_RpcTransClientMaxFrag # win9x -@ stub I_RpcTransClientReallocBuffer # win9x @ stub I_RpcTransConnectionAllocatePacket @ stub I_RpcTransConnectionFreePacket @ stub I_RpcTransConnectionReallocPacket @ stub I_RpcTransDatagramAllocate2 @ stub I_RpcTransDatagramAllocate @ stub I_RpcTransDatagramFree -@ stub I_RpcTransGetAddressList @ stub I_RpcTransGetThreadEvent @ stub I_RpcTransIoCancelled -@ stub I_RpcTransMaybeMakeReceiveAny # win9x -@ stub I_RpcTransMaybeMakeReceiveDirect # win9x -@ stub I_RpcTransPingServer # win9x -@ stub I_RpcTransServerFindConnection # win9x -@ stub I_RpcTransServerFreeBuffer # win9x -@ stub I_RpcTransServerMaxFrag # win9x @ stub I_RpcTransServerNewConnection -@ stub I_RpcTransServerProtectThread # win9x -@ stub I_RpcTransServerReallocBuffer # win9x -@ stub I_RpcTransServerReceiveDirectReady # win9x -@ stub I_RpcTransServerUnprotectThread # win9x @ stub I_RpcTurnOnEEInfoPropagation # wxp @ stdcall I_RpcWindowProc(ptr long long long) # win9x -@ stub I_RpcltDebugSetPDUFilter @ stub I_UuidCreate @ stub MIDL_wchar_strcpy @ stub MIDL_wchar_strlen @@ -135,8 +105,6 @@ @ stub MesHandleFree @ stub MesIncrementalHandleReset @ stub MesInqProcEncodingId -@ stub MqGetContext # win9x -@ stub MqRegisterQueue # win9x @ stdcall NDRCContextBinding(ptr) @ stdcall NDRCContextMarshall(ptr ptr) @ stdcall NDRCContextUnmarshall(ptr ptr ptr long) @@ -361,7 +329,6 @@ @ stub NdrpReleaseTypeGenCookie # wxp @ stub NdrpSetRpcSsDefaults @ stub NdrpVarVtOfTypeDesc # wxp -@ stub PerformRpcInitialization @ stdcall RpcAbortAsyncCall(ptr long) RpcAsyncAbortCall @ stdcall RpcAsyncAbortCall(ptr long) @ stdcall RpcAsyncCancelCall(ptr long) @@ -421,8 +388,6 @@ @ stub RpcIfInqId @ stdcall RpcImpersonateClient(ptr) @ stdcall RpcInitializeAsyncHandle(ptr long) RpcAsyncInitializeHandle -@ stub RpcMgmtBindingInqParameter # win9x -@ stub RpcMgmtBindingSetParameter # win9x @ stdcall RpcMgmtEnableIdleCleanup() @ stdcall RpcMgmtEpEltInqBegin(ptr long ptr long ptr ptr) @ stub RpcMgmtEpEltInqDone @@ -432,7 +397,6 @@ @ stub RpcMgmtInqComTimeout @ stub RpcMgmtInqDefaultProtectLevel @ stdcall RpcMgmtInqIfIds(ptr ptr) -@ stub RpcMgmtInqParameter # win9x @ stub RpcMgmtInqServerPrincNameA @ stub RpcMgmtInqServerPrincNameW @ stub RpcMgmtInqStats @@ -440,7 +404,6 @@ @ stub RpcMgmtSetAuthorizationFn @ stdcall RpcMgmtSetCancelTimeout(long) @ stdcall RpcMgmtSetComTimeout(ptr long) -@ stub RpcMgmtSetParameter # win9x @ stdcall RpcMgmtSetServerStackSize(long) @ stub RpcMgmtStatsVectorFree @ stdcall RpcMgmtStopServerListening(ptr) @@ -526,7 +489,6 @@ @ stub SimpleTypeAlignment # wxp @ stub SimpleTypeBufferSize # wxp @ stub SimpleTypeMemorySize # wxp -@ stub StartServiceIfNecessary # win9x @ stdcall TowerConstruct(ptr ptr ptr ptr ptr ptr) @ stdcall TowerExplode(ptr ptr ptr ptr ptr ptr) @ stdcall UuidCompare(ptr ptr ptr)

1 0

Marcus Meissner : wined3d: Removed deadcode.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: d757432c7d99199b51f7400a400b4417543a2c8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d757432c7d99199b51f7400a4… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jan 20 20:47:07 2008 +0100 wined3d: Removed deadcode. --- dlls/wined3d/surface.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a6a040b..9243777 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -993,7 +993,6 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum fm GLint prev_store; GLint prev_rasterpos[4]; GLint skipBytes = 0; - BOOL storechanged = FALSE; UINT pitch = IWineD3DSurface_GetPitch((IWineD3DSurface *) This); /* target is argb, 4 byte */ IWineD3DDeviceImpl *myDevice = (IWineD3DDeviceImpl *) This->resource.wineD3DDevice; IWineD3DSwapChainImpl *swapchain; @@ -1074,10 +1073,6 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum fm /* Reset to previous pack row length */ glPixelStorei(GL_UNPACK_ROW_LENGTH, skipBytes); vcheckGLcall("glPixelStorei GL_UNPACK_ROW_LENGTH"); - if(storechanged) { - glPixelStorei(GL_PACK_SWAP_BYTES, prev_store); - vcheckGLcall("glPixelStorei GL_PACK_SWAP_BYTES"); - } if(!swapchain) { glDrawBuffer(myDevice->offscreenBuffer);

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMDocumentFragment Interface.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: c40d4997b3ff853832d1f0c879e27428cd0b678f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c40d4997b3ff853832d1f0c87… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jan 19 23:23:49 2008 +1100 msxml3: Implement IXMLDOMDocumentFragment Interface. --- dlls/msxml3/Makefile.in | 1 + dlls/msxml3/docfrag.c | 511 +++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/domdoc.c | 22 ++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/tests/domdoc.c | 66 ++++++ 5 files changed, 599 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c40d4997b3ff853832d1f…

1 0

Alistair Leslie-Hughes : msxml3: Entity Reference nodes do not support attributes property.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: bfeb14d0d83b3c099362643faa5ce7ab731b6ce1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfeb14d0d83b3c099362643fa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jan 20 22:50:36 2008 +1100 msxml3: Entity Reference nodes do not support attributes property. --- dlls/msxml3/node.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index dc53078..9d43c09 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -422,6 +422,7 @@ static HRESULT WINAPI xmlnode_get_attributes( case XML_DOCUMENT_NODE: case XML_DOCUMENT_FRAG_NODE: case XML_ENTITY_NODE: + case XML_ENTITY_REF_NODE: case XML_TEXT_NODE: *attributeMap = NULL; return S_FALSE;

1 0

Alexandre Julliard : libwine: Properly increment source pointer for surrogates in wine_utf8_wcstombs.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: bc3a5bad0f791986bfa41432e222e62b8a2e5f8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc3a5bad0f791986bfa41432e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 21 12:40:57 2008 +0100 libwine: Properly increment source pointer for surrogates in wine_utf8_wcstombs. Spotted by Ken Thomases. --- libs/wine/utf8.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/libs/wine/utf8.c b/libs/wine/utf8.c index 14cdb9d..fcbbeb0 100644 --- a/libs/wine/utf8.c +++ b/libs/wine/utf8.c @@ -82,7 +82,11 @@ static inline int get_length_wcs_utf8( int flags, const WCHAR *src, unsigned int if (val < 0x10000) /* 0x800-0xffff: 3 bytes */ len += 3; else /* 0x10000-0x10ffff: 4 bytes */ + { len += 4; + src++; + srclen--; + } } return len; } @@ -144,6 +148,8 @@ int wine_utf8_wcstombs( int flags, const WCHAR *src, int srclen, char *dst, int val >>= 6; dst[0] = 0xf0 | val; dst += 4; + src++; + srclen--; } } return dstlen - len;

1 0

Rob Shearman : riched20: Always treat the nCount variable in the EM_GETTEXTEX handler as a character count .
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: 4bff248783aa59965beb0be7883272d1671c3034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bff248783aa59965beb0be78… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 18 13:24:26 2008 +0000 riched20: Always treat the nCount variable in the EM_GETTEXTEX handler as a character count. Convert ex->cb into a character count before assigning it to nCount. Remove some dubious minus ones that would result in different character counts for the Unicode and ANSI paths. --- dlls/riched20/editor.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a954500..705c5a1 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2101,7 +2101,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, case EM_GETTEXTEX: { GETTEXTEX *ex = (GETTEXTEX*)wParam; - int nStart, nCount; + 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)); @@ -2110,12 +2110,11 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, { ME_GetSelection(editor, &nStart, &nCount); nCount -= nStart; - nCount = min(nCount, ex->cb - 1); } else { nStart = 0; - nCount = ex->cb - 1; + nCount = 0x7fffffff; } if (ex->codepage == 1200) { @@ -2127,11 +2126,14 @@ 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 = heap_alloc((crlfmul*nCount + 1) * sizeof(WCHAR)); + 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, -1, (LPSTR)lParam, ex->cb, ex->lpDefaultChar, ex->lpUsedDefaultChar); if (rc) rc--; /* do not count 0 terminator */

1 0

Andrey Esin : write: Russian translation.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: 90eb70bc5516d7eb6a5522421a6fcd342c785adb URL: http://source.winehq.org/git/wine.git/?a=commit;h=90eb70bc5516d7eb6a5522421… Author: Andrey Esin <andrey(a)esin.name> Date: Fri Jan 18 20:10:34 2008 +0300 write: Russian translation. --- programs/write/Ru.rc | 26 ++++++++++++++++++++++++++ programs/write/rsrc.rc | 1 + 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/programs/write/Ru.rc b/programs/write/Ru.rc new file mode 100644 index 0000000..653d426 --- /dev/null +++ b/programs/write/Ru.rc @@ -0,0 +1,26 @@ +/* + * Russian language support + * + * Copyright 2008 Andrey Esin <andrey(a)esin.name> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_FAILED, "�� Wordpad" +} diff --git a/programs/write/rsrc.rc b/programs/write/rsrc.rc index a854b1a..540b8ea 100644 --- a/programs/write/rsrc.rc +++ b/programs/write/rsrc.rc @@ -26,3 +26,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "Fr.rc" #include "Ko.rc" #include "No.rc" +#include "Ru.rc"

1 0

James Hawkins : msi: Add more MsiFormatRecord tests.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: 1868abda89a3fab2f69238f38df2b47b9c02373c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1868abda89a3fab2f69238f38… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jan 21 02:03:34 2008 -0600 msi: Add more MsiFormatRecord tests. --- dlls/msi/tests/format.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index acaa2db..2c9861e 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -1646,6 +1646,42 @@ static void test_formatrecord(void) ok( sz == 8, "size wrong(%i)\n",sz); ok( 0 == strcmp(buffer,"100 -100"), "wrong output (%s)\n",buffer); + sz = sizeof(buffer); + MsiRecordSetString(hrec, 0, "[1] {[noprop] [twoprop]} {abcdef}"); + MsiRecordSetString(hrec, 1, "one"); + r = MsiFormatRecord(0, hrec, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(sz == 33, "Expected 33, got %d\n",sz); + todo_wine + { + ok(!lstrcmpA(buffer, "one {[noprop] [twoprop]} {abcdef}"), + "Expected \"one {[noprop] [twoprop]} {abcdef}\", got \"%s\"\n", buffer); + } + + sz = sizeof(buffer); + MsiRecordSetString(hrec, 0, "[1] {[noprop] [one]} {abcdef}"); + MsiRecordSetString(hrec, 1, "one"); + r = MsiFormatRecord(0, hrec, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(sz == 29, "Expected 29, got %d\n",sz); + todo_wine + { + ok(!lstrcmpA(buffer, "one {[noprop] [one]} {abcdef}"), + "Expected \"one {[noprop] [one]} {abcdef}\", got \"%s\"\n", buffer); + } + + sz = sizeof(buffer); + MsiRecordSetString(hrec, 0, "[1] {[one]} {abcdef}"); + MsiRecordSetString(hrec, 1, "one"); + r = MsiFormatRecord(0, hrec, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(sz == 20, "Expected 20, got %d\n",sz); + todo_wine + { + ok(!lstrcmpA(buffer, "one {[one]} {abcdef}"), + "Expected \"one {[one]} {abcdef}\", got \"%s\"\n", buffer); + } + MsiCloseHandle( hrec ); } @@ -2003,6 +2039,42 @@ static void test_formatrecord_package(void) ok( 0 == strcmp(buffer,""), "wrong output (%s)\n",buffer); } + sz = sizeof(buffer); + MsiRecordSetString(hrec, 0, "[1] {[noprop] [twoprop]} {abcdef}"); + MsiRecordSetString(hrec, 1, "one"); + r = MsiFormatRecord(package, hrec, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(sz == 13, "Expected 13, got %d\n",sz); + todo_wine + { + ok(!lstrcmpA(buffer, "one {abcdef}"), + "Expected \"one {abcdef}\", got \"%s\"\n", buffer); + } + + sz = sizeof(buffer); + MsiRecordSetString(hrec, 0, "[1] {[noprop] [one]} {abcdef}"); + MsiRecordSetString(hrec, 1, "one"); + r = MsiFormatRecord(package, hrec, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(sz == 13, "Expected 13, got %d\n",sz); + todo_wine + { + ok(!lstrcmpA(buffer, "one {abcdef}"), + "Expected \"one {abcdef}\", got \"%s\"\n", buffer); + } + + sz = sizeof(buffer); + MsiRecordSetString(hrec, 0, "[1] {[one]} {abcdef}"); + MsiRecordSetString(hrec, 1, "one"); + r = MsiFormatRecord(package, hrec, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(sz == 20, "Expected 20, got %d\n",sz); + todo_wine + { + ok(!lstrcmpA(buffer, "one mercury {abcdef}"), + "Expected \"one mercury {abcdef}\", got \"%s\"\n", buffer); + } + MsiCloseHandle(hrec); r = MsiCloseHandle(package);

1 0

Rob Shearman : riched20: The wParam parameter to WM_GETTEXT contains the number of characters, not the number of bytes.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: 374f6ec616567772d87c13f066cd06f03bf893bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=374f6ec616567772d87c13f06… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 18 13:23:37 2008 +0000 riched20: The wParam parameter to WM_GETTEXT contains the number of characters, not the number of bytes. Fix up some places in the WM_GETTEXT handler where it was assumed that it was a byte count. --- dlls/riched20/editor.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 4e7c820..a954500 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2077,7 +2077,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, else bufferA = heap_alloc(wParam + 2); - ex.cb = wParam + (unicode ? 2*sizeof(WCHAR) : 2); + ex.cb = (wParam + 2) * (unicode ? sizeof(WCHAR) : sizeof(CHAR)); ex.flags = GT_USECRLF; ex.codepage = unicode ? 1200 : CP_ACP; ex.lpDefaultChar = NULL; @@ -2086,8 +2086,8 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, if (unicode) { - memcpy((LPWSTR)lParam, bufferW, wParam); - if (lstrlenW(bufferW) >= wParam / sizeof(WCHAR)) rc = 0; + memcpy((LPWSTR)lParam, bufferW, wParam * sizeof(WCHAR)); + if (lstrlenW(bufferW) >= wParam) rc = 0; } else {

1 0