November 2010 - Wine-Commits

Henri Verbeet : wined3d: buffer_get_sysmem() potentially invalidates the current element array buffer binding.
by Alexandre Julliard Nov. 16, 2010

Nov. 16, 2010

Module: wine Branch: master Commit: fadd192cba73af4e1617d8f9c85091df3334bd0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fadd192cba73af4e1617d8f9c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 16 12:09:29 2010 +0100 wined3d: buffer_get_sysmem() potentially invalidates the current element array buffer binding. This fixes a regression introduced by commit 2a7a2371709233bc87071bbab43e87955cb122ca. --- dlls/wined3d/buffer.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2306d1f..7400fd8 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -678,6 +678,12 @@ BYTE *buffer_get_sysmem(struct wined3d_buffer *This, const struct wined3d_gl_inf This->resource.heapMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->resource.size + RESOURCE_ALIGNMENT); This->resource.allocatedMemory = (BYTE *)(((ULONG_PTR)This->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); + + if (This->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) + { + IWineD3DDeviceImpl_MarkStateDirty(This->resource.device, STATE_INDEXBUFFER); + } + ENTER_GL(); GL_EXTCALL(glBindBufferARB(This->buffer_type_hint, This->buffer_object)); GL_EXTCALL(glGetBufferSubDataARB(This->buffer_type_hint, 0, This->resource.size, This->resource.allocatedMemory));

1 0

Piotr Caban : shell32: Added SHPropStg* stubs.
by Alexandre Julliard Nov. 16, 2010

Nov. 16, 2010

Module: wine Branch: master Commit: 14b13f77afac82e6a6e5da99f1ba267c38e13944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14b13f77afac82e6a6e5da99f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 16 14:57:52 2010 +0100 shell32: Added SHPropStg* stubs. --- dlls/shell32/shell32.spec | 4 ++++ dlls/shell32/shellole.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index d4f526f..b5debf1 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -253,6 +253,10 @@ 660 stdcall -noname FileIconInit(long) 680 stdcall IsUserAnAdmin() + 685 stdcall SHPropStgCreate(ptr ptr ptr long long long ptr ptr) + 688 stdcall SHPropStgReadMultiple(ptr long long ptr ptr) + 689 stdcall SHPropStgWriteMultiple(ptr ptr long ptr ptr long) + 704 stdcall -noname GUIDFromStringW(wstr ptr) 714 stdcall @(ptr) SHELL32_714 # PathIsTemporaryW diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 6d284b5..1161ff4 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -657,3 +657,34 @@ end: GlobalUnlock(hDrop); return i; } + +/************************************************************************* + * SHPropStgCreate [SHELL32.685] + */ +HRESULT WINAPI SHPropStgCreate(IPropertySetStorage *psstg, REFFMTID fmtid, + const CLSID *pclsid, DWORD grfFlags, DWORD grfMode, + DWORD dwDisposition, IPropertyStorage **ppstg, UINT *puCodePage) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +/************************************************************************* + * SHPropStgReadMultiple [SHELL32.688] + */ +HRESULT WINAPI SHPropStgReadMultiple(IPropertyStorage *pps, UINT uCodePage, + ULONG cpspec, const PROPSPEC *rgpspec, PROPVARIANT *rgvar) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +/************************************************************************* + * SHPropStgWriteMultiple [SHELL32.689] + */ +HRESULT WINAPI SHPropStgWriteMultiple(IPropertyStorage *pps, UINT *uCodePage, + ULONG cpspec, const PROPSPEC *rgpspec, PROPVARIANT *rgvar, PROPID propidNameFirst) +{ + FIXME("stub\n"); + return E_NOTIMPL; +}

1 0

Jacek Caban : ole32: Skip more tests on win9x.
by Alexandre Julliard Nov. 16, 2010

Nov. 16, 2010

Module: wine Branch: master Commit: 0c6f2a6d2ab2c66138429a6665b814437f889562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c6f2a6d2ab2c66138429a666… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 16 13:39:11 2010 +0100 ole32: Skip more tests on win9x. --- dlls/ole32/tests/marshal.c | 22 ++++++++-------------- dlls/ole32/tests/moniker.c | 5 +++++ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index ef101ae..3d0ab16 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1437,14 +1437,8 @@ static DWORD CALLBACK bad_thread_proc(LPVOID p) /* Win9x returns E_NOINTERFACE, whilst NT returns RPC_E_WRONG_THREAD */ trace("call to proxy's QueryInterface from wrong apartment returned 0x%08x\n", hr); - /* this statement causes Win9x DCOM to crash during CoUninitialize of - * other apartment, so don't test this on Win9x (signified by NT-only - * export of CoRegisterSurrogateEx) */ - if (GetProcAddress(GetModuleHandle("ole32"), "CoRegisterSurrogateEx")) - /* now be really bad and release the proxy from the wrong apartment */ - IUnknown_Release(cf); - else - skip("skipping test for releasing proxy from wrong apartment that will succeed, but cause a crash during CoUninitialize\n"); + /* now be really bad and release the proxy from the wrong apartment */ + IUnknown_Release(cf); CoUninitialize(); @@ -3060,7 +3054,12 @@ START_TEST(marshal) int argc; char **argv; - if (!(pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"))) goto no_test; + if (!GetProcAddress(hOle32, "CoRegisterSurrogateEx")) { + win_skip("skipping test on win9x\n"); + return; + } + + pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"); argc = winetest_get_mainargs( &argv ); if (argc > 2 && (!strcmp(argv[2], "-Embedding"))) @@ -3127,9 +3126,4 @@ START_TEST(marshal) test_channel_hook(); CoUninitialize(); - return; - -no_test: - trace("You need DCOM95 installed to run this test\n"); - return; } diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 876d034..33edde1 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1998,6 +1998,11 @@ static void test_save_load_filemoniker(void) START_TEST(moniker) { + if (!GetProcAddress(GetModuleHandleA("ole32.dll"), "CoRegisterSurrogateEx")) { + win_skip("skipping test on win9x\n"); + return; + } + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); test_ROT();

1 0

Borut Razem : msvcrt: popen: stderr from the child process should not be redirected to the parent' s stdin.
by Alexandre Julliard Nov. 16, 2010

Nov. 16, 2010

Module: wine Branch: master Commit: 828fd598b0a9eb94924a0902342fb26c6b2d51c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=828fd598b0a9eb94924a09023… Author: Borut Razem <borut.razem(a)siol.net> Date: Mon Nov 15 22:50:23 2010 +0100 msvcrt: popen: stderr from the child process should not be redirected to the parent's stdin. --- dlls/msvcrt/process.c | 15 +-------------- 1 files changed, 1 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index b4c39c1..3e2e15e 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -1031,7 +1031,7 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc { MSVCRT_FILE *ret; BOOL readPipe = TRUE; - int textmode, fds[2], fdToDup, fdToOpen, fdStdHandle = -1, fdStdErr = -1; + int textmode, fds[2], fdToDup, fdToOpen, fdStdHandle = -1; const MSVCRT_wchar_t *p; MSVCRT_wchar_t *comspec, *fullcmd; unsigned int len; @@ -1073,13 +1073,6 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc goto error; if (MSVCRT__dup2(fds[fdToDup], fdToDup) != 0) goto error; - if (readPipe) - { - if ((fdStdErr = MSVCRT__dup(MSVCRT_STDERR_FILENO)) == -1) - goto error; - if (MSVCRT__dup2(fds[fdToDup], MSVCRT_STDERR_FILENO) != 0) - goto error; - } MSVCRT__close(fds[fdToDup]); @@ -1106,16 +1099,10 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc HeapFree(GetProcessHeap(), 0, fullcmd); MSVCRT__dup2(fdStdHandle, fdToDup); MSVCRT__close(fdStdHandle); - if (readPipe) - { - MSVCRT__dup2(fdStdErr, MSVCRT_STDERR_FILENO); - MSVCRT__close(fdStdErr); - } return ret; error: if (fdStdHandle != -1) MSVCRT__close(fdStdHandle); - if (fdStdErr != -1) MSVCRT__close(fdStdErr); MSVCRT__close(fds[0]); MSVCRT__close(fds[1]); return NULL;

1 0

Eric Pouech : msvcrt: Use the macros for parameter checking for wcsncat_s ( and fix the test).
by Alexandre Julliard Nov. 16, 2010

Nov. 16, 2010

Module: wine Branch: master Commit: d38196a0ffe8fcaf74e73838ea3b3544735ec835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d38196a0ffe8fcaf74e73838e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Nov 15 22:00:10 2010 +0100 msvcrt: Use the macros for parameter checking for wcsncat_s (and fix the test). --- dlls/msvcr90/tests/msvcr90.c | 59 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/tests/string.c | 8 +++++ dlls/msvcrt/wcs.c | 13 ++++++--- 3 files changed, 76 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 6b0363f..1a94182 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -64,6 +64,7 @@ static char** (__cdecl *p__sys_errlist)(void); static __int64 (__cdecl *p_strtoi64)(const char *, char **, int); static unsigned __int64 (__cdecl *p_strtoui64)(const char *, char **, int); static errno_t (__cdecl *p_itoa_s)(int,char*,size_t,int); +static int (__cdecl *p_wcsncat_s)(wchar_t *dst, size_t elem, const wchar_t *src, size_t count); static void* (WINAPI *pEncodePointer)(void *); @@ -384,6 +385,62 @@ static void test__itoa_s(void) buffer); } +static void test_wcsncat_s(void) +{ + static wchar_t abcW[] = {'a','b','c',0}; + int ret; + wchar_t dst[4]; + wchar_t src[4]; + + if (!p_wcsncat_s) + { + win_skip("skipping wcsncat_s tests\n"); + return; + } + + if(!p_set_invalid_parameter_handler) { + win_skip("_set_invalid_parameter_handler not found\n"); + return; + } + + memcpy(src, abcW, sizeof(abcW)); + dst[0] = 0; + SET_EXPECT(invalid_parameter_handler); + ret = p_wcsncat_s(NULL, 4, src, 4); + ok(ret == EINVAL, "err = %d\n", ret); + CHECK_CALLED(invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); + ret = p_wcsncat_s(dst, 0, src, 4); + ok(ret == EINVAL, "err = %d\n", ret); + CHECK_CALLED(invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); + ret = p_wcsncat_s(dst, 0, src, _TRUNCATE); + ok(ret == EINVAL, "err = %d\n", ret); + CHECK_CALLED(invalid_parameter_handler); + + ret = p_wcsncat_s(dst, 4, NULL, 0); + ok(ret == 0, "err = %d\n", ret); + + dst[0] = 0; + SET_EXPECT(invalid_parameter_handler); + ret = p_wcsncat_s(dst, 2, src, 4); + ok(ret == ERANGE, "err = %d\n", ret); + CHECK_CALLED(invalid_parameter_handler); + + dst[0] = 0; + ret = p_wcsncat_s(dst, 2, src, _TRUNCATE); + ok(ret == STRUNCATE, "err = %d\n", ret); + ok(dst[0] == 'a' && dst[1] == 0, "dst is %s\n", wine_dbgstr_w(dst)); + + memcpy(dst, abcW, sizeof(abcW)); + dst[3] = 'd'; + SET_EXPECT(invalid_parameter_handler); + ret = p_wcsncat_s(dst, 4, src, 4); + ok(ret == EINVAL, "err = %d\n", ret); + CHECK_CALLED(invalid_parameter_handler); +} /* ########## */ @@ -415,6 +472,7 @@ START_TEST(msvcr90) p_strtoi64 = (void *) GetProcAddress(hcrt, "_strtoi64"); p_strtoui64 = (void *) GetProcAddress(hcrt, "_strtoui64"); p_itoa_s = (void *)GetProcAddress(hcrt, "_itoa_s"); + p_wcsncat_s = (void *)GetProcAddress( hcrt,"wcsncat_s" ); hkernel32 = GetModuleHandleA("kernel32.dll"); pEncodePointer = (void *) GetProcAddress(hkernel32, "EncodePointer"); @@ -424,4 +482,5 @@ START_TEST(msvcr90) test_error_messages(); test__strtoi64(); test__itoa_s(); + test_wcsncat_s(); } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index aa57b31..2a5d4fc 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1459,6 +1459,10 @@ static void test_wcsncat_s(void) return; } + if (p_set_invalid_parameter_handler) + ok(p_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, + "Invalid parameter handler was already set\n"); + memcpy(src, abcW, sizeof(abcW)); dst[0] = 0; ret = p_wcsncat_s(NULL, 4, src, 4); @@ -1483,6 +1487,10 @@ static void test_wcsncat_s(void) dst[3] = 'd'; ret = p_wcsncat_s(dst, 4, src, 4); ok(ret == EINVAL, "err = %d\n", ret); + + if (p_set_invalid_parameter_handler) + ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, + "Cannot reset invalid parameter handler\n"); } static void test__mbsnbcat_s(void) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 922e9d3..484679f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1634,11 +1634,12 @@ INT CDECL MSVCRT_wcsncat_s(MSVCRT_wchar_t *dst, MSVCRT_size_t elem, MSVCRT_wchar_t dststart; INT ret = 0; - if (src == NULL && count > 0) - return MSVCRT_EINVAL; - if (dst == NULL) + if (!MSVCRT_CHECK_PMT(dst != NULL) || !MSVCRT_CHECK_PMT(elem > 0)) + { + *MSVCRT__errno() = MSVCRT_EINVAL; return MSVCRT_EINVAL; - if (elem == 0) + } + if (!MSVCRT_CHECK_PMT(src != NULL || count == 0)) return MSVCRT_EINVAL; if (count == 0) return 0; @@ -1649,7 +1650,10 @@ INT CDECL MSVCRT_wcsncat_s(MSVCRT_wchar_t *dst, MSVCRT_size_t elem, break; } if (dststart == elem) + { + MSVCRT_INVALID_PMT("dst[elem] is not NULL terminated\n"); return MSVCRT_EINVAL; + } if (count == MSVCRT__TRUNCATE) { @@ -1668,6 +1672,7 @@ INT CDECL MSVCRT_wcsncat_s(MSVCRT_wchar_t *dst, MSVCRT_size_t elem, dst[srclen] = '\0'; return ret; } + MSVCRT_INVALID_PMT("dst[elem] is too small"); dst[0] = '\0'; return MSVCRT_ERANGE; }

1 0

Piotr Caban : shell32: Added SHPropStgCreate implementation.
by Alexandre Julliard Nov. 16, 2010

Nov. 16, 2010

Module: wine Branch: master Commit: bfaae9bf7da649033d2ff948910d9130c92faf5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfaae9bf7da649033d2ff9489… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 16 14:58:03 2010 +0100 shell32: Added SHPropStgCreate implementation. --- dlls/shell32/shellole.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 1161ff4..0949647 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -26,6 +26,7 @@ #include <string.h> #define COBJMACROS +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" @@ -665,8 +666,47 @@ HRESULT WINAPI SHPropStgCreate(IPropertySetStorage *psstg, REFFMTID fmtid, const CLSID *pclsid, DWORD grfFlags, DWORD grfMode, DWORD dwDisposition, IPropertyStorage **ppstg, UINT *puCodePage) { - FIXME("stub\n"); - return E_NOTIMPL; + PROPSPEC prop; + PROPVARIANT ret; + HRESULT hres; + + TRACE("%p %s %s %x %x %x %p %p\n", psstg, debugstr_guid(fmtid), debugstr_guid(pclsid), + grfFlags, grfMode, dwDisposition, ppstg, puCodePage); + + hres = IPropertySetStorage_Open(psstg, fmtid, grfMode, ppstg); + + switch(dwDisposition) { + case CREATE_ALWAYS: + if(SUCCEEDED(hres)) { + IPropertyStorage_Release(*ppstg); + hres = IPropertySetStorage_Delete(psstg, fmtid); + if(FAILED(hres)) + return hres; + hres = E_FAIL; + } + + case OPEN_ALWAYS: + case CREATE_NEW: + if(FAILED(hres)) + hres = IPropertySetStorage_Create(psstg, fmtid, pclsid, + grfFlags, grfMode, ppstg); + + case OPEN_EXISTING: + if(FAILED(hres)) + return hres; + + if(puCodePage) { + prop.ulKind = PRSPEC_PROPID; + prop.u.propid = PID_CODEPAGE; + hres = IPropertyStorage_ReadMultiple(*ppstg, 1, &prop, &ret); + if(FAILED(hres) || ret.vt!=VT_I2) + *puCodePage = 0; + else + *puCodePage = ret.u.iVal; + } + } + + return S_OK; } /*************************************************************************

1 0

Henri Verbeet : d3d8: Fix some return values.
by Alexandre Julliard Nov. 16, 2010

Nov. 16, 2010

Module: wine Branch: master Commit: f024e2372f091f1d1a071d6dcac7f30042d864ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=f024e2372f091f1d1a071d6dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 16 12:09:31 2010 +0100 d3d8: Fix some return values. --- dlls/d3d8/device.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 7700dfb..67edb06 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -464,9 +464,10 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetCursorProperties(LPDIRECT3DDEVICE8 TRACE("iface %p, hotspot_x %u, hotspot_y %u, bitmap %p.\n", iface, XHotSpot, YHotSpot, pCursorBitmap); - if(!pCursorBitmap) { - WARN("No cursor bitmap, returning WINED3DERR_INVALIDCALL\n"); - return WINED3DERR_INVALIDCALL; + if (!pCursorBitmap) + { + WARN("No cursor bitmap, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; } wined3d_mutex_lock(); @@ -903,11 +904,15 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(LPDIRECT3DDEVICE8 iface, ID destFormat = winedesc.format; /* Check that the source and destination formats match */ - if (srcFormat != destFormat && WINED3DFMT_UNKNOWN != destFormat) { - WARN("(%p) source %p format must match the dest %p format, returning WINED3DERR_INVALIDCALL\n", iface, pSourceSurface, pDestinationSurface); + if (srcFormat != destFormat && WINED3DFMT_UNKNOWN != destFormat) + { + WARN("Source %p format must match the dest %p format, returning D3DERR_INVALIDCALL.\n", + pSourceSurface, pDestinationSurface); wined3d_mutex_unlock(); - return WINED3DERR_INVALIDCALL; - } else if (WINED3DFMT_UNKNOWN == destFormat) { + return D3DERR_INVALIDCALL; + } + else if (WINED3DFMT_UNKNOWN == destFormat) + { TRACE("(%p) : Converting destination surface from WINED3DFMT_UNKNOWN to the source format\n", iface); IWineD3DSurface_SetFormat(Dest->wineD3DSurface, srcFormat); }

1 0

Eric Pouech : wineconsole: Properly handle (user) -window resizing wrt the console.
by Alexandre Julliard Nov. 16, 2010

Nov. 16, 2010

Module: wine Branch: master Commit: 70f24d6cc1398fbd3f00aa412627cc3574891e7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=70f24d6cc1398fbd3f00aa412… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Nov 15 21:36:02 2010 +0100 wineconsole: Properly handle (user)-window resizing wrt the console. --- programs/wineconsole/user.c | 5 +++++ programs/wineconsole/winecon_private.h | 2 ++ programs/wineconsole/wineconsole.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 0 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 86106c5..dc60ffd 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -778,6 +778,7 @@ static void WCUSER_Paint(const struct inner_data* data) { PAINTSTRUCT ps; + if (data->in_set_config) return; /* in order to avoid some flicker */ BeginPaint(data->hWnd, &ps); BitBlt(ps.hdc, 0, 0, data->curcfg.win_width * data->curcfg.cell_width, @@ -1329,6 +1330,10 @@ static LRESULT CALLBACK WCUSER_Proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM if (!HIWORD(lParam)) return DefWindowProcW(hWnd, uMsg, wParam, lParam); WCUSER_SetMenuDetails(data, GetSystemMenu(data->hWnd, FALSE)); break; + case WM_SIZE: + WINECON_ResizeWithContainer(data, LOWORD(lParam) / data->curcfg.cell_width, + HIWORD(lParam) / data->curcfg.cell_height); + break; default: return DefWindowProcW(hWnd, uMsg, wParam, lParam); } diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h index a9a462a..8f08ff4 100644 --- a/programs/wineconsole/winecon_private.h +++ b/programs/wineconsole/winecon_private.h @@ -60,6 +60,7 @@ struct inner_data { HANDLE hSynchro; /* waitable handle signalled by server when something in server has been modified */ HWND hWnd; /* handle of 'user' window or NULL for 'curses' */ INT nCmdShow; /* argument of WinMain */ + BOOL in_set_config; /* to handle re-entrant calls to WINECON_SetConfig */ int (*fnMainLoop)(struct inner_data* data); void (*fnPosCursor)(const struct inner_data* data); @@ -77,6 +78,7 @@ struct inner_data { /* from wineconsole.c */ extern void WINECON_Fatal(const char* msg); +extern void WINECON_ResizeWithContainer(struct inner_data* data, int width, int height); extern int WINECON_GetHistorySize(HANDLE hConIn); extern int WINECON_GetHistoryMode(HANDLE hConIn); extern BOOL WINECON_GetConsoleTitle(HANDLE hConIn, WCHAR* buffer, size_t len); diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 0830d43..410d163 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -82,6 +82,34 @@ static void WINECON_FetchCells(struct inner_data* data, int upd_tp, int upd_bm) } /****************************************************************** + * WINECON_ResizeWithContainer + * + * For console embedded in a container (e.g. user in a win32 window, or (n)curses + * in a TERM, perform resize of console (screen buffer and window) to fit in + * (new) container size. + */ +void WINECON_ResizeWithContainer(struct inner_data* data, int width, int height) +{ + struct config_data cfg; + + if (data->in_set_config) return; + + cfg = data->curcfg; + cfg.win_width = width; + cfg.win_height = height; + + /* auto size screen-buffer if it's now smaller than window */ + if (cfg.sb_width < cfg.win_width) cfg.sb_width = cfg.win_width; + if (cfg.sb_height < cfg.win_height) cfg.sb_height = cfg.win_height; + + /* and reset window pos so that we don't display outside of the screen-buffer */ + if (cfg.win_pos.X + cfg.win_width > cfg.sb_width) cfg.win_pos.X = cfg.sb_width - cfg.win_width; + if (cfg.win_pos.Y + cfg.win_height > cfg.sb_height) cfg.win_pos.Y = cfg.sb_height - cfg.win_height; + + WINECON_SetConfig(data, &cfg); +} + +/****************************************************************** * WINECON_SetHistorySize * * @@ -336,6 +364,8 @@ int WINECON_GrabChanges(struct inner_data* data) */ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cfg) { + if (data->in_set_config) return; + data->in_set_config = TRUE; if (data->curcfg.cursor_size != cfg->cursor_size || data->curcfg.cursor_visible != cfg->cursor_visible) { @@ -467,6 +497,7 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf * in order to get data correctly updated */ WINECON_GrabChanges(data); + data->in_set_config = FALSE; } /******************************************************************

1 0

Adam Martinson : msxml3: Add functions to get the dt:dt of a node.
by Alexandre Julliard Nov. 16, 2010

Nov. 16, 2010

Module: wine Branch: master Commit: a1d69fcba798d5d3bbcf0870d3aceff583b6b995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1d69fcba798d5d3bbcf0870d… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 15 18:16:51 2010 -0600 msxml3: Add functions to get the dt:dt of a node. --- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/schema.c | 102 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 87 insertions(+), 16 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 15c8b94..9980fdd 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -266,6 +266,7 @@ extern HRESULT node_get_base_name(xmlnode*,BSTR*); extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); extern HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tree); +extern XDR_DT SchemaCache_get_node_dt(IXMLDOMSchemaCollection2* iface, xmlNodePtr node); extern XDR_DT dt_get_type(xmlChar const* str, int len /* calculated if -1 */); extern xmlChar const* dt_get_str(XDR_DT dt); diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index b931295..ec31719 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -341,6 +341,23 @@ xmlChar const* dt_get_str(XDR_DT dt) return DT_string_table[dt]; } +static inline xmlChar const* get_node_nsURI(xmlNodePtr node) +{ + return (node->ns != NULL)? node->ns->href : NULL; +} + +static inline cache_entry* get_entry(schema_cache* This, xmlChar const* nsURI) +{ + return (!nsURI)? xmlHashLookup(This->cache, BAD_CAST "") : + xmlHashLookup(This->cache, nsURI); +} + +static inline xmlSchemaPtr get_node_schema(schema_cache* This, xmlNodePtr node) +{ + cache_entry* entry = get_entry(This, get_node_nsURI(node)); + return (!entry)? NULL : entry->schema; +} + xmlExternalEntityLoader _external_entity_loader = NULL; static xmlParserInputPtr external_entity_loader(const char *URL, const char *ID, @@ -981,6 +998,40 @@ static const struct IXMLDOMSchemaCollection2Vtbl schema_cache_vtbl = schema_cache_getDeclaration }; +static xmlSchemaElementPtr lookup_schema_elemDecl(xmlSchemaPtr schema, xmlNodePtr node) +{ + xmlSchemaElementPtr decl = NULL; + xmlChar const* nsURI = get_node_nsURI(node); + + TRACE("(%p, %p)\n", schema, node); + + if (xmlStrEqual(nsURI, schema->targetNamespace)) + decl = xmlHashLookup(schema->elemDecl, node->name); + + if (!decl && xmlHashSize(schema->schemasImports) > 1) + { + FIXME("declaration not found in main schema - need to check schema imports!\n"); + /*xmlSchemaImportPtr import; + if (nsURI == NULL) + import = xmlHashLookup(schema->schemasImports, XML_SCHEMAS_NO_NAMESPACE); + else + import = xmlHashLookup(schema->schemasImports, node->ns->href); + + if (import != NULL) + decl = xmlHashLookup(import->schema->elemDecl, node->name);*/ + } + + return decl; +} + +static inline xmlNodePtr lookup_schema_element(xmlSchemaPtr schema, xmlNodePtr node) +{ + xmlSchemaElementPtr decl = lookup_schema_elemDecl(schema, node); + while (decl != NULL && decl->refDecl != NULL) + decl = decl->refDecl; + return (decl != NULL)? decl->node : NULL; +} + static void LIBXML2_LOG_CALLBACK validate_error(void* ctx, char const* msg, ...) { va_list ap; @@ -1007,35 +1058,26 @@ static void validate_serror(void* ctx, xmlErrorPtr err) HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tree) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); - cache_entry* entry; - xmlChar const* ns = NULL; + xmlSchemaPtr schema; + TRACE("(%p, %p)\n", This, tree); if (!tree) return E_POINTER; - if ((xmlNodePtr)tree->doc == tree) - { - xmlNodePtr root = xmlDocGetRootElement(tree->doc); - if (root && root->ns) - ns = root->ns->href; - } - else if (tree->ns) - { - ns = tree->ns->href; - } + if (tree->type == XML_DOCUMENT_NODE) + tree = xmlDocGetRootElement(tree->doc); - entry = (ns != NULL)? xmlHashLookup(This->cache, ns) : - xmlHashLookup(This->cache, BAD_CAST ""); + schema = get_node_schema(This, tree); /* TODO: if the ns is not in the cache, and it's a URL, * do we try to load from that? */ - if (entry) + if (schema) { xmlSchemaValidCtxtPtr svctx; int err; /* TODO: if validateOnLoad property is false, * we probably need to validate the schema here. */ - svctx = xmlSchemaNewValidCtxt(entry->schema); + svctx = xmlSchemaNewValidCtxt(schema); xmlSchemaSetValidErrors(svctx, validate_error, validate_warning, NULL); #ifdef HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS xmlSchemaSetValidStructuredErrors(svctx, validate_serror, NULL); @@ -1053,6 +1095,34 @@ HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tr return E_FAIL; } +XDR_DT SchemaCache_get_node_dt(IXMLDOMSchemaCollection2* iface, xmlNodePtr node) +{ + schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); + xmlSchemaPtr schema = get_node_schema(This, node); + XDR_DT dt = DT_INVALID; + + TRACE("(%p, %p)\n", This, node); + + if (node->ns && xmlStrEqual(node->ns->href, DT_nsURI)) + { + dt = dt_get_type(node->name, -1); + } + else if (schema) + { + xmlChar* str; + xmlNodePtr schema_node = lookup_schema_element(schema, node); + + str = xmlGetNsProp(schema_node, BAD_CAST "dt", DT_nsURI); + if (str) + { + dt = dt_get_type(str, -1); + xmlFree(str); + } + } + + return dt; +} + HRESULT SchemaCache_create(IUnknown* pUnkOuter, void** ppObj) { schema_cache* This = heap_alloc(sizeof(schema_cache));

1 0

Adam Martinson : msxml3: Add XDR datatypes enum and string table.
by Alexandre Julliard Nov. 16, 2010

Nov. 16, 2010

Module: wine Branch: master Commit: 4ec6da6ef195a339939e8aedbdcb3f458ebb2143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ec6da6ef195a339939e8aedb… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 15 18:16:10 2010 -0600 msxml3: Add XDR datatypes enum and string table. --- dlls/msxml3/msxml_private.h | 48 +++++++++ dlls/msxml3/schema.c | 240 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 288 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index f6d8355..15c8b94 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -68,6 +68,51 @@ typedef enum tid_t { LAST_tid } tid_t; +/* The XDR datatypes (urn:schemas-microsoft-com:datatypes) + * These are actually valid for XSD schemas as well + * See datatypes.xsd + */ +typedef enum _XDR_DT { + DT_INVALID = -1, + DT_BIN_BASE64, + DT_BIN_HEX, + DT_BOOLEAN, + DT_CHAR, + DT_DATE, + DT_DATE_TZ, + DT_DATETIME, + DT_DATETIME_TZ, + DT_ENTITY, + DT_ENTITIES, + DT_ENUMERATION, + DT_FIXED_14_4, + DT_FLOAT, + DT_I1, + DT_I2, + DT_I4, + DT_I8, + DT_ID, + DT_IDREF, + DT_IDREFS, + DT_INT, + DT_NMTOKEN, + DT_NMTOKENS, + DT_NOTATION, + DT_NUMBER, + DT_R4, + DT_R8, + DT_STRING, + DT_TIME, + DT_TIME_TZ, + DT_UI1, + DT_UI2, + DT_UI4, + DT_UI8, + DT_URI, + DT_UUID +} XDR_DT; +#define DT__N_TYPES (DT_UUID+1) + extern HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo); extern void release_typelib(void); @@ -222,6 +267,9 @@ extern HRESULT node_get_base_name(xmlnode*,BSTR*); extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); extern HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tree); +extern XDR_DT dt_get_type(xmlChar const* str, int len /* calculated if -1 */); +extern xmlChar const* dt_get_str(XDR_DT dt); + extern BSTR EnsureCorrectEOL(BSTR); static inline BSTR bstr_from_xmlChar(const xmlChar *str) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index f3fd7a9..b931295 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -101,6 +101,246 @@ typedef struct _cache_index_data BSTR* out; } cache_index_data; +/* datatypes lookup stuff + * generated with help from gperf */ +#define DT_MIN_STR_LEN 2 +#define DT_MAX_STR_LEN 11 +#define DT_MIN_HASH_VALUE 2 +#define DT_MAX_HASH_VALUE 115 + +static const xmlChar DT_bin_base64[] = "bin.base64"; +static const xmlChar DT_bin_hex[] = "bin.hex"; +static const xmlChar DT_boolean[] = "boolean"; +static const xmlChar DT_char[] = "char"; +static const xmlChar DT_date[] = "date"; +static const xmlChar DT_date_tz[] = "date.tz"; +static const xmlChar DT_dateTime[] = "dateTime"; +static const xmlChar DT_dateTime_tz[] = "dateTime.tz"; +static const xmlChar DT_entity[] = "entity"; +static const xmlChar DT_entities[] = "entities"; +static const xmlChar DT_enumeration[] = "enumeration"; +static const xmlChar DT_fixed_14_4[] = "fixed.14.4"; +static const xmlChar DT_float[] = "float"; +static const xmlChar DT_i1[] = "i1"; +static const xmlChar DT_i2[] = "i2"; +static const xmlChar DT_i4[] = "i4"; +static const xmlChar DT_i8[] = "i8"; +static const xmlChar DT_id[] = "id"; +static const xmlChar DT_idref[] = "idref"; +static const xmlChar DT_idrefs[] = "idrefs"; +static const xmlChar DT_int[] = "int"; +static const xmlChar DT_nmtoken[] = "nmtoken"; +static const xmlChar DT_nmtokens[] = "nmtokens"; +static const xmlChar DT_notation[] = "notation"; +static const xmlChar DT_number[] = "number"; +static const xmlChar DT_r4[] = "r4"; +static const xmlChar DT_r8[] = "r8"; +static const xmlChar DT_string[] = "string"; +static const xmlChar DT_time[] = "time"; +static const xmlChar DT_time_tz[] = "time.tz"; +static const xmlChar DT_ui1[] = "ui1"; +static const xmlChar DT_ui2[] = "ui2"; +static const xmlChar DT_ui4[] = "ui4"; +static const xmlChar DT_ui8[] = "ui8"; +static const xmlChar DT_uri[] = "uri"; +static const xmlChar DT_uuid[] = "uuid"; + +static DWORD dt_hash( xmlChar const* str, int len /* calculated if -1 */) +{ + static const BYTE assoc_values[] = + { + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 10, 116, 116, 55, + 45, 116, 5, 116, 0, 116, 0, 116, 116, 116, + 116, 116, 116, 116, 116, 5, 0, 0, 20, 0, + 0, 10, 0, 0, 116, 0, 0, 0, 15, 5, + 116, 116, 10, 0, 0, 0, 116, 116, 0, 0, + 10, 116, 116, 116, 116, 116, 116, 5, 0, 0, + 20, 0, 0, 10, 0, 0, 116, 0, 0, 0, + 15, 5, 116, 116, 10, 0, 0, 0, 116, 116, + 0, 0, 10, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116 + }; + DWORD hval = (len == -1)? xmlStrlen(str) : len; + + switch (hval) + { + default: + hval += assoc_values[str[10]]; + /*FALLTHROUGH*/ + case 10: + hval += assoc_values[str[9]]; + /*FALLTHROUGH*/ + case 9: + hval += assoc_values[str[8]]; + /*FALLTHROUGH*/ + case 8: + hval += assoc_values[str[7]]; + /*FALLTHROUGH*/ + case 7: + hval += assoc_values[str[6]]; + /*FALLTHROUGH*/ + case 6: + hval += assoc_values[str[5]]; + /*FALLTHROUGH*/ + case 5: + hval += assoc_values[str[4]]; + /*FALLTHROUGH*/ + case 4: + hval += assoc_values[str[3]]; + /*FALLTHROUGH*/ + case 3: + hval += assoc_values[str[2]]; + /*FALLTHROUGH*/ + case 2: + hval += assoc_values[str[1]]; + /*FALLTHROUGH*/ + case 1: + hval += assoc_values[str[0]]; + break; + } + return hval; +} + +static const xmlChar const* DT_string_table[DT__N_TYPES] = +{ + DT_bin_base64, + DT_bin_hex, + DT_boolean, + DT_char, + DT_date, + DT_date_tz, + DT_dateTime, + DT_dateTime_tz, + DT_entity, + DT_entities, + DT_enumeration, + DT_fixed_14_4, + DT_float, + DT_i1, + DT_i2, + DT_i4, + DT_i8, + DT_id, + DT_idref, + DT_idrefs, + DT_int, + DT_nmtoken, + DT_nmtokens, + DT_notation, + DT_number, + DT_r4, + DT_r8, + DT_string, + DT_time, + DT_time_tz, + DT_ui1, + DT_ui2, + DT_ui4, + DT_ui8, + DT_uri, + DT_uuid +}; + +static const XDR_DT DT_lookup_table[] = +{ + -1, -1, + DT_I8, + DT_UI8, + DT_TIME, + -1, -1, + DT_I4, + DT_UI4, + -1, -1, -1, + DT_R8, + DT_URI, + -1, + DT_FLOAT, + -1, + DT_R4, + DT_INT, + DT_CHAR, + -1, + DT_ENTITY, + DT_ID, + DT_ENTITIES, + DT_UUID, + -1, -1, + DT_TIME_TZ, + -1, + DT_DATE, + -1, + DT_NUMBER, + DT_BIN_HEX, + DT_DATETIME, + -1, + DT_IDREF, + DT_IDREFS, + DT_BOOLEAN, + -1, -1, -1, + DT_STRING, + DT_NMTOKEN, + DT_NMTOKENS, + -1, + DT_BIN_BASE64, + -1, + DT_I2, + DT_UI2, + -1, -1, -1, + DT_DATE_TZ, + DT_NOTATION, + -1, -1, + DT_DATETIME_TZ, + DT_I1, + DT_UI1, + -1, -1, + DT_ENUMERATION, + -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + DT_FIXED_14_4 +}; + +XDR_DT dt_get_type(xmlChar const* str, int len /* calculated if -1 */) +{ + DWORD hash = dt_hash(str, len); + XDR_DT dt = DT_INVALID; + + if (hash <= DT_MAX_HASH_VALUE) + dt = DT_lookup_table[hash]; + + if (dt != DT_INVALID && xmlStrcasecmp(str, DT_string_table[dt]) == 0) + return dt; + + return DT_INVALID; +} + +xmlChar const* dt_get_str(XDR_DT dt) +{ + if (dt == DT_INVALID) + return NULL; + + return DT_string_table[dt]; +} + xmlExternalEntityLoader _external_entity_loader = NULL; static xmlParserInputPtr external_entity_loader(const char *URL, const char *ID,

1 0