wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

André Hentschel : d3d10/tests: Avoid preprocessor check to ensure it compiles.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 10fc362dfeb9dfd43469f3572b846b7a88c615c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10fc362dfeb9dfd43469f3572… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 22 22:32:24 2014 +0100 d3d10/tests: Avoid preprocessor check to ensure it compiles. --- dlls/d3d10/tests/effect.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index e16d458..a07bc6c 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -2679,11 +2679,12 @@ static void test_effect_local_shader(ID3D10Device *device) p = null_technique->lpVtbl->GetPassByName(null_technique, "invalid"); ok(null_pass == p, "GetPassByName got %p, expected %p\n", p, null_pass); -#if 0 +if (0) +{ /* This crashes on W7/DX10, if t is a valid technique and name=NULL. */ p = t->lpVtbl->GetPassByName(t, NULL); ok(null_pass == p, "GetPassByName got %p, expected %p\n", p, null_pass); -#endif +} p = t->lpVtbl->GetPassByIndex(t, 0xffffffff); ok(null_pass == p, "GetPassByIndex got %p, expected %p\n", p, null_pass);

1 0

André Hentschel : comctl32/tests: Avoid preprocessor checks to ensure it compiles.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: e32237d34ade0f29af579fde39dd85ac34f6f9b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e32237d34ade0f29af579fde3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 22 22:32:17 2014 +0100 comctl32/tests: Avoid preprocessor checks to ensure it compiles. --- dlls/comctl32/tests/imagelist.c | 5 +++-- dlls/comctl32/tests/monthcal.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index caf7539..38fb744 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -809,7 +809,8 @@ static ULONG check_bitmap_data(const char *bm_data, ULONG bm_data_size, image_size = DIB_GetWidthBytes(bmih->biWidth, bmih->biBitCount) * bmih->biHeight; ok(bmih->biSizeImage == image_size, "wrong biSizeImage %u\n", bmih->biSizeImage); -#if 0 + +if (0) { char fname[256]; FILE *f; @@ -818,7 +819,7 @@ static ULONG check_bitmap_data(const char *bm_data, ULONG bm_data_size, fwrite(bm_data, 1, bm_data_size, f); fclose(f); } -#endif + return hdr_size + image_size; } diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 145d20f..78ef541 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1082,7 +1082,8 @@ static void test_hittest(void) expect(mchit.uHit, res); expect_hex(MCHT_CALENDARDATEPREV, res); -#if 0 +if (0) +{ /* (125, 115) is in active area - date from this month */ mchit.pt.x = 125; mchit.pt.y = 115; @@ -1091,7 +1092,7 @@ static void test_hittest(void) expect(115, mchit.pt.y); expect(mchit.uHit, res); expect(MCHT_CALENDARDATE, res); -#endif +} /* in active area - date from next month */ mchit.pt.x = 11 * r.right / 14;

1 0

André Hentschel : setupapi/tests: Remove dead code.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 0d688c7d520696dc26457317ec97864be5039a1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d688c7d520696dc26457317e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 22 22:31:06 2014 +0100 setupapi/tests: Remove dead code. --- dlls/setupapi/tests/stringtable.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/setupapi/tests/stringtable.c b/dlls/setupapi/tests/stringtable.c index 8048f8a..2818e30 100644 --- a/dlls/setupapi/tests/stringtable.c +++ b/dlls/setupapi/tests/stringtable.c @@ -48,10 +48,6 @@ static HSTRING_TABLE (WINAPI *pStringTableInitializeEx)(DWORD, DWORD); static DWORD (WINAPI *pStringTableLookUpString)(HSTRING_TABLE, LPWSTR, DWORD); static DWORD (WINAPI *pStringTableLookUpStringEx)(HSTRING_TABLE, LPWSTR, DWORD, LPVOID, DWORD); static LPWSTR (WINAPI *pStringTableStringFromId)(HSTRING_TABLE, DWORD); -#if 0 -static BOOL (WINAPI *pStringTableStringFromIdEx)(HSTRING_TABLE, DWORD, LPWSTR, LPDWORD); -static VOID (WINAPI *pStringTableTrim)(HSTRING_TABLE); -#endif static HMODULE hdll; static WCHAR string[] = {'s','t','r','i','n','g',0};

1 0

Andrey Gusev : Assorted spelling and typos fixes.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: e7f0a8a081dd088bf50fd6e6b8b846b3c05b75a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7f0a8a081dd088bf50fd6e6b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jan 22 13:25:54 2014 +0200 Assorted spelling and typos fixes. --- dlls/d3d9/tests/device.c | 2 +- dlls/d3drm/frame.c | 4 ++-- dlls/d3dxof/d3dxof.c | 2 +- dlls/d3dxof/main.c | 2 +- dlls/dbghelp/dwarf.c | 2 +- dlls/dbghelp/msc.c | 6 +++--- dlls/dbghelp/storage.c | 2 +- dlls/ddraw/tests/ddraw1.c | 8 ++++---- dlls/ddraw/tests/ddraw2.c | 10 +++++----- dlls/ddraw/tests/ddraw4.c | 10 +++++----- dlls/ddraw/tests/ddraw7.c | 10 +++++----- dlls/ddraw/tests/dsurface.c | 4 ++-- dlls/ddraw/utils.c | 2 +- dlls/ddraw/viewport.c | 4 ++-- 14 files changed, 34 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7f0a8a081dd088bf50fd…

1 0

Jactry Zeng : riched20: Add UTF8 support for EM_SETTEXTEX.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 88214a5874b4fa3f009444b65a8a424105454f51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88214a5874b4fa3f009444b65… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Tue Jan 21 08:55:29 2014 +0800 riched20: Add UTF8 support for EM_SETTEXTEX. --- dlls/riched20/editor.c | 16 ++++++++++++---- dlls/riched20/tests/editor.c | 8 ++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 85848bc..e419bf6 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3329,8 +3329,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, SETTEXTEX *pStruct = (SETTEXTEX *)wParam; int from, to, len; ME_Style *style; - BOOL bRtf, bUnicode, bSelection; + BOOL bRtf, bUnicode, bSelection, bUTF8; int oldModify = editor->nModifyStep; + static const char utf8_bom[] = {0xef, 0xbb, 0xbf}; if (!pStruct) return 0; @@ -3339,6 +3340,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, bRtf = (lParam && (!strncmp((char *)lParam, "{\\rtf", 5) || !strncmp((char *)lParam, "{\\urtf", 6))); bUnicode = !bRtf && pStruct->codepage == CP_UNICODE; + bUTF8 = (lParam && (!strncmp((char *)lParam, utf8_bom, 3))); TRACE("EM_SETTEXTEX - %s, flags %d, cp %d\n", bUnicode ? debugstr_w((LPCWSTR)lParam) : debugstr_a((LPCSTR)lParam), @@ -3364,9 +3366,15 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, len = lParam ? strlen((char *)lParam) : 0; } } else { - wszText = ME_ToUnicode(pStruct->codepage, (void *)lParam, &len); - ME_InsertTextFromCursor(editor, 0, wszText, len, style); - ME_EndToUnicode(pStruct->codepage, wszText); + if (bUTF8 && !bUnicode) { + wszText = ME_ToUnicode(CP_UTF8, (void *)(lParam+3), &len); + ME_InsertTextFromCursor(editor, 0, wszText, len, style); + ME_EndToUnicode(CP_UTF8, wszText); + } else { + wszText = ME_ToUnicode(pStruct->codepage, (void *)lParam, &len); + ME_InsertTextFromCursor(editor, 0, wszText, len, style); + ME_EndToUnicode(pStruct->codepage, wszText); + } } if (bSelection) { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index ae0f72f..2efee9a 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3901,17 +3901,17 @@ static void test_EM_SETTEXTEX(void) setText.codepage = CP_ACP; SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)"\xef\xbb\xbfTestUTF8WithBOM"); result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)bufACP); - todo_wine ok(result == 15, "EM_SETTEXTEX: Test UTF8 with BOM returned %d, expected 15\n", result); + ok(result == 15, "EM_SETTEXTEX: Test UTF8 with BOM returned %d, expected 15\n", result); result = strcmp(bufACP, "TestUTF8WithBOM"); - todo_wine ok(result == 0, "EM_SETTEXTEX: Test UTF8 with BOM set wrong text: Result: %s\n", bufACP); + ok(result == 0, "EM_SETTEXTEX: Test UTF8 with BOM set wrong text: Result: %s\n", bufACP); setText.flags = 0; setText.codepage = CP_UTF8; SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)"\xef\xbb\xbfTestUTF8WithBOM"); result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)bufACP); - todo_wine ok(result == 15, "EM_SETTEXTEX: Test UTF8 with BOM returned %d, expected 15\n", result); + ok(result == 15, "EM_SETTEXTEX: Test UTF8 with BOM returned %d, expected 15\n", result); result = strcmp(bufACP, "TestUTF8WithBOM"); - todo_wine ok(result == 0, "EM_SETTEXTEX: Test UTF8 with BOM set wrong text: Result: %s\n", bufACP); + ok(result == 0, "EM_SETTEXTEX: Test UTF8 with BOM set wrong text: Result: %s\n", bufACP); DestroyWindow(hwndRichEdit); }

1 0

Jactry Zeng : riched20: Use codepage in ME_ToUnicode.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: eb8f47518eae395ea10cd5defd744dfe54e83fbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb8f47518eae395ea10cd5def… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Tue Jan 21 08:42:58 2014 +0800 riched20: Use codepage in ME_ToUnicode. --- dlls/riched20/editor.c | 21 +++++++++++---------- dlls/riched20/editor.h | 4 ++-- dlls/riched20/string.c | 12 ++++++------ 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 119061f..85848bc 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3364,10 +3364,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, len = lParam ? strlen((char *)lParam) : 0; } } else { - /* FIXME: make use of pStruct->codepage in the to unicode translation */ - wszText = ME_ToUnicode(bUnicode, (void *)lParam, &len); + wszText = ME_ToUnicode(pStruct->codepage, (void *)lParam, &len); ME_InsertTextFromCursor(editor, 0, wszText, len, style); - ME_EndToUnicode(bUnicode, wszText); + ME_EndToUnicode(pStruct->codepage, wszText); } if (bSelection) { @@ -3555,7 +3554,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, int from, to, nStartCursor; ME_Style *style; int len = 0; - LPWSTR wszText = ME_ToUnicode(unicode, (void *)lParam, &len); + LONG codepage = unicode ? CP_UNICODE : CP_ACP; + LPWSTR wszText = ME_ToUnicode(codepage, (void *)lParam, &len); TRACE("EM_REPLACESEL - %s\n", debugstr_w(wszText)); nStartCursor = ME_GetSelectionOfs(editor, &from, &to); @@ -3570,7 +3570,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, */ if (len>0 && wszText[len-1] == '\n') ME_ClearTempStyle(editor); - ME_EndToUnicode(unicode, wszText); + ME_EndToUnicode(codepage, wszText); ME_CommitUndo(editor); ME_UpdateSelectionLinkAttribute(editor); if (!wParam) @@ -3626,7 +3626,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, else { int textLen; - LPWSTR wszText = ME_ToUnicode(unicode, (void *)lParam, &textLen); + LONG codepage = unicode ? CP_UNICODE : CP_ACP; + LPWSTR wszText = ME_ToUnicode(codepage, (void *)lParam, &textLen); TRACE("WM_SETTEXT - %s\n", debugstr_w(wszText)); /* debugstr_w() */ if (textLen > 0) { @@ -3643,7 +3644,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } ME_InsertTextFromCursor(editor, 0, wszText, len, editor->pBuffer->pDefaultStyle); } - ME_EndToUnicode(unicode, wszText); + ME_EndToUnicode(codepage, wszText); } } else @@ -4035,8 +4036,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { WCHAR *textW; int len; - - textW = ME_ToUnicode(unicode, text, &len); + LONG codepage = unicode ? CP_UNICODE : CP_ACP; + textW = ME_ToUnicode(codepage, text, &len); if (!(editor->styleFlags & ES_MULTILINE)) { len = 0; @@ -4044,7 +4045,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, len++; } ME_InsertTextFromCursor(editor, 0, textW, len, editor->pBuffer->pDefaultStyle); - ME_EndToUnicode(unicode, textW); + ME_EndToUnicode(codepage, textW); ME_SetCursorToStart(editor, &editor->pCursors[0]); ME_SetCursorToStart(editor, &editor->pCursors[1]); } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index ae8b81a..af7291f 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -110,8 +110,8 @@ BOOL ME_InsertString(ME_String *s, int ofs, const WCHAR *insert, int len) DECLSP #define CP_UNICODE 1200 /* smart helpers for A<->W conversions, they reserve/free memory and call MultiByte<->WideChar functions */ -LPWSTR ME_ToUnicode(BOOL unicode, LPVOID psz, INT *len) DECLSPEC_HIDDEN; -void ME_EndToUnicode(BOOL unicode, LPVOID psz) DECLSPEC_HIDDEN; +LPWSTR ME_ToUnicode(LONG codepage, LPVOID psz, INT *len) DECLSPEC_HIDDEN; +void ME_EndToUnicode(LONG codepage, LPVOID psz) DECLSPEC_HIDDEN; static inline int ME_IsWSpace(WCHAR ch) { diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index f4cd320..12e4ad7 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -172,30 +172,30 @@ ME_CallWordBreakProc(ME_TextEditor *editor, WCHAR *str, INT len, INT start, INT } } -LPWSTR ME_ToUnicode(BOOL unicode, LPVOID psz, INT *len) +LPWSTR ME_ToUnicode(LONG codepage, LPVOID psz, INT *len) { *len = 0; if (!psz) return NULL; - if (unicode) + if (codepage == CP_UNICODE) { *len = lstrlenW(psz); return psz; } else { WCHAR *tmp; - int nChars = MultiByteToWideChar(CP_ACP, 0, psz, -1, NULL, 0); + int nChars = MultiByteToWideChar(codepage, 0, psz, -1, NULL, 0); if(!nChars) return NULL; if((tmp = ALLOC_N_OBJ(WCHAR, nChars)) != NULL) - *len = MultiByteToWideChar(CP_ACP, 0, psz, -1, tmp, nChars) - 1; + *len = MultiByteToWideChar(codepage, 0, psz, -1, tmp, nChars) - 1; return tmp; } } -void ME_EndToUnicode(BOOL unicode, LPVOID psz) +void ME_EndToUnicode(LONG codepage, LPVOID psz) { - if (!unicode) + if (codepage != CP_UNICODE) FREE_OBJ(psz); }

1 0

Nikolay Sivov : widl: Fix pointer size for SYS_WIN64 typelibs.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: c46debeeebfcaa7a158dd7cdd8a67b05d74f02c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c46debeeebfcaa7a158dd7cdd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 19 20:45:02 2014 +0400 widl: Fix pointer size for SYS_WIN64 typelibs. The fact that test data was wrong was hidden by broken widl typelib, and same test typelib was used on windows so we never get proper test results. Standard IUnknown/IDispatch that live in system stdole2.tlb are also tested now. --- dlls/oleaut32/tests/typelib.c | 26 +++++++++++++++++++++----- dlls/oleaut32/typelib.c | 4 ++-- tools/widl/write_msft.c | 28 +++++++++++++--------------- 3 files changed, 36 insertions(+), 22 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index d3980f8..2ceebc5 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -651,7 +651,7 @@ static const char *create_test_typelib(int res_no) static void test_TypeInfo(void) { ITypeLib *pTypeLib; - ITypeInfo *pTypeInfo; + ITypeInfo *pTypeInfo, *ti; ITypeInfo2 *pTypeInfo2; HRESULT hr; static WCHAR wszBogus[] = { 'b','o','g','u','s',0 }; @@ -668,6 +668,7 @@ static void test_TypeInfo(void) TYPEKIND kind; const char *filenameA; WCHAR filename[MAX_PATH]; + TYPEATTR *attr; hr = LoadTypeLib(wszStdOle2, &pTypeLib); ok_ole_success(hr, LoadTypeLib); @@ -765,8 +766,6 @@ static void test_TypeInfo(void) ITypeInfo_Release(pTypeInfo); - - hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, &IID_IDispatch, &pTypeInfo); ok_ole_success(hr, ITypeLib_GetTypeInfoOfGuid); @@ -792,6 +791,23 @@ static void test_TypeInfo(void) VariantClear(&var); } + /* Check instance size for IDispatch, typelib is loaded using system SYS_WIN* kind so it always matches + system bitness. */ + hr = ITypeInfo_GetTypeAttr(pTypeInfo, &attr); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(attr->cbSizeInstance == sizeof(void*), "got size %d\n", attr->cbSizeInstance); + ok(attr->typekind == TKIND_INTERFACE, "got typekind %d\n", attr->typekind); + ITypeInfo_ReleaseTypeAttr(pTypeInfo, attr); + + /* same size check with some general interface */ + hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, &IID_IEnumVARIANT, &ti); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = ITypeInfo_GetTypeAttr(ti, &attr); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(attr->cbSizeInstance == sizeof(void*), "got size %d\n", attr->cbSizeInstance); + ITypeInfo_ReleaseTypeAttr(ti, attr); + ITypeInfo_Release(ti); + /* test invoking a method with a [restricted] keyword */ /* correct member id -- wrong flags -- cNamedArgs not bigger than cArgs */ @@ -3757,7 +3773,7 @@ static const interface_info info[] = { /* interfaces count: 2 */ { "IDualIface", - /*kind*/ TKIND_DISPATCH, /*flags*/ 0x1040, /*align*/ 4, /*size*/ 4, + /*kind*/ TKIND_DISPATCH, /*flags*/ 0x1040, /*align*/ 4, /*size*/ sizeof(void*), /*#vtbl*/ 7, /*#func*/ 8, { { @@ -3898,7 +3914,7 @@ static const interface_info info[] = { }, { "ISimpleIface", - /*kind*/ TKIND_INTERFACE, /*flags*/ 0x1000, /*align*/ 4, /*size*/ 4, + /*kind*/ TKIND_INTERFACE, /*flags*/ 0x1000, /*align*/ 4, /*size*/ sizeof(void*), /*#vtbl*/ 8, /*#func*/ 1, { { diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index e5a99e8..4213ae6 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3545,7 +3545,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) cx.length = dwTLBLength; /* read header */ - MSFT_ReadLEDWords((void*)&tlbHeader, sizeof(tlbHeader), &cx, 0); + MSFT_ReadLEDWords(&tlbHeader, sizeof(tlbHeader), &cx, 0); TRACE_(typelib)("header:\n"); TRACE_(typelib)("\tmagic1=0x%08x ,magic2=0x%08x\n",tlbHeader.magic1,tlbHeader.magic2 ); if (tlbHeader.magic1 != MSFT_SIGNATURE) { @@ -9645,7 +9645,7 @@ static DWORD WMSFT_compile_typeinfo(ITypeInfoImpl *info, INT16 index, WMSFT_TLBF size = sizeof(MSFT_TypeInfoBase); if(data){ - MSFT_TypeInfoBase *base = (void*)data; + MSFT_TypeInfoBase *base = (MSFT_TypeInfoBase*)data; if(info->wTypeFlags & TYPEFLAG_FDUAL) base->typekind = TKIND_DISPATCH; else diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 6eb229a..cc039dc 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -174,7 +174,7 @@ static void ctl2_init_segdir( segdir = &typelib->typelib_segdir[MSFT_SEG_TYPEINFO]; - for (i = 0; i < 15; i++) { + for (i = 0; i < MSFT_SEG_MAX; i++) { segdir[i].offset = -1; segdir[i].length = 0; segdir[i].res08 = -1; @@ -827,7 +827,6 @@ static int encode_type( case VT_UI4: case VT_R4: case VT_ERROR: - case VT_BSTR: case VT_HRESULT: *encoded_type = default_type; *width = 4; @@ -863,8 +862,9 @@ static int encode_type( case VT_UNKNOWN: case VT_DISPATCH: + case VT_BSTR: *encoded_type = default_type; - *width = 4; + *width = pointer_size; *alignment = 4; break; @@ -875,7 +875,7 @@ static int encode_type( case VT_LPSTR: case VT_LPWSTR: *encoded_type = 0xfffe0000 | vt; - *width = 4; + *width = pointer_size; *alignment = 4; break; @@ -898,7 +898,7 @@ static int encode_type( if(next_vt == VT_DISPATCH || next_vt == VT_UNKNOWN) { chat("encode_type: skipping ptr\n"); *encoded_type = target_type; - *width = 4; + *width = pointer_size; *alignment = 4; *decoded_size = child_size; break; @@ -928,13 +928,12 @@ static int encode_type( *encoded_type = typeoffset; - *width = 4; + *width = pointer_size; *alignment = 4; *decoded_size = 8 /*sizeof(TYPEDESC)*/ + child_size; break; } - case VT_SAFEARRAY: { type_t *element_type = type_alias_get_aliasee(type_array_get_element(type)); @@ -966,13 +965,12 @@ static int encode_type( *encoded_type = typeoffset; - *width = 4; + *width = pointer_size; *alignment = 4; *decoded_size = 8 /*sizeof(TYPEDESC)*/ + child_size; break; } - case VT_USERDEFINED: { int typeinfo_offset; @@ -1119,7 +1117,7 @@ static int encode_var( chat("encode_var: skipping ptr\n"); *encoded_type = target_type; *decoded_size = child_size; - *width = 4; + *width = pointer_size; *alignment = 4; return 0; } @@ -1148,7 +1146,7 @@ static int encode_var( *encoded_type = typeoffset; - *width = 4; + *width = pointer_size; *alignment = 4; *decoded_size = 8 /*sizeof(TYPEDESC)*/ + child_size; return 0; @@ -1728,7 +1726,7 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) break; case TKIND_DISPATCH: var_kind = 3; /* VAR_DISPATCH */ - typeinfo->datawidth = 4; + typeinfo->datawidth = pointer_size; var_alignment = 4; break; default: @@ -1981,7 +1979,7 @@ static void add_dispinterface_typeinfo(msft_typelib_t *typelib, type_t *dispinte msft_typeinfo = create_msft_typeinfo(typelib, TKIND_DISPATCH, dispinterface->name, dispinterface->attrs); - msft_typeinfo->typeinfo->size = 4; + msft_typeinfo->typeinfo->size = pointer_size; msft_typeinfo->typeinfo->typekind |= 0x2100; msft_typeinfo->typeinfo->flags |= 0x1000; /* TYPEFLAG_FDISPATCHABLE */ @@ -2046,7 +2044,7 @@ static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface) interface->typelib_idx = typelib->typelib_header.nrtypeinfos; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_INTERFACE, interface->name, interface->attrs); - msft_typeinfo->typeinfo->size = 4; + msft_typeinfo->typeinfo->size = pointer_size; msft_typeinfo->typeinfo->typekind |= 0x2200; for (derived = inherit; derived; derived = type_iface_get_inherit(derived)) @@ -2210,7 +2208,7 @@ static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls) first_source->flags |= 0x1; msft_typeinfo->typeinfo->cImplTypes = num_ifaces; - msft_typeinfo->typeinfo->size = 4; + msft_typeinfo->typeinfo->size = pointer_size; msft_typeinfo->typeinfo->typekind |= 0x2200; }

1 0

Bruno Jesus : ws2_32/tests: Add missing closesocket calls (Coverity).
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 84d91bb93d97a79b63d7f81ebc828e9eeb66efd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84d91bb93d97a79b63d7f81eb… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jan 18 19:07:52 2014 -0200 ws2_32/tests: Add missing closesocket calls (Coverity). --- dlls/ws2_32/tests/sock.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 0abf732..8cee632 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1061,6 +1061,9 @@ static void test_WithWSAStartup(void) ok(error == WSAENOTSOCK, "expected 10038, got %d\n", error); } + closesocket(src); + closesocket(dst); + WSACleanup(); }

1 0

Bruno Jesus : ws2_32: Return the correct address family in WSAStringToAddressA.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 4c6e04050f7c996506edab79518f43ce9ae4ce96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6e04050f7c996506edab795… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jan 18 19:03:27 2014 -0200 ws2_32: Return the correct address family in WSAStringToAddressA. --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a855285..0ae0c4f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6861,7 +6861,7 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, *lpAddressLength = sizeof(SOCKADDR_IN); memset(lpAddress, 0, sizeof(SOCKADDR_IN)); - ((LPSOCKADDR_IN)lpAddress)->sin_family = AF_INET; + ((LPSOCKADDR_IN)lpAddress)->sin_family = WS_AF_INET; ptrPort = strchr(workBuffer, ':'); if(ptrPort)

1 0

Bruno Jesus : user32: Cope with null LPMENUITEMINFO in SetMenuItemInfo.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 06a6b189f6c9712e64f3f7da908403f410295785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06a6b189f6c9712e64f3f7da9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jan 18 12:59:01 2014 -0200 user32: Cope with null LPMENUITEMINFO in SetMenuItemInfo. --- dlls/user32/menu.c | 4 ++-- dlls/user32/tests/menu.c | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 50545ee..bbaa5f3 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4795,8 +4795,8 @@ static BOOL MENU_NormalizeMenuItemInfoStruct( const MENUITEMINFOW *pmii_in, MENUITEMINFOW *pmii_out ) { /* do we recognize the size? */ - if( pmii_in->cbSize != sizeof( MENUITEMINFOW) && - pmii_in->cbSize != sizeof( MENUITEMINFOW) - sizeof( pmii_in->hbmpItem)) { + if( !pmii_in || (pmii_in->cbSize != sizeof( MENUITEMINFOW) && + pmii_in->cbSize != sizeof( MENUITEMINFOW) - sizeof( pmii_in->hbmpItem)) ) { SetLastError( ERROR_INVALID_PARAMETER); return FALSE; } diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 20126d4..d02eb91 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -948,6 +948,19 @@ static void test_menu_add_string( void ) ok (!lstrcmpW( strbackW, expectedString ), "Menu text from Unicode version incorrect\n"); } + /* Just try some invalid parameter tests */ + SetLastError(0xdeadbeef); + rc = SetMenuItemInfoA( hmenu, 0, TRUE, NULL ); + ret = GetLastError(); + ok (!rc, "SetMenuItemInfoA succeeded unexpectedly\n"); + ok (ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + + SetLastError(0xdeadbeef); + rc = SetMenuItemInfoA( hmenu, 0, FALSE, NULL ); + ret = GetLastError(); + ok (!rc, "SetMenuItemInfoA succeeded unexpectedly\n"); + ok (ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + /* Just change ftype to string and see what text is stored */ memset(&info, 0x00, sizeof(info)); info.cbSize= sizeof(MENUITEMINFOA);

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
82
Older →

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 January 2014