September 2008 - Wine-commits

Alexander Nicolaysen Sørnes : regedit: Add support for exporting unicode files.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: c4d58a4b078023afb09c39dc4a1bfba1c3515181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4d58a4b078023afb09c39dc4… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Sep 14 02:21:23 2008 +0200 regedit: Add support for exporting unicode files. --- programs/regedit/framewnd.c | 4 +- programs/regedit/regedit.c | 4 +- programs/regedit/regproc.c | 60 +++++++++++++++++++++++++++++------------- programs/regedit/regproc.h | 5 +++- 4 files changed, 49 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4d58a4b078023afb09c3…

1 0

Alexander Nicolaysen Sørnes : regedit: Gather a full string before exporting it.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: 60cd910797d0a366916be122a6e1b53dc2076ac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60cd910797d0a366916be122a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Sep 12 00:54:02 2008 +0200 regedit: Gather a full string before exporting it. --- programs/regedit/regproc.c | 144 +++++++++++++++++++++++++++++++++----------- 1 files changed, 108 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=60cd910797d0a366916be…

1 0

Aric Stewart : imm32: Include a basic ImmGetCompositionString test checking ATTR lengths.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: 16d2a46bc5214680c7941568a970341f011812ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=16d2a46bc5214680c7941568a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Sep 15 08:50:34 2008 -0500 imm32: Include a basic ImmGetCompositionString test checking ATTR lengths. --- dlls/imm32/tests/imm32.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 591feb3..d0ced5f 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -220,8 +220,36 @@ static int test_ImmNotifyIME(void) { return 0; } +static int test_ImmGetCompositionString(void) +{ + HIMC imc; + static const WCHAR string[] = {'w','i','n','e',0x65e5,0x672c,0x8a9e}; + char cstring[20]; + WCHAR wstring[20]; + DWORD len; + DWORD alen,wlen; + + imc = ImmGetContext(hwnd); + ImmSetCompositionStringW(imc, SCS_SETSTR, string, sizeof(string), NULL,0); + alen = ImmGetCompositionStringA(imc, GCS_COMPSTR, cstring, 20); + wlen = ImmGetCompositionStringW(imc, GCS_COMPSTR, wstring, 20); + /* windows machines without any IME installed just return 0 above */ + if( alen && wlen) + { + len = ImmGetCompositionStringW(imc, GCS_COMPATTR, NULL, 0); + ok(len*sizeof(WCHAR)==wlen,"GCS_COMPATTR(W) not returning correct count\n"); + len = ImmGetCompositionStringA(imc, GCS_COMPATTR, NULL, 0); + ok(len==alen,"GCS_COMPATTR(A) not returning correct count\n"); + } + ImmReleaseContext(hwnd, imc); + return 0; +} + START_TEST(imm32) { if (init()) + { test_ImmNotifyIME(); + test_ImmGetCompositionString(); + } cleanup(); }

1 0

Aric Stewart : imm32: Update CopyCompClauseIMEtoClient to handle A-> W and W->A conversions.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: d8c91f58e23c45344acb3255eaab2f30af909358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c91f58e23c45344acb3255e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Sep 15 08:49:54 2008 -0500 imm32: Update CopyCompClauseIMEtoClient to handle A->W and W->A conversions. --- dlls/imm32/imm.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index b826163..602aeca 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1078,10 +1078,56 @@ static INT CopyCompAttrIMEtoClient(InputContextData *data, LPBYTE source, INT sl static INT CopyCompClauseIMEtoClient(InputContextData *data, LPBYTE source, INT slen, LPBYTE ssource, INT sslen, LPBYTE target, INT tlen, BOOL unicode ) { - if ( target && source && tlen >= slen) - memcpy( target , source , slen); + INT rc; + + if (is_himc_ime_unicode(data) && !unicode) + { + if (tlen) + { + int i; + + if (slen < tlen) + tlen = slen; + tlen /= sizeof (DWORD); + for (i = 0; i < tlen; ++i) + { + ((DWORD *)target)[i] = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)ssource, + ((DWORD *)source)[i], + NULL, 0, + NULL, NULL); + } + rc = sizeof (DWORD) * i; + } + else + rc = slen; + } + else if (!is_himc_ime_unicode(data) && unicode) + { + if (tlen) + { + int i; + + if (slen < tlen) + tlen = slen; + tlen /= sizeof (DWORD); + for (i = 0; i < tlen; ++i) + { + ((DWORD *)target)[i] = MultiByteToWideChar(CP_ACP, 0, (LPSTR)ssource, + ((DWORD *)source)[i], + NULL, 0); + } + rc = sizeof (DWORD) * i; + } + else + rc = slen; + } + else + { + memcpy( target, source, min(slen,tlen)); + rc = slen; + } - return slen; + return rc; } static INT CopyCompOffsetIMEtoClient(InputContextData *data, DWORD offset, LPBYTE ssource, BOOL unicode)

1 0

Aric Stewart : imm32: Update CopyCompOffsetIMEtoClient to handle A-> W and W->A conversions.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: b17aa7813f22d93ecd81bda272f8d3ba52ad9c38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b17aa7813f22d93ecd81bda27… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Sep 15 08:50:14 2008 -0500 imm32: Update CopyCompOffsetIMEtoClient to handle A->W and W->A conversions. --- dlls/imm32/imm.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 602aeca..abcff55 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1132,7 +1132,20 @@ static INT CopyCompClauseIMEtoClient(InputContextData *data, LPBYTE source, INT static INT CopyCompOffsetIMEtoClient(InputContextData *data, DWORD offset, LPBYTE ssource, BOOL unicode) { - return offset; + int rc; + + if (is_himc_ime_unicode(data) && !unicode) + { + rc = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)ssource, offset, NULL, 0, NULL, NULL); + } + else if (!is_himc_ime_unicode(data) && unicode) + { + rc = MultiByteToWideChar(CP_ACP, 0, (LPSTR)ssource, offset, NULL, 0); + } + else + rc = offset; + + return rc; } static LONG ImmGetCompositionStringT( HIMC hIMC, DWORD dwIndex, LPVOID lpBuf,

1 0

Aric Stewart : imm32: Implement helper functions for copying CompositionString data out of the IME . Standardize ImmGetCompositionStringA/W to use a common T function.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: 0739200c75ac6b1c058943739e734f0ae3d05952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0739200c75ac6b1c058943739… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Sep 15 08:49:21 2008 -0500 imm32: Implement helper functions for copying CompositionString data out of the IME. Standardize ImmGetCompositionStringA/W to use a common T function. --- dlls/imm32/imm.c | 317 ++++++++++++++++-------------------------------------- 1 files changed, 92 insertions(+), 225 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0739200c75ac6b1c05894…

1 0

Aric Stewart : imm32: Correct CopyCompAttrIMEtoClient to handle A->W and W- >A conversions.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: b2d9edd8a0d4725ce6ab5050ded5ee6fb8220514 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2d9edd8a0d4725ce6ab5050d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Sep 15 08:49:39 2008 -0500 imm32: Correct CopyCompAttrIMEtoClient to handle A->W and W->A conversions. --- dlls/imm32/imm.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 62 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 76677b4..b826163 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1010,10 +1010,69 @@ static INT CopyCompStringIMEtoClient(InputContextData *data, LPBYTE source, INT static INT CopyCompAttrIMEtoClient(InputContextData *data, LPBYTE source, INT slen, LPBYTE ssource, INT sslen, LPBYTE target, INT tlen, BOOL unicode ) { - if ( target && source && tlen >= slen) - memcpy( target , source , slen); + INT rc; - return slen; + if (is_himc_ime_unicode(data) && !unicode) + { + rc = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)ssource, sslen, NULL, 0, NULL, NULL); + if (tlen) + { + const BYTE *src = source; + LPBYTE dst = target; + int i, j = 0, k = 0; + + if (rc < tlen) + tlen = rc; + for (i = 0; i < sslen; ++i) + { + int len; + + len = WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)ssource + i, 1, + NULL, 0, NULL, NULL); + for (; len > 0; --len) + { + dst[j++] = src[k]; + + if (j >= tlen) + goto end; + } + ++k; + } + end: + rc = j; + } + } + else if (!is_himc_ime_unicode(data) && unicode) + { + rc = MultiByteToWideChar(CP_ACP, 0, (LPSTR)ssource, sslen, NULL, 0); + if (tlen) + { + const BYTE *src = source; + LPBYTE dst = target; + int i, j = 0; + + if (rc < tlen) + tlen = rc; + for (i = 0; i < sslen; ++i) + { + if (IsDBCSLeadByte(((LPSTR)ssource)[i])) + continue; + + dst[j++] = src[i]; + + if (j >= tlen) + break; + } + rc = j; + } + } + else + { + memcpy( target, source, min(slen,tlen)); + rc = slen; + } + + return rc; } static INT CopyCompClauseIMEtoClient(InputContextData *data, LPBYTE source, INT slen, LPBYTE ssource, INT sslen,

1 0

Mikołaj Zalewski : oleaut32: VT_USERDEFINED records are passed by value.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: 5c2fd1b192380fb741781db55b8fb93c2a336810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c2fd1b192380fb741781db55… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Sep 15 21:22:25 2008 +0200 oleaut32: VT_USERDEFINED records are passed by value. --- dlls/oleaut32/tests/tmarshal.c | 35 +++++++++++++++++++++++++++++- dlls/oleaut32/tests/tmarshal.idl | 9 +++++++ dlls/oleaut32/tests/tmarshal_dispids.h | 1 + dlls/oleaut32/tmarshal.c | 37 ++++++++++++++++++++++++++++--- 4 files changed, 77 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index f705722..04f0d4d 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -24,13 +24,26 @@ #include <ocidl.h> #include <stdio.h> -#include <wine/test.h> +#include "wine/test.h" #include "tmarshal.h" #include "tmarshal_dispids.h" #define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08lx\n", (unsigned long int)hr) +/* ULL suffix is not portable */ +#define ULL_CONST(dw1, dw2) ((((ULONGLONG)dw1) << 32) | (ULONGLONG)dw2) + +const MYSTRUCT MYSTRUCT_BYVAL = {0x12345678, ULL_CONST(0xdeadbeef, 0x98765432)}; +const MYSTRUCT MYSTRUCT_BYPTR = {0x91827364, ULL_CONST(0x88776655, 0x44332211)}; +const MYSTRUCT MYSTRUCT_ARRAY[5] = { + {0x1a1b1c1d, ULL_CONST(0x1e1f1011, 0x12131415)}, + {0x2a2b2c2d, ULL_CONST(0x2e2f2021, 0x22232425)}, + {0x3a3b3c3d, ULL_CONST(0x3e3f3031, 0x32333435)}, + {0x4a4b4c4d, ULL_CONST(0x4e4f4041, 0x42434445)}, + {0x5a5b5c5d, ULL_CONST(0x5e5f5051, 0x52535455)}, +}; + /* Debugging functions from wine/libs/wine/debug.c */ /* allocate some tmp string space */ @@ -575,6 +588,18 @@ void WINAPI Widget_VarArg( ok(hr == S_OK, "SafeArrayUnaccessData failed with %x\n", hr); } +void WINAPI Widget_StructArgs( + IWidget * iface, + MYSTRUCT byval, + MYSTRUCT *byptr, + MYSTRUCT arr[5]) +{ + ok(memcmp(&byval, &MYSTRUCT_BYVAL, sizeof(MYSTRUCT))==0, "Struct parameter passed by value corrupted\n"); + ok(memcmp(byptr, &MYSTRUCT_BYPTR, sizeof(MYSTRUCT))==0, "Struct parameter passed by pointer corrupted\n"); + ok(memcmp(arr, MYSTRUCT_ARRAY, sizeof(MYSTRUCT_ARRAY))==0, "Array of structs corrupted\n"); +} + + HRESULT WINAPI Widget_Error( IWidget __RPC_FAR * iface) { @@ -616,6 +641,7 @@ static const struct IWidgetVtbl Widget_VTable = Widget_VariantArrayPtr, Widget_Variant, Widget_VarArg, + Widget_StructArgs, Widget_Error, Widget_CloneInterface }; @@ -932,6 +958,8 @@ static void test_typelibmarshal(void) DWORD tid; BSTR bstr; ITypeInfo *pTypeInfo; + MYSTRUCT mystruct; + MYSTRUCT mystructArray[5]; ok(pKEW != NULL, "Widget creation failed\n"); @@ -1071,6 +1099,11 @@ static void test_typelibmarshal(void) ok_ole_success(hr, IDispatch_Invoke); VariantClear(&varresult); + /* call StructArgs (direct) */ + mystruct = MYSTRUCT_BYPTR; + memcpy(mystructArray, MYSTRUCT_ARRAY, sizeof(mystructArray)); + IWidget_StructArgs(pWidget, MYSTRUCT_BYVAL, &mystruct, mystructArray); + /* call Clone */ dispparams.cNamedArgs = 0; dispparams.cArgs = 0; diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 2367f28..ea10797 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -35,6 +35,12 @@ library TestTypelib STATE_WIDGETIFIED } STATE; + typedef struct tagMYSTRUCT + { + INT field1; + ULONGLONG field2; + } MYSTRUCT; + coclass ApplicationObject2; [ @@ -111,6 +117,9 @@ library TestTypelib [vararg, id(DISPID_TM_VARARG)] void VarArg([in] int numexpect, [in] SAFEARRAY(VARIANT) values); + [id(DISPID_TM_STRUCTARGS)] + void StructArgs([in] MYSTRUCT byval, [in] MYSTRUCT *byptr, [in] MYSTRUCT arr[5]); + [id(DISPID_TM_ERROR)] HRESULT Error(); diff --git a/dlls/oleaut32/tests/tmarshal_dispids.h b/dlls/oleaut32/tests/tmarshal_dispids.h index 803b94b..8fcf109 100644 --- a/dlls/oleaut32/tests/tmarshal_dispids.h +++ b/dlls/oleaut32/tests/tmarshal_dispids.h @@ -33,5 +33,6 @@ #define DISPID_TM_ERROR 14 #define DISPID_TM_CLONEINTERFACE 15 #define DISPID_TM_TESTDUAL 16 +#define DISPID_TM_STRUCTARGS 17 #define DISPID_NOA_BSTRRET 1 diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 0123e52..fdfe07c 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -524,6 +524,22 @@ _argsize(TYPEDESC *tdesc, ITypeInfo *tinfo) { return (sizeof(DECIMAL)+3)/sizeof(DWORD); case VT_VARIANT: return (sizeof(VARIANT)+3)/sizeof(DWORD); + case VT_USERDEFINED: + { + ITypeInfo *tinfo2; + TYPEATTR *tattr; + HRESULT hres; + DWORD ret; + + hres = ITypeInfo_GetRefTypeInfo(tinfo,tdesc->u.hreftype,&tinfo2); + if (FAILED(hres)) + return 0; /* should fail critically in serialize_param */ + ITypeInfo_GetTypeAttr(tinfo2,&tattr); + ret = (tattr->cbSizeInstance+3)/sizeof(DWORD); + ITypeInfo_ReleaseTypeAttr(tinfo2, tattr); + ITypeInfo_Release(tinfo2); + return ret; + } default: return 1; } @@ -558,6 +574,22 @@ _xsize(const TYPEDESC *td, ITypeInfo *tinfo) { case VT_UI1: case VT_I1: return 1; + case VT_USERDEFINED: + { + ITypeInfo *tinfo2; + TYPEATTR *tattr; + HRESULT hres; + DWORD ret; + + hres = ITypeInfo_GetRefTypeInfo(tinfo,td->u.hreftype,&tinfo2); + if (FAILED(hres)) + return 0; + ITypeInfo_GetTypeAttr(tinfo2,&tattr); + ret = tattr->cbSizeInstance; + ITypeInfo_ReleaseTypeAttr(tinfo2, tattr); + ITypeInfo_Release(tinfo2); + return ret; + } default: return 4; } @@ -1149,9 +1181,6 @@ deserialize_param( case TKIND_RECORD: { int i; - if (alloc) - *arg = (DWORD)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,tattr->cbSizeInstance); - if (debugout) TRACE_(olerelay)("{"); for (i=0;i<tattr->cVars;i++) { VARDESC *vdesc; @@ -1169,7 +1198,7 @@ deserialize_param( debugout, alloc, &vdesc->elemdescVar.tdesc, - (DWORD*)(((LPBYTE)*arg)+vdesc->u.oInst), + (DWORD*)(((LPBYTE)arg)+vdesc->u.oInst), buf ); ITypeInfo2_ReleaseVarDesc(tinfo2, vdesc);

1 0

Alexandre Julliard : ntdll: Hardcode the filesystem cluster size to avoid trouble on NFS.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: b0192cfed382c470e67aaac744de56011fe27bfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0192cfed382c470e67aaac74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 16 11:32:38 2008 +0200 ntdll: Hardcode the filesystem cluster size to avoid trouble on NFS. --- dlls/ntdll/file.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 5746023..ffc2399 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2244,6 +2244,7 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io } else { + ULONGLONG bsize; /* Linux's fstatvfs is buggy */ #if !defined(linux) || !defined(HAVE_FSTATFS) struct statvfs stfs; @@ -2253,7 +2254,7 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io io->u.Status = FILE_GetNtStatus(); break; } - info->BytesPerSector = stfs.f_frsize; + bsize = stfs.f_frsize; #else struct statfs stfs; if (fstatfs( fd, &stfs ) < 0) @@ -2261,11 +2262,12 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io io->u.Status = FILE_GetNtStatus(); break; } - info->BytesPerSector = stfs.f_bsize; + bsize = stfs.f_bsize; #endif - info->TotalAllocationUnits.QuadPart = stfs.f_blocks; - info->AvailableAllocationUnits.QuadPart = stfs.f_bavail; - info->SectorsPerAllocationUnit = 1; + info->BytesPerSector = 512; + info->SectorsPerAllocationUnit = 8; + info->TotalAllocationUnits.QuadPart = bsize * stfs.f_blocks / (512 * 8); + info->AvailableAllocationUnits.QuadPart = bsize * stfs.f_bavail / (512 * 8); io->Information = sizeof(*info); io->u.Status = STATUS_SUCCESS; }

1 0

Jacek Caban : jscript: Added regular expression compiler based on Mozilla regexp implementation.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: 5670ca52ae50eba30775b20e65b48e6de39db5cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5670ca52ae50eba30775b20e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 15 20:39:58 2008 +0200 jscript: Added regular expression compiler based on Mozilla regexp implementation. --- dlls/jscript/regexp.c | 3216 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 3213 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5670ca52ae50eba30775b…

1 0