July 2013 - Wine-commits - list.winehq.org

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable matrix row array test.
by Alexandre Julliard 27 Jul '13

27 Jul '13

Module: wine Branch: master Commit: 6705073016ce6b332448f75e3056ba34e1d0e3f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6705073016ce6b332448f75e3… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 24 22:30:17 2013 +0200 d3dx9/tests: Add ID3DXConstantTable matrix row array test. --- dlls/d3dx9_36/tests/shader.c | 521 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 521 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6705073016ce6b332448f…

1 0

Rico Schüller : d3dx9: Add support for structs to ID3DXConstantTable.
by Alexandre Julliard 27 Jul '13

27 Jul '13

Module: wine Branch: master Commit: bdec3f951b26d9dec2e706b5ac0bfc3081f40e31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdec3f951b26d9dec2e706b5a… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 24 22:30:21 2013 +0200 d3dx9: Add support for structs to ID3DXConstantTable. --- dlls/d3dx9_36/shader.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index d44316f..15dbb7a 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -958,8 +958,83 @@ static UINT set(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, /* D3DXPC_STRUCT is somewhat special */ if (desc->Class == D3DXPC_STRUCT) { - FIXME("Structs are not supported, yet.\n"); - return 0; + /* + * Struct array sets the last complete input to the first struct element, all other + * elements are not set. + * E.g.: struct {int i;} s1[2]; + * SetValue(device, "s1", [1, 2], 8) => s1 = {2, x}; + * + * struct {int i; int n} s2[2]; + * SetValue(device, "s2", [1, 2, 3, 4, 5], 20) => s1 = {{3, 4}, {x, x}}; + */ + if (desc->Elements > 1) + { + UINT offset = *size / (desc->Rows * desc->Columns) - 1; + + offset = min(desc->Elements - 1, offset); + last = offset * desc->Rows * desc->Columns; + + if ((is_pointer || (!is_pointer && inclass == D3DXPC_MATRIX_ROWS)) && desc->RegisterSet != D3DXRS_BOOL) + { + set(table, device, &constant->constants[0], NULL, intype, size, incol, inclass, 0, is_pointer); + } + else + { + last += set(table, device, &constant->constants[0], indata, intype, size, incol, inclass, + index + last, is_pointer); + } + } + else + { + /* + * D3DXRS_BOOL is always set. As there are only 16 bools and there are + * exactly 16 input values, use matrix transpose. + */ + if (inclass == D3DXPC_MATRIX_ROWS && desc->RegisterSet == D3DXRS_BOOL) + { + D3DXMATRIX mat, *m, min; + D3DXMatrixTranspose(&mat, &min); + + if (is_pointer) + min = *(D3DXMATRIX *)(indata[index / 16]); + else + min = **(D3DXMATRIX **)indata; + + D3DXMatrixTranspose(&mat, &min); + m = &mat; + for (i = 0; i < desc->StructMembers; ++i) + { + last += set(table, device, &constant->constants[i], (const void **)&m, intype, size, incol, + D3DXPC_SCALAR, index + last, is_pointer); + } + } + /* + * For pointers or for matrix rows, only the first member is set. + * All other members are set to 0. This is not true for D3DXRS_BOOL. + * E.g.: struct {int i; int n} s; + * SetValue(device, "s", [1, 2], 8) => s = {1, 0}; + */ + else if ((is_pointer || (!is_pointer && inclass == D3DXPC_MATRIX_ROWS)) && desc->RegisterSet != D3DXRS_BOOL) + { + last = set(table, device, &constant->constants[0], indata, intype, size, incol, inclass, + index + last, is_pointer); + + for (i = 1; i < desc->StructMembers; ++i) + { + set(table, device, &constant->constants[i], NULL, intype, size, incol, inclass, 0, is_pointer); + } + } + else + { + for (i = 0; i < desc->StructMembers; ++i) + { + last += set(table, device, &constant->constants[i], indata, intype, size, incol, D3DXPC_SCALAR, + index + last, is_pointer); + } + } + } + + return last; } /* elements */

1 0

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable struct test.
by Alexandre Julliard 27 Jul '13

27 Jul '13

Module: wine Branch: master Commit: cf5a2b641715cdee478e5e51751e84016ed7e829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf5a2b641715cdee478e5e517… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 24 22:30:27 2013 +0200 d3dx9/tests: Add ID3DXConstantTable struct test. --- dlls/d3dx9_36/tests/shader.c | 308 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 308 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf5a2b641715cdee478e5…

1 0

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable struct array test.
by Alexandre Julliard 27 Jul '13

27 Jul '13

Module: wine Branch: master Commit: b196d0ccdcbbe54e5df0745b3d170ee76fa15185 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b196d0ccdcbbe54e5df0745b3… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 24 22:30:31 2013 +0200 d3dx9/tests: Add ID3DXConstantTable struct array test. --- dlls/d3dx9_36/tests/shader.c | 377 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 377 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b196d0ccdcbbe54e5df07…

1 0

Ken Thomases : user32: Remove dead code for suppressing menu drawing.
by Alexandre Julliard 27 Jul '13

27 Jul '13

Module: wine Branch: master Commit: 029aec19ff7676433b61896699fe452aad72f0ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=029aec19ff7676433b6189669… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jul 24 17:35:50 2013 -0500 user32: Remove dead code for suppressing menu drawing. --- dlls/user32/controls.h | 3 +-- dlls/user32/menu.c | 19 ++----------------- dlls/user32/nonclient.c | 8 ++++---- 3 files changed, 7 insertions(+), 23 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index e168f16..32e9815 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -160,8 +160,7 @@ extern UINT MENU_GetMenuBarHeight( HWND hwnd, UINT menubarWidth, extern BOOL MENU_SetMenu(HWND, HMENU) DECLSPEC_HIDDEN; extern void MENU_TrackMouseMenuBar( HWND hwnd, INT ht, POINT pt ) DECLSPEC_HIDDEN; extern void MENU_TrackKbdMenuBar( HWND hwnd, UINT wParam, WCHAR wChar ) DECLSPEC_HIDDEN; -extern UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, - HWND hwnd, BOOL suppress_draw ) DECLSPEC_HIDDEN; +extern UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, HWND hwnd ) DECLSPEC_HIDDEN; extern void MENU_EndMenu(HWND) DECLSPEC_HIDDEN; /* nonclient area */ diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index f39ae7c..73b20b9 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1801,11 +1801,9 @@ static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu ) * Paint a menu bar. Returns the height of the menu bar. * called from [windows/nonclient.c] */ -UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, HWND hwnd, - BOOL suppress_draw) +UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, HWND hwnd ) { LPPOPUPMENU lppop; - HFONT hfontOld = 0; HMENU hMenu = GetMenu(hwnd); lppop = MENU_GetMenu( hMenu ); @@ -1814,20 +1812,7 @@ UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, HWND hwnd, return GetSystemMetrics(SM_CYMENU); } - if (suppress_draw) - { - hfontOld = SelectObject( hDC, get_menu_font(FALSE)); - - if (lppop->Height == 0) - MENU_MenuBarCalcSize(hDC, lprect, lppop, hwnd); - - lprect->bottom = lprect->top + lppop->Height; - - if (hfontOld) SelectObject( hDC, hfontOld); - return lppop->Height; - } - else - return DrawMenuBarTemp(hwnd, hDC, lprect, hMenu, NULL); + return DrawMenuBarTemp(hwnd, hDC, lprect, hMenu, NULL); } diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 050af90..da9c6bd 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -980,7 +980,7 @@ static void NC_DrawCaption( HDC hdc, RECT *rect, HWND hwnd, DWORD style, * * Paint the non-client area for windows. */ -static void NC_DoNCPaint( HWND hwnd, HRGN clip, BOOL suppress_menupaint ) +static void NC_DoNCPaint( HWND hwnd, HRGN clip ) { HDC hdc; RECT rfuzz, rect, rectClip; @@ -1062,7 +1062,7 @@ static void NC_DoNCPaint( HWND hwnd, HRGN clip, BOOL suppress_menupaint ) TRACE("Calling DrawMenuBar with rect (%s)\n", wine_dbgstr_rect(&r)); - rect.top += MENU_DrawMenuBar( hdc, &r, hwnd, suppress_menupaint ) + 1; + rect.top += MENU_DrawMenuBar( hdc, &r, hwnd ) + 1; } TRACE("After MenuBar, rect is (%s).\n", wine_dbgstr_rect(&rect)); @@ -1109,7 +1109,7 @@ LRESULT NC_HandleNCPaint( HWND hwnd , HRGN clip) if( dwStyle & WS_MINIMIZE ) WINPOS_RedrawIconTitle( hwnd ); else - NC_DoNCPaint( hwnd, clip, FALSE ); + NC_DoNCPaint( hwnd, clip ); } return 0; } @@ -1143,7 +1143,7 @@ LRESULT NC_HandleNCActivate( HWND hwnd, WPARAM wParam, LPARAM lParam ) if (IsIconic(hwnd)) WINPOS_RedrawIconTitle( hwnd ); else - NC_DoNCPaint( hwnd, (HRGN)1, FALSE ); + NC_DoNCPaint( hwnd, (HRGN)1 ); } return TRUE;

1 0

Piotr Caban : msvcrt: Add _wctomb_s_l implementation.
by Alexandre Julliard 27 Jul '13

27 Jul '13

Module: wine Branch: master Commit: 6457163bb27f986d09a085af5a5d971d2b302153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6457163bb27f986d09a085af5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 25 10:14:33 2013 +0200 msvcrt: Add _wctomb_s_l implementation. --- dlls/msvcr100/msvcr100.spec | 6 +- dlls/msvcr110/msvcr110.spec | 6 +- dlls/msvcr80/msvcr80.spec | 6 +- dlls/msvcr90/msvcr90.spec | 6 +- dlls/msvcrt/msvcrt.spec | 6 +- dlls/msvcrt/tests/string.c | 2 +- dlls/msvcrt/wcs.c | 106 ++++++++++++++++++++++++++++++++++++------- 7 files changed, 106 insertions(+), 32 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index ef6d354..c71f7fa 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1520,8 +1520,8 @@ @ stub _wctime32_s @ cdecl _wctime64(ptr) msvcrt._wctime64 @ stub _wctime64_s -@ stub _wctomb_l -@ stub _wctomb_s_l +@ cdecl _wctomb_l(ptr long ptr) msvcrt._wctomb_l +@ cdecl _wctomb_s_l(ptr ptr long long ptr) msvcrt._wctomb_s_l # extern _wctype @ cdecl _wdupenv_s(ptr ptr wstr) msvcrt._wdupenv_s @ extern _wenviron msvcrt._wenviron @@ -1877,7 +1877,7 @@ @ cdecl wcsxfrm(ptr wstr long) msvcrt.wcsxfrm @ cdecl wctob(long) msvcrt.wctob @ cdecl wctomb(ptr long) msvcrt.wctomb -@ stub wctomb_s +@ cdecl wctomb_s(ptr ptr long long) msvcrt.wctomb_s @ cdecl wmemcpy_s(ptr long ptr long) @ cdecl wmemmove_s(ptr long ptr long) @ varargs wprintf(wstr) msvcrt.wprintf diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index dd76878..40dd029 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1883,8 +1883,8 @@ @ stub _wctime32_s @ cdecl _wctime64(ptr) msvcrt._wctime64 @ stub _wctime64_s -@ stub _wctomb_l -@ stub _wctomb_s_l +@ cdecl _wctomb_l(ptr long ptr) msvcrt._wctomb_l +@ cdecl _wctomb_s_l(ptr ptr long long ptr) msvcrt._wctomb_s_l # extern _wctype @ cdecl _wdupenv_s(ptr ptr wstr) msvcrt._wdupenv_s @ extern _wenviron msvcrt._wenviron @@ -2240,7 +2240,7 @@ @ cdecl wcsxfrm(ptr wstr long) msvcrt.wcsxfrm @ cdecl wctob(long) msvcrt.wctob @ cdecl wctomb(ptr long) msvcrt.wctomb -@ stub wctomb_s +@ cdecl wctomb_s(ptr ptr long long) msvcrt.wctomb_s @ cdecl wmemcpy_s(ptr long ptr long) msvcr100.wmemcpy_s @ cdecl wmemmove_s(ptr long ptr long) msvcr100.wmemmove_s @ varargs wprintf(wstr) msvcrt.wprintf diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 87fbc5d..68530bf 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1198,8 +1198,8 @@ @ stub _wctime32_s @ cdecl _wctime64(ptr) msvcrt._wctime64 @ stub _wctime64_s -@ stub _wctomb_l -@ stub _wctomb_s_l +@ cdecl _wctomb_l(ptr long ptr) msvcrt._wctomb_l +@ cdecl _wctomb_s_l(ptr ptr long long ptr) msvcrt._wctomb_s_l # extern _wctype @ cdecl _wdupenv_s(ptr ptr wstr) msvcrt._wdupenv_s @ extern _wenviron msvcrt._wenviron @@ -1556,7 +1556,7 @@ @ cdecl wcsxfrm(ptr wstr long) msvcrt.wcsxfrm @ cdecl wctob(long) msvcrt.wctob @ cdecl wctomb(ptr long) msvcrt.wctomb -@ stub wctomb_s +@ cdecl wctomb_s(ptr ptr long long) msvcrt.wctomb_s @ varargs wprintf(wstr) msvcrt.wprintf @ varargs wprintf_s(wstr) msvcrt.wprintf_s @ varargs wscanf(wstr) msvcrt.wscanf diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9800023..6a1657f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1174,8 +1174,8 @@ @ stub _wctime32_s @ cdecl _wctime64(ptr) msvcrt._wctime64 @ stub _wctime64_s -@ stub _wctomb_l -@ stub _wctomb_s_l +@ cdecl _wctomb_l(ptr long ptr) msvcrt._wctomb_l +@ cdecl _wctomb_s_l(ptr ptr long long ptr) msvcrt._wctomb_s_l # extern _wctype @ cdecl _wdupenv_s(ptr ptr wstr) msvcrt._wdupenv_s @ extern _wenviron msvcrt._wenviron @@ -1529,7 +1529,7 @@ @ cdecl wcsxfrm(ptr wstr long) msvcrt.wcsxfrm @ cdecl wctob(long) msvcrt.wctob @ cdecl wctomb(ptr long) msvcrt.wctomb -@ stub wctomb_s +@ cdecl wctomb_s(ptr ptr long long) msvcrt.wctomb_s @ varargs wprintf(wstr) msvcrt.wprintf @ varargs wprintf_s(wstr) msvcrt.wprintf_s @ varargs wscanf(wstr) msvcrt.wscanf diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e0e6287..6a812a9 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1139,8 +1139,8 @@ # stub _wctime32_s(ptr long ptr) @ cdecl _wctime64(ptr) MSVCRT__wctime64 # stub _wctime64_s(ptr long ptr) -# stub _wctomb_l(ptr long ptr) -# stub _wctomb_s_l(ptr ptr long long ptr) +@ cdecl _wctomb_l(ptr long ptr) MSVCRT__wctomb_l +@ cdecl _wctomb_s_l(ptr ptr long long ptr) MSVCRT__wctomb_s_l # extern _wctype @ extern _wenviron MSVCRT__wenviron @ varargs _wexecl(wstr wstr) @@ -1510,7 +1510,7 @@ @ stub wcsxfrm(ptr wstr long) @ cdecl wctob(long) MSVCRT_wctob @ cdecl wctomb(ptr long) MSVCRT_wctomb -# stub wctomb_s(ptr ptr long long) +@ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s @ varargs wprintf(wstr) MSVCRT_wprintf @ varargs wprintf_s(wstr) MSVCRT_wprintf_s @ varargs wscanf(wstr) MSVCRT_wscanf diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 39934f0..7edaa23 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2356,7 +2356,7 @@ static void test_wctomb(void) ret = p_wcrtomb((char*)dst, 0xffff, NULL); ok(ret == -1, "wcrtomb did not return -1\n"); - ok(dst[0] == 0x3f, "dst[0] = %x, expected 0x20\n", dst[0]); + ok(dst[0] == 0x3f, "dst[0] = %x, expected 0x3f\n", dst[0]); setlocale(LC_ALL, "C"); } diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index c5b630f..dbb12dd 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1146,6 +1146,96 @@ MSVCRT_wchar_t * CDECL MSVCRT_wcstok( MSVCRT_wchar_t *str, const MSVCRT_wchar_t } /********************************************************************* + * _wctomb_s_l (MSVCRT.@) + */ +int CDECL MSVCRT__wctomb_s_l(int *len, char *mbchar, MSVCRT_size_t size, + MSVCRT_wchar_t wch, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadlocinfo locinfo; + BOOL error; + int mblen; + + if(!mbchar && size>0) { + if(len) + *len = 0; + return 0; + } + + if(len) + *len = -1; + + if(!MSVCRT_CHECK_PMT(size <= INT_MAX)) + return MSVCRT_EINVAL; + + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + if(!locinfo->lc_codepage) { + if(wch > 0xff) { + if(mbchar && size>0) + memset(mbchar, 0, size); + *MSVCRT__errno() = MSVCRT_EILSEQ; + return MSVCRT_EILSEQ; + } + + if(!MSVCRT_CHECK_PMT_ERR(size >= 1, MSVCRT_ERANGE)) + return MSVCRT_ERANGE; + + *mbchar = wch; + if(len) + *len = 1; + return 0; + } + + mblen = WideCharToMultiByte(locinfo->lc_codepage, 0, &wch, 1, mbchar, size, NULL, &error); + if(!mblen || error) { + if(!mblen && GetLastError()==ERROR_INSUFFICIENT_BUFFER) { + if(mbchar && size>0) + memset(mbchar, 0, size); + + MSVCRT_INVALID_PMT("insufficient buffer size", MSVCRT_ERANGE); + return MSVCRT_ERANGE; + } + + *MSVCRT__errno() = MSVCRT_EILSEQ; + return MSVCRT_EILSEQ; + } + + if(len) + *len = mblen; + return 0; +} + +/********************************************************************* + * wctomb_s (MSVCRT.@) + */ +int CDECL MSVCRT_wctomb_s(int *len, char *mbchar, MSVCRT_size_t size, MSVCRT_wchar_t wch) +{ + return MSVCRT__wctomb_s_l(len, mbchar, size, wch, NULL); +} + +/********************************************************************* + * _wctomb_l (MSVCRT.@) + */ +int CDECL MSVCRT__wctomb_l(char *dst, MSVCRT_wchar_t ch, MSVCRT__locale_t locale) +{ + int len; + + MSVCRT__wctomb_s_l(&len, dst, dst ? 6 : 0, ch, locale); + return len; +} + +/********************************************************************* + * wctomb (MSVCRT.@) + */ +INT CDECL MSVCRT_wctomb( char *dst, MSVCRT_wchar_t ch ) +{ + return MSVCRT__wctomb_l(dst, ch, NULL); +} + +/********************************************************************* * wctob (MSVCRT.@) */ INT CDECL MSVCRT_wctob( MSVCRT_wint_t wchar ) @@ -1165,22 +1255,6 @@ INT CDECL MSVCRT_wctob( MSVCRT_wint_t wchar ) } /********************************************************************* - * wctomb (MSVCRT.@) - */ -INT CDECL MSVCRT_wctomb( char *dst, MSVCRT_wchar_t ch ) -{ - BOOL error; - INT size; - - size = WideCharToMultiByte(get_locinfo()->lc_codepage, 0, &ch, 1, dst, dst ? 6 : 0, NULL, &error); - if(!size || error) { - *MSVCRT__errno() = MSVCRT_EINVAL; - return MSVCRT_EOF; - } - return size; -} - -/********************************************************************* * wcrtomb (MSVCRT.@) */ MSVCRT_size_t CDECL MSVCRT_wcrtomb( char *dst, MSVCRT_wchar_t ch, MSVCRT_mbstate_t *s)

1 0

Jacek Caban : mshtml: Use proper window in set_moniker when invoked on frame or iframe.
by Alexandre Julliard 27 Jul '13

27 Jul '13

Module: wine Branch: master Commit: 99af1ee34c9350a30c4473e7c6635edc6dd2fbdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=99af1ee34c9350a30c4473e7c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 25 14:15:54 2013 +0200 mshtml: Use proper window in set_moniker when invoked on frame or iframe. --- dlls/mshtml/binding.h | 2 +- dlls/mshtml/navigate.c | 5 ++- dlls/mshtml/persist.c | 62 ++++++++++++++++++++++++++++------------------- 3 files changed, 41 insertions(+), 28 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 63ac1ae..392713b 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -110,7 +110,7 @@ nsresult on_start_uri_open(NSContainer*,nsIURI*,cpp_bool*) DECLSPEC_HIDDEN; HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsChannel*,DWORD,BOOL*) DECLSPEC_HIDDEN; HRESULT create_doc_uri(HTMLOuterWindow*,IUri*,nsWineURI**) DECLSPEC_HIDDEN; HRESULT load_nsuri(HTMLOuterWindow*,nsWineURI*,nsChannelBSC*,DWORD) DECLSPEC_HIDDEN; -HRESULT set_moniker(HTMLDocument*,IMoniker*,IUri*,IBindCtx*,nsChannelBSC*,BOOL) DECLSPEC_HIDDEN; +HRESULT set_moniker(HTMLOuterWindow*,IMoniker*,IUri*,IBindCtx*,nsChannelBSC*,BOOL) DECLSPEC_HIDDEN; void prepare_for_binding(HTMLDocument*,IMoniker*,DWORD) DECLSPEC_HIDDEN; HRESULT super_navigate(HTMLOuterWindow*,IUri*,DWORD,const WCHAR*,BYTE*,DWORD) DECLSPEC_HIDDEN; HRESULT load_uri(HTMLOuterWindow*,IUri*,DWORD) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 5661308..fb639a8 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1132,7 +1132,7 @@ static void on_stop_nsrequest(nsChannelBSC *This, HRESULT result) WARN("OnStopRequest failed: %08x\n", nsres); } - if(This->nschannel->load_group) { + if(This->nschannel && This->nschannel->load_group) { nsres = nsILoadGroup_RemoveRequest(This->nschannel->load_group, (nsIRequest*)&This->nschannel->nsIHttpChannel_iface, NULL, request_result); if(NS_FAILED(nsres)) @@ -1759,6 +1759,7 @@ HRESULT create_channelbsc(IMoniker *mon, const WCHAR *headers, BYTE *post_data, ret->bsc.post_data_len = post_data_size; } + TRACE("created %p\n", ret); *retval = ret; return S_OK; } @@ -1954,7 +1955,7 @@ static void navigate_proc(task_t *_task) navigate_task_t *task = (navigate_task_t*)_task; HRESULT hres; - hres = set_moniker(&task->window->doc_obj->basedoc, task->mon, task->uri, NULL, task->bscallback, TRUE); + hres = set_moniker(task->window, task->mon, task->uri, NULL, task->bscallback, TRUE); if(SUCCEEDED(hres)) { set_current_mon(task->window, task->bscallback->bsc.mon, task->flags); set_current_uri(task->window, task->uri); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 0038942..8f36c75 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -349,15 +349,20 @@ void prepare_for_binding(HTMLDocument *This, IMoniker *mon, DWORD flags) } } -HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IUri *nav_uri, IBindCtx *pibc, nsChannelBSC *async_bsc, BOOL set_download) +HRESULT set_moniker(HTMLOuterWindow *window, IMoniker *mon, IUri *nav_uri, IBindCtx *pibc, nsChannelBSC *async_bsc, + BOOL set_download) { download_proc_task_t *download_task; + HTMLDocumentObj *doc_obj = NULL; nsChannelBSC *bscallback; nsWineURI *nsuri; LPOLESTR url; IUri *uri; HRESULT hres; + if(window->doc_obj && window->doc_obj->basedoc.window == window) + doc_obj = window->doc_obj; + hres = IMoniker_GetDisplayName(mon, pibc, NULL, &url); if(FAILED(hres)) { WARN("GetDiaplayName failed: %08x\n", hres); @@ -376,9 +381,9 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IUri *nav_uri, IBindCtx * TRACE("got url: %s\n", debugstr_w(url)); - set_ready_state(This->window, READYSTATE_LOADING); + set_ready_state(window, READYSTATE_LOADING); - hres = create_doc_uri(This->window, uri, &nsuri); + hres = create_doc_uri(window, uri, &nsuri); if(!nav_uri) IUri_Release(uri); if(SUCCEEDED(hres)) { @@ -389,13 +394,16 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IUri *nav_uri, IBindCtx * } if(SUCCEEDED(hres)) { - remove_target_tasks(This->task_magic); - abort_window_bindings(This->window->base.inner_window); + if(window->base.inner_window->doc) + remove_target_tasks(window->base.inner_window->task_magic); + abort_window_bindings(window->base.inner_window); - hres = load_nsuri(This->window, nsuri, bscallback, LOAD_FLAGS_BYPASS_CACHE); + hres = load_nsuri(window, nsuri, bscallback, LOAD_FLAGS_BYPASS_CACHE); nsISupports_Release((nsISupports*)nsuri); /* FIXME */ - if(SUCCEEDED(hres)) - hres = create_pending_window(This->window, bscallback); + if(SUCCEEDED(hres)) { + hres = create_pending_window(window, bscallback); + TRACE("pending window for %p %p %p\n", window, bscallback, window->pending_window); + } if(bscallback != async_bsc) IBindStatusCallback_Release(&bscallback->bsc.IBindStatusCallback_iface); } @@ -405,25 +413,29 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IUri *nav_uri, IBindCtx * return hres; } - HTMLDocument_LockContainer(This->doc_obj, TRUE); + if(doc_obj) { + HTMLDocument_LockContainer(doc_obj, TRUE); - if(This->doc_obj->frame) { - docobj_task_t *task; + if(doc_obj->frame) { + docobj_task_t *task; - task = heap_alloc(sizeof(docobj_task_t)); - task->doc = This->doc_obj; - hres = push_task(&task->header, set_progress_proc, NULL, This->doc_obj->basedoc.task_magic); - if(FAILED(hres)) { - CoTaskMemFree(url); - return hres; + task = heap_alloc(sizeof(docobj_task_t)); + task->doc = doc_obj; + hres = push_task(&task->header, set_progress_proc, NULL, doc_obj->basedoc.task_magic); + if(FAILED(hres)) { + CoTaskMemFree(url); + return hres; + } } + + download_task = heap_alloc(sizeof(download_proc_task_t)); + download_task->doc = doc_obj; + download_task->set_download = set_download; + download_task->url = url; + return push_task(&download_task->header, set_downloading_proc, set_downloading_task_destr, doc_obj->basedoc.task_magic); } - download_task = heap_alloc(sizeof(download_proc_task_t)); - download_task->doc = This->doc_obj; - download_task->set_download = set_download; - download_task->url = url; - return push_task(&download_task->header, set_downloading_proc, set_downloading_task_destr, This->doc_obj->basedoc.task_magic); + return S_OK; } void set_ready_state(HTMLOuterWindow *window, READYSTATE readystate) @@ -562,7 +574,7 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva prepare_for_binding(This, pimkName, FALSE); call_docview_84(This->doc_obj); - hres = set_moniker(This, pimkName, NULL, pibc, NULL, TRUE); + hres = set_moniker(This->window, pimkName, NULL, pibc, NULL, TRUE); if(FAILED(hres)) return hres; @@ -831,7 +843,7 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM } prepare_for_binding(This, mon, FALSE); - hres = set_moniker(This, mon, NULL, NULL, NULL, TRUE); + hres = set_moniker(This->window, mon, NULL, NULL, NULL, TRUE); IMoniker_Release(mon); if(FAILED(hres)) return hres; @@ -888,7 +900,7 @@ static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) } prepare_for_binding(This, mon, FALSE); - hres = set_moniker(This, mon, NULL, NULL, NULL, FALSE); + hres = set_moniker(This->window, mon, NULL, NULL, NULL, FALSE); IMoniker_Release(mon); if(FAILED(hres)) return hres;

1 0

Vincent Povirk : atl: Do not access m_pTermFuncs if the structure is too small.
by Alexandre Julliard 27 Jul '13

27 Jul '13

Module: wine Branch: master Commit: d9211c9e5f92a9127308a6c306d4a9af38ae89d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9211c9e5f92a9127308a6c30… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 25 15:13:24 2013 -0500 atl: Do not access m_pTermFuncs if the structure is too small. --- dlls/atl/atl_main.c | 30 +++++++++++++++++++----------- dlls/atl/tests/module.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 11 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index cc3cce1..985d706 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -123,15 +123,20 @@ HRESULT WINAPI AtlModuleLoadTypeLib(_ATL_MODULEW *pM, LPCOLESTR lpszIndex, HRESULT WINAPI AtlModuleTerm(_ATL_MODULE *pM) { - _ATL_TERMFUNC_ELEM *iter = pM->m_pTermFuncs, *tmp; + _ATL_TERMFUNC_ELEM *iter, *tmp; TRACE("(%p)\n", pM); - while(iter) { - iter->pFunc(iter->dw); - tmp = iter; - iter = iter->pNext; - HeapFree(GetProcessHeap(), 0, tmp); + if (pM->cbSize > ATLVer1Size) + { + iter = pM->m_pTermFuncs; + + while(iter) { + iter->pFunc(iter->dw); + tmp = iter; + iter = iter->pNext; + HeapFree(GetProcessHeap(), 0, tmp); + } } return S_OK; @@ -143,12 +148,15 @@ HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULEW *pM, _ATL_TERMFUNC *pFunc, DWOR TRACE("(%p %p %ld)\n", pM, pFunc, dw); - termfunc_elem = HeapAlloc(GetProcessHeap(), 0, sizeof(_ATL_TERMFUNC_ELEM)); - termfunc_elem->pFunc = pFunc; - termfunc_elem->dw = dw; - termfunc_elem->pNext = pM->m_pTermFuncs; + if (pM->cbSize > ATLVer1Size) + { + termfunc_elem = HeapAlloc(GetProcessHeap(), 0, sizeof(_ATL_TERMFUNC_ELEM)); + termfunc_elem->pFunc = pFunc; + termfunc_elem->dw = dw; + termfunc_elem->pNext = pM->m_pTermFuncs; - pM->m_pTermFuncs = termfunc_elem; + pM->m_pTermFuncs = termfunc_elem; + } return S_OK; } diff --git a/dlls/atl/tests/module.c b/dlls/atl/tests/module.c index 45cff06..192b23e 100644 --- a/dlls/atl/tests/module.c +++ b/dlls/atl/tests/module.c @@ -113,8 +113,48 @@ static void test_winmodule(void) ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); } +static DWORD cb_val; + +static void WINAPI term_callback(DWORD dw) +{ + cb_val = dw; +} + +static void test_term(void) +{ + _ATL_MODULEW test; + HRESULT hres; + + test.cbSize = sizeof(_ATL_MODULEW); + + hres = AtlModuleInit(&test, NULL, NULL); + ok (hres == S_OK, "AtlModuleInit failed (0x%x).\n", (int)hres); + + hres = AtlModuleAddTermFunc(&test, term_callback, 0x22); + ok (hres == S_OK, "AtlModuleAddTermFunc failed (0x%x).\n", (int)hres); + + cb_val = 0xdeadbeef; + hres = AtlModuleTerm(&test); + ok (hres == S_OK, "AtlModuleTerm failed (0x%x).\n", (int)hres); + ok (cb_val == 0x22, "wrong callback value (0x%x).\n", (int)cb_val); + + test.cbSize = FIELD_OFFSET(_ATL_MODULEW, dwAtlBuildVer); + + hres = AtlModuleInit(&test, NULL, NULL); + ok (hres == S_OK, "AtlModuleInit failed (0x%x).\n", (int)hres); + + hres = AtlModuleAddTermFunc(&test, term_callback, 0x23); + ok (hres == S_OK, "AtlModuleAddTermFunc failed (0x%x).\n", (int)hres); + + cb_val = 0xdeadbeef; + hres = AtlModuleTerm(&test); + ok (hres == S_OK, "AtlModuleTerm failed (0x%x).\n", (int)hres); + ok (cb_val == 0xdeadbeef, "wrong callback value (0x%x).\n", (int)cb_val); +} + START_TEST(module) { test_StructSize(); test_winmodule(); + test_term(); }

1 0

Nikolay Sivov : msxml3: Store namespace info for created attribute, fix returned properties.
by Alexandre Julliard 27 Jul '13

27 Jul '13

Module: wine Branch: master Commit: 88e94c7ef8c2ea8a48d14397520724c1d897febc URL: http://source.winehq.org/git/wine.git/?a=commit;h=88e94c7ef8c2ea8a48d143975… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 26 08:44:57 2013 +0400 msxml3: Store namespace info for created attribute, fix returned properties. --- dlls/msxml3/attribute.c | 45 ++++++++++++++++++++- dlls/msxml3/domdoc.c | 23 +++++++++-- dlls/msxml3/tests/domdoc.c | 94 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 156 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 70dee2a..bb0655c 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -43,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 +static const xmlChar xmlns[] = "xmlns"; + typedef struct _domattr { xmlnode node; @@ -542,8 +544,29 @@ static HRESULT WINAPI domattr_get_namespaceURI( BSTR* p) { domattr *This = impl_from_IXMLDOMAttribute( iface ); + xmlNsPtr ns = This->node.node->ns; + TRACE("(%p)->(%p)\n", This, p); - return node_get_namespaceURI(&This->node, p); + + if (!p) + return E_INVALIDARG; + + *p = NULL; + + if (ns) + { + /* special case for default namespace definition */ + if (xmlStrEqual(This->node.node->name, xmlns)) + *p = bstr_from_xmlChar(xmlns); + else if (xmlStrEqual(ns->prefix, xmlns)) + *p = SysAllocStringLen(NULL, 0); + else if (ns->href) + *p = bstr_from_xmlChar(ns->href); + } + + TRACE("uri: %s\n", debugstr_w(*p)); + + return *p ? S_OK : S_FALSE; } static HRESULT WINAPI domattr_get_prefix( @@ -551,8 +574,26 @@ static HRESULT WINAPI domattr_get_prefix( BSTR* prefix) { domattr *This = impl_from_IXMLDOMAttribute( iface ); + xmlNsPtr ns = This->node.node->ns; + TRACE("(%p)->(%p)\n", This, prefix); - return node_get_prefix( &This->node, prefix ); + + if (!prefix) return E_INVALIDARG; + + *prefix = NULL; + + if (ns) + { + /* special case for default namespace definition */ + if (xmlStrEqual(This->node.node->name, xmlns)) + *prefix = bstr_from_xmlChar(xmlns); + else if (ns->prefix) + *prefix = bstr_from_xmlChar(ns->prefix); + } + + TRACE("prefix: %s\n", debugstr_w(*prefix)); + + return *prefix ? S_OK : S_FALSE; } static HRESULT WINAPI domattr_get_baseName( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 7eae2d4..a96b5c7 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1934,9 +1934,6 @@ static HRESULT WINAPI domdoc_createNode( hr = get_node_type(Type, &node_type); if(FAILED(hr)) return hr; - if(namespaceURI && namespaceURI[0] && node_type != NODE_ELEMENT) - FIXME("nodes with namespaces currently not supported.\n"); - TRACE("node_type %d\n", node_type); /* exit earlier for types that need name */ @@ -1979,8 +1976,26 @@ static HRESULT WINAPI domdoc_createNode( break; } case NODE_ATTRIBUTE: - xmlnode = (xmlNodePtr)xmlNewDocProp(get_doc(This), xml_name, NULL); + { + xmlChar *local, *prefix; + + local = xmlSplitQName2(xml_name, &prefix); + + xmlnode = (xmlNodePtr)xmlNewDocProp(get_doc(This), local ? local : xml_name, NULL); + + if (local || (href && *href)) + { + /* we need a floating namespace here, it can't be created linked to attribute from + a start */ + xmlNsPtr ns = xmlNewNs(NULL, href, prefix); + xmlSetNs(xmlnode, ns); + } + + xmlFree(local); + xmlFree(prefix); + break; + } case NODE_TEXT: xmlnode = (xmlNodePtr)xmlNewDocText(get_doc(This), NULL); break; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 5f1b5c3..a32eda8 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -11590,6 +11590,99 @@ static void test_xsltext(void) free_bstrs(); } +struct attrtest_t { + const char *name; + const char *uri; + const char *prefix; + const char *href; +}; + +static struct attrtest_t attrtests[] = { + { "xmlns", "http://www.w3.org/2000/xmlns/", "xmlns", "xmlns" }, + { "xmlns", "nondefaulturi", "xmlns", "xmlns" }, + { "c", "http://www.w3.org/2000/xmlns/", NULL, "http://www.w3.org/2000/xmlns/" }, + { "c", "nsref1", NULL, "nsref1" }, + { "ns:c", "nsref1", "ns", "nsref1" }, + { "xmlns:c", "http://www.w3.org/2000/xmlns/", "xmlns", "" }, + { "xmlns:c", "nondefaulturi", "xmlns", "" }, + { 0 } +}; + +static void test_create_attribute(void) +{ + struct attrtest_t *ptr = attrtests; + IXMLDOMElement *el; + IXMLDOMDocument *doc; + IXMLDOMNode *node, *node2; + VARIANT var; + HRESULT hr; + int i = 0; + BSTR str; + + doc = create_document(&IID_IXMLDOMDocument); + + while (ptr->name) + { + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_ATTRIBUTE; + hr = IXMLDOMDocument_createNode(doc, var, _bstr_(ptr->name), _bstr_(ptr->uri), &node); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = NULL; + hr = IXMLDOMNode_get_prefix(node, &str); + if (ptr->prefix) + { + ok(hr == S_OK, "%d: got 0x%08x\n", i, hr); + ok(!lstrcmpW(str, _bstr_(ptr->prefix)), "%d: got prefix %s, expected %s\n", i, wine_dbgstr_w(str), ptr->prefix); + } + else + { + ok(hr == S_FALSE, "%d: got 0x%08x\n", i, hr); + ok(str == NULL, "%d: got prefix %s\n", i, wine_dbgstr_w(str)); + } + + str = NULL; + hr = IXMLDOMNode_get_namespaceURI(node, &str); + ok(hr == S_OK, "%d: got 0x%08x\n", i, hr); + ok(!lstrcmpW(str, _bstr_(ptr->href)), "%d: got uri %s, expected %s\n", i, wine_dbgstr_w(str), ptr->href); + SysFreeString(str); + + IXMLDOMNode_Release(node); + free_bstrs(); + + i++; + ptr++; + } + + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_ELEMENT; + hr = IXMLDOMDocument_createNode(doc, var, _bstr_("e"), NULL, &node2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMNode_QueryInterface(node2, &IID_IXMLDOMElement, (void**)&el); + ok(hr == S_OK, "got 0x%08x\n", hr); + IXMLDOMNode_Release(node2); + + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_ATTRIBUTE; + hr = IXMLDOMDocument_createNode(doc, var, _bstr_("xmlns:a"), _bstr_("http://www.w3.org/2000/xmlns/"), &node); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMElement_setAttributeNode(el, (IXMLDOMAttribute*)node, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* for some reason default namespace uri is not reported */ + hr = IXMLDOMNode_get_namespaceURI(node, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, _bstr_("")), "got uri %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IXMLDOMNode_Release(node); + IXMLDOMElement_Release(el); + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -11644,6 +11737,7 @@ START_TEST(domdoc) test_setAttributeNode(); test_put_dataType(); test_createNode(); + test_create_attribute(); test_get_prefix(); test_default_properties(); test_selectSingleNode();

1 0

Piotr Caban : oleaut32: Fix custdata_list initialization in ITypeInfo_fnGetRefTypeInfo.
by Alexandre Julliard 27 Jul '13

27 Jul '13

Module: wine Branch: master Commit: 4f62fb2eec7130d7af1d1df35316e04814adc130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f62fb2eec7130d7af1d1df35… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 26 14:10:36 2013 +0200 oleaut32: Fix custdata_list initialization in ITypeInfo_fnGetRefTypeInfo. --- dlls/oleaut32/typelib.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 2bd9437..996886e 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1184,6 +1184,7 @@ typedef struct tagITypeInfoImpl /* Implemented Interfaces */ TLBImplType *impltypes; + struct list *pcustdata_list; struct list custdata_list; } ITypeInfoImpl; @@ -2599,7 +2600,7 @@ static ITypeInfoImpl * MSFT_DoTypeInfo( break; } } - MSFT_CustData(pcx, tiBase.oCustData, &ptiRet->custdata_list); + MSFT_CustData(pcx, tiBase.oCustData, ptiRet->pcustdata_list); TRACE_(typelib)("%s guid: %s kind:%s\n", debugstr_w(TLB_get_bstr(ptiRet->Name)), @@ -5367,7 +5368,8 @@ static ITypeInfoImpl* ITypeInfoImpl_Constructor(void) pTypeInfoImpl->hreftype = -1; pTypeInfoImpl->memidConstructor = MEMBERID_NIL; pTypeInfoImpl->memidDestructor = MEMBERID_NIL; - list_init(&pTypeInfoImpl->custdata_list); + pTypeInfoImpl->pcustdata_list = &pTypeInfoImpl->custdata_list; + list_init(pTypeInfoImpl->pcustdata_list); } TRACE("(%p)\n", pTypeInfoImpl); return pTypeInfoImpl; @@ -7389,6 +7391,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( *pTypeInfoImpl = *This; pTypeInfoImpl->ref = 0; + list_init(&pTypeInfoImpl->custdata_list); if (This->typekind == TKIND_INTERFACE) pTypeInfoImpl->typekind = TKIND_DISPATCH; @@ -7785,7 +7788,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetCustData( if(!guid || !pVarVal) return E_INVALIDARG; - pCData = TLB_get_custdata_by_guid(&This->custdata_list, guid); + pCData = TLB_get_custdata_by_guid(This->pcustdata_list, guid); VariantInit( pVarVal); if (pCData) @@ -7991,7 +7994,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllCustData( TRACE("%p %p\n", This, pCustData); - return TLB_copy_all_custdata(&This->custdata_list, pCustData); + return TLB_copy_all_custdata(This->pcustdata_list, pCustData); } /* ITypeInfo2::GetAllFuncCustData @@ -9416,7 +9419,7 @@ static DWORD WMSFT_compile_typeinfo(ITypeInfoImpl *info, INT16 index, WMSFT_TLBF base->docstringoffs = -1; base->helpstringcontext = info->dwHelpStringContext; base->helpcontext = info->dwHelpContext; - base->oCustData = WMSFT_compile_custdata(&info->custdata_list, file); + base->oCustData = WMSFT_compile_custdata(info->pcustdata_list, file); base->cImplTypes = info->cImplTypes; base->cbSizeVft = info->cbSizeVft; base->size = info->cbSizeInstance; @@ -10756,7 +10759,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetCustData(ICreateTypeInfo2 *iface, tlbguid = TLB_append_guid(&This->pTypeLib->guid_list, guid); - return TLB_set_custdata(&This->custdata_list, tlbguid, varVal); + return TLB_set_custdata(This->pcustdata_list, tlbguid, varVal); } static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncCustData(ICreateTypeInfo2 *iface,

1 0