November 2011 - Wine-Commits

Alexandre Julliard : wineconsole: Convert dialogs to po files.
by Alexandre Julliard Nov. 2, 2011

Nov. 2, 2011

Module: wine Branch: master Commit: 8715df8ecd45f2c403ba0d011480e4751212bf9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8715df8ecd45f2c403ba0d011… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 2 14:28:22 2011 +0100 wineconsole: Convert dialogs to po files. --- po/ar.po | 143 +++++++++++++++++++++- po/bg.po | 146 +++++++++++++++++++++- po/ca.po | 156 +++++++++++++++++++++++- po/cs.po | 135 ++++++++++++++++++++- po/da.po | 135 ++++++++++++++++++++- po/de.po | 135 ++++++++++++++++++++- po/el.po | 143 +++++++++++++++++++++- po/en.po | 137 ++++++++++++++++++++-- po/en_US.po | 135 ++++++++++++++++++++- po/eo.po | 135 ++++++++++++++++++++- po/es.po | 135 ++++++++++++++++++++- po/fa.po | 143 +++++++++++++++++++++- po/fi.po | 149 ++++++++++++++++++++++- po/fr.po | 135 ++++++++++++++++++++- po/he.po | 135 ++++++++++++++++++++- po/hi.po | 137 ++++++++++++++++++++- po/hu.po | 135 ++++++++++++++++++++- po/it.po | 135 ++++++++++++++++++++- po/ja.po | 135 ++++++++++++++++++++- po/ko.po | 135 ++++++++++++++++++++- po/lt.po | 135 ++++++++++++++++++++- po/ml.po | 137 ++++++++++++++++++++- po/nb_NO.po | 135 ++++++++++++++++++++- po/nl.po | 135 ++++++++++++++++++++- po/or.po | 137 ++++++++++++++++++++- po/pa.po | 137 ++++++++++++++++++++- po/pl.po | 135 ++++++++++++++++++++- po/pt_BR.po | 135 ++++++++++++++++++++- po/pt_PT.po | 135 ++++++++++++++++++++- po/rm.po | 141 +++++++++++++++++++++- po/ro.po | 135 ++++++++++++++++++++- po/ru.po | 135 ++++++++++++++++++++- po/sk.po | 140 ++++++++++++++++++++- po/sl.po | 135 ++++++++++++++++++++- po/sr_RS(a)cyrillic.po | 153 ++++++++++++++++++++++- po/sr_RS(a)latin.po | 159 +++++++++++++++++++++++- po/sv.po | 135 ++++++++++++++++++++- po/te.po | 137 ++++++++++++++++++++- po/th.po | 143 +++++++++++++++++++++- po/tr.po | 135 ++++++++++++++++++++- po/uk.po | 135 ++++++++++++++++++++- po/wa.po | 146 +++++++++++++++++++++- po/wine.pot | 135 ++++++++++++++++++++- po/zh_CN.po | 135 ++++++++++++++++++++- po/zh_TW.po | 135 ++++++++++++++++++++- programs/wineconsole/Makefile.in | 28 +---- programs/wineconsole/wineconsole.rc | 80 ++++++++++++ programs/wineconsole/wineconsole_Cs.rc | 107 ---------------- programs/wineconsole/wineconsole_Da.rc | 105 ---------------- programs/wineconsole/wineconsole_De.rc | 104 ---------------- programs/wineconsole/wineconsole_En.rc | 120 ------------------ programs/wineconsole/wineconsole_Eo.rc | 104 ---------------- programs/wineconsole/wineconsole_Es.rc | 105 ---------------- programs/wineconsole/wineconsole_Fr.rc | 107 ---------------- programs/wineconsole/wineconsole_He.rc | 109 ----------------- programs/wineconsole/wineconsole_Hu.rc | 103 ---------------- programs/wineconsole/wineconsole_It.rc | 105 ---------------- programs/wineconsole/wineconsole_Ja.rc | 106 ---------------- programs/wineconsole/wineconsole_Ko.rc | 105 ---------------- programs/wineconsole/wineconsole_Lt.rc | 105 ---------------- programs/wineconsole/wineconsole_Nl.rc | 105 ---------------- programs/wineconsole/wineconsole_No.rc | 105 ---------------- programs/wineconsole/wineconsole_Pl.rc | 103 ---------------- programs/wineconsole/wineconsole_Pt.rc | 207 -------------------------------- programs/wineconsole/wineconsole_Ro.rc | 106 ---------------- programs/wineconsole/wineconsole_Ru.rc | 108 ----------------- programs/wineconsole/wineconsole_Si.rc | 104 ---------------- programs/wineconsole/wineconsole_Sv.rc | 102 ---------------- programs/wineconsole/wineconsole_Tr.rc | 104 ---------------- programs/wineconsole/wineconsole_Uk.rc | 106 ---------------- programs/wineconsole/wineconsole_Zh.rc | 192 ----------------------------- 71 files changed, 5994 insertions(+), 3070 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8715df8ecd45f2c403ba0…

1 0

Alistair Leslie-Hughes : mscoree: Return S_OK from CanLaunchOrAttach.
by Alexandre Julliard Nov. 2, 2011

Nov. 2, 2011

Module: wine Branch: master Commit: 5dcd363f5a2c50dca412b50500affdda346482af URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dcd363f5a2c50dca412b5050… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Oct 18 10:39:47 2011 +1100 mscoree: Return S_OK from CanLaunchOrAttach. --- dlls/mscoree/cordebug.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/cordebug.c b/dlls/mscoree/cordebug.c index 04c6e58..8fe7501 100644 --- a/dlls/mscoree/cordebug.c +++ b/dlls/mscoree/cordebug.c @@ -314,7 +314,7 @@ static HRESULT WINAPI CorDebug_CanLaunchOrAttach(ICorDebug *iface, DWORD dwProce { CorDebug *This = impl_from_ICorDebug( iface ); FIXME("stub %p %d %d\n", This, dwProcessId, win32DebuggingEnabled); - return E_NOTIMPL; + return S_OK; } static const struct ICorDebugVtbl cordebug_vtbl =

1 0

Andrew Talbot : windowscodecs: Remove unneeded address-of operators from array names.
by Alexandre Julliard Nov. 2, 2011

Nov. 2, 2011

Module: wine Branch: master Commit: e1b7291785e7b9059cca6f2fc1a9c9439093e683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1b7291785e7b9059cca6f2fc… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 1 22:51:46 2011 +0000 windowscodecs: Remove unneeded address-of operators from array names. --- dlls/windowscodecs/jpegformat.c | 4 ++-- dlls/windowscodecs/pngformat.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 083a352..0cb9fc2 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -284,7 +284,7 @@ static HRESULT WINAPI JpegDecoder_Initialize(IWICBitmapDecoder *iface, IStream * This->cinfo.err = &This->jerr; - This->cinfo.client_data = &jmpbuf; + This->cinfo.client_data = jmpbuf; if (setjmp(jmpbuf)) { @@ -576,7 +576,7 @@ static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, } } - This->cinfo.client_data = &jmpbuf; + This->cinfo.client_data = jmpbuf; if (setjmp(jmpbuf)) { diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index c7c3cab..ce99509 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -304,7 +304,7 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p hr = E_FAIL; goto end; } - ppng_set_error_fn(This->png_ptr, &jmpbuf, user_error_fn, user_warning_fn); + ppng_set_error_fn(This->png_ptr, jmpbuf, user_error_fn, user_warning_fn); /* seek to the start of the stream */ seek.QuadPart = 0; @@ -1015,7 +1015,7 @@ static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, HeapFree(GetProcessHeap(), 0, row_pointers); return E_FAIL; } - ppng_set_error_fn(This->png_ptr, &jmpbuf, user_error_fn, user_warning_fn); + ppng_set_error_fn(This->png_ptr, jmpbuf, user_error_fn, user_warning_fn); if (!This->info_written) { @@ -1153,7 +1153,7 @@ static HRESULT WINAPI PngFrameEncode_Commit(IWICBitmapFrameEncode *iface) LeaveCriticalSection(&This->lock); return E_FAIL; } - ppng_set_error_fn(This->png_ptr, &jmpbuf, user_error_fn, user_warning_fn); + ppng_set_error_fn(This->png_ptr, jmpbuf, user_error_fn, user_warning_fn); ppng_write_end(This->png_ptr, This->info_ptr); @@ -1305,7 +1305,7 @@ static HRESULT WINAPI PngEncoder_Initialize(IWICBitmapEncoder *iface, LeaveCriticalSection(&This->lock); return E_FAIL; } - ppng_set_error_fn(This->png_ptr, &jmpbuf, user_error_fn, user_warning_fn); + ppng_set_error_fn(This->png_ptr, jmpbuf, user_error_fn, user_warning_fn); /* set up custom i/o handling */ ppng_set_write_fn(This->png_ptr, This, user_write_data, user_flush);

1 0

Vitaliy Margolen : dinput: Window supplied to SetCooperativeLevel have to be top level window.
by Alexandre Julliard Nov. 2, 2011

Nov. 2, 2011

Module: wine Branch: master Commit: 8c5a4401449efc52f7309f7b8f45182138b4e13c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c5a4401449efc52f7309f7b8… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Nov 1 23:45:39 2011 -0600 dinput: Window supplied to SetCooperativeLevel have to be top level window. --- dlls/dinput/device.c | 2 ++ dlls/dinput/tests/keyboard.c | 18 ++++++++++++++++++ dlls/dinput/tests/mouse.c | 18 ++++++++++++++++++ 3 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 72670f7..f5b7b4b 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -882,6 +882,8 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetCooperativeLevel(LPDIRECTINPUTDEVICE8 (dwflags & (DISCL_FOREGROUND | DISCL_BACKGROUND)) == (DISCL_FOREGROUND | DISCL_BACKGROUND)) return DIERR_INVALIDPARAM; + if (hwnd && GetWindowLongW(hwnd, GWL_STYLE) & WS_CHILD) return E_HANDLE; + if (dwflags == (DISCL_NONEXCLUSIVE | DISCL_BACKGROUND)) hwnd = GetDesktopWindow(); diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index ecfd6c2..4b46a61 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -106,11 +106,18 @@ static const HRESULT SetCoop_real_window[16] = { E_INVALIDARG, E_NOTIMPL, S_OK, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; +static const HRESULT SetCoop_child_window[16] = { + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; + static void test_set_coop(LPDIRECTINPUT pDI, HWND hwnd) { HRESULT hr; LPDIRECTINPUTDEVICE pKeyboard = NULL; int i; + HWND child; hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKeyboard, NULL); ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); @@ -127,6 +134,17 @@ static void test_set_coop(LPDIRECTINPUT pDI, HWND hwnd) ok(hr == SetCoop_real_window[i], "SetCooperativeLevel(hwnd, %d): %08x\n", i, hr); } + child = CreateWindow("static", "Title", WS_CHILD | WS_VISIBLE, + 10, 10, 50, 50, hwnd, NULL, NULL, NULL); + ok(child != NULL, "err: %d\n", GetLastError()); + + for (i=0; i<16; i++) + { + hr = IDirectInputDevice_SetCooperativeLevel(pKeyboard, child, i); + ok(hr == SetCoop_child_window[i], "SetCooperativeLevel(child, %d): %08x\n", i, hr); + } + + DestroyWindow(child); if (pKeyboard) IUnknown_Release(pKeyboard); } diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 0d6b88a..2cfb8cd 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -42,11 +42,18 @@ static const HRESULT SetCoop_real_window[16] = { E_INVALIDARG, E_NOTIMPL, S_OK, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; +static const HRESULT SetCoop_child_window[16] = { + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; + static void test_set_coop(LPDIRECTINPUT pDI, HWND hwnd) { HRESULT hr; LPDIRECTINPUTDEVICE pMouse = NULL; int i; + HWND child; hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, &pMouse, NULL); ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); @@ -63,6 +70,17 @@ static void test_set_coop(LPDIRECTINPUT pDI, HWND hwnd) ok(hr == SetCoop_real_window[i], "SetCooperativeLevel(hwnd, %d): %08x\n", i, hr); } + child = CreateWindow("static", "Title", WS_CHILD | WS_VISIBLE, + 10, 10, 50, 50, hwnd, NULL, NULL, NULL); + ok(child != NULL, "err: %d\n", GetLastError()); + + for (i=0; i<16; i++) + { + hr = IDirectInputDevice_SetCooperativeLevel(pMouse, child, i); + ok(hr == SetCoop_child_window[i], "SetCooperativeLevel(child, %d): %08x\n", i, hr); + } + + DestroyWindow(child); if (pMouse) IUnknown_Release(pMouse); }

1 0

Andrew Talbot : shell32: Remove unneeded address-of operators from array names.
by Alexandre Julliard Nov. 2, 2011

Nov. 2, 2011

Module: wine Branch: master Commit: cb84c2dac1f0d78eca0ce9dcd6a88e75a2c3eb95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb84c2dac1f0d78eca0ce9dcd… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 1 22:51:42 2011 +0000 shell32: Remove unneeded address-of operators from array names. --- dlls/shell32/shv_item_cmenu.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index 245bbd4..604099c 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -418,8 +418,8 @@ static void DoOpenProperties(ItemCmImpl *This, HWND hwnd) psh.u3.phpage = hpages; psh.u2.nStartPage = 0; - _ILSimpleGetTextW(This->apidl[0], (LPVOID)&wszFilename, MAX_PATH); - psh.pszCaption = (LPCWSTR)&wszFilename; + _ILSimpleGetTextW(This->apidl[0], (LPVOID)wszFilename, MAX_PATH); + psh.pszCaption = (LPCWSTR)wszFilename; /* Find out where to look for the shell extensions */ if (_ILIsValue(This->apidl[0]))

1 0

Austin English : wininet: Add a stub for RunOnceUrlCache.
by Alexandre Julliard Nov. 2, 2011

Nov. 2, 2011

Module: wine Branch: master Commit: 9536a9cc1b30d70874bb50aaf9b16afbcd443dc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9536a9cc1b30d70874bb50aaf… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Nov 1 11:14:16 2011 -0700 wininet: Add a stub for RunOnceUrlCache. --- dlls/wininet/urlcache.c | 10 ++++++++++ dlls/wininet/wininet.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index cec5bbb..a217236 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -3925,3 +3925,13 @@ BOOL WINAPI IncrementUrlCacheHeaderData(DWORD index, LPDWORD data) FIXME("(%u, %p)\n", index, data); return FALSE; } + +/*********************************************************************** + * RunOnceUrlCache (WININET.@) + */ + +DWORD WINAPI RunOnceUrlCache(HWND hwnd, HINSTANCE hinst, LPSTR cmd, int cmdshow) +{ + FIXME("(%p, %p, %s, %d): stub\n", hwnd, hinst, debugstr_a(cmd), cmdshow); + return 0; +} diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index 82b0d7d..2773d4b 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -222,7 +222,7 @@ @ stdcall RetrieveUrlCacheEntryFileW(wstr ptr ptr long) @ stdcall RetrieveUrlCacheEntryStreamA(str ptr ptr long long) @ stdcall RetrieveUrlCacheEntryStreamW(wstr ptr ptr long long) -@ stub RunOnceUrlCache +@ stdcall RunOnceUrlCache(ptr ptr str long) @ stdcall SetUrlCacheConfigInfoA(ptr long) @ stdcall SetUrlCacheConfigInfoW(ptr long) @ stdcall SetUrlCacheEntryGroup(str long int64 ptr long ptr) SetUrlCacheEntryGroupA

1 0

Henri Verbeet : wined3d: Make the buffer parameter to buffer_sanitize_flags () const.
by Alexandre Julliard Nov. 2, 2011

Nov. 2, 2011

Module: wine Branch: master Commit: 117af3a2b14732440e7e4d8d025df4212e3e4e95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=117af3a2b14732440e7e4d8d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 1 20:15:21 2011 +0100 wined3d: Make the buffer parameter to buffer_sanitize_flags() const. --- dlls/wined3d/buffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index c896394..a4c64fe 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -934,7 +934,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) context_release(context); } -static DWORD buffer_sanitize_flags(struct wined3d_buffer *buffer, DWORD flags) +static DWORD buffer_sanitize_flags(const struct wined3d_buffer *buffer, DWORD flags) { /* Not all flags make sense together, but Windows never returns an error. Catch the * cases that could cause issues */

1 0

Henri Verbeet : wined3d: Make the shader parameter to shader_arb_load_constantsF() const.
by Alexandre Julliard Nov. 2, 2011

Nov. 2, 2011

Module: wine Branch: master Commit: 78bd84cc120531527bea2b389397aced49889ca0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78bd84cc120531527bea2b389… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 1 20:15:22 2011 +0100 wined3d: Make the shader parameter to shader_arb_load_constantsF() const. --- dlls/wined3d/arb_program_shader.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9b26313..8fd0714 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -365,8 +365,9 @@ static unsigned int reserved_vs_const(const struct arb_vshader_private *shader_d * or GL_FRAGMENT_PROGRAM_ARB (for pixel shaders) */ /* GL locking is done by the caller */ -static unsigned int shader_arb_load_constantsF(struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, - GLuint target_type, unsigned int max_constants, const float *constants, char *dirty_consts) +static unsigned int shader_arb_load_constantsF(const struct wined3d_shader *shader, + const struct wined3d_gl_info *gl_info, GLuint target_type, unsigned int max_constants, + const float *constants, char *dirty_consts) { struct wined3d_shader_lconst *lconst; DWORD i, j;

1 0

Nikolay Sivov : msxml3: Support IDispatchEx for IXMLDOMParseError.
by Alexandre Julliard Nov. 2, 2011

Nov. 2, 2011

Module: wine Branch: master Commit: 7a62e46fa153aac9ad544e30fd29d3ed29a9aae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a62e46fa153aac9ad544e30f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 1 23:50:56 2011 +0300 msxml3: Support IDispatchEx for IXMLDOMParseError. --- dlls/msxml3/parseerror.c | 20 ++++++++++++++++++++ dlls/msxml3/tests/domdoc.c | 9 +++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c index 8e67816..b8cc381 100644 --- a/dlls/msxml3/parseerror.c +++ b/dlls/msxml3/parseerror.c @@ -44,6 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct { + DispatchEx dispex; IXMLDOMParseError IXMLDOMParseError_iface; LONG ref; LONG code, line, linepos, filepos; @@ -70,6 +71,10 @@ static HRESULT WINAPI parseError_QueryInterface( { *ppvObject = iface; } + else if (dispex_query_interface(&This->dispex, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; + } else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); @@ -103,6 +108,7 @@ static ULONG WINAPI parseError_Release( SysFreeString(This->url); SysFreeString(This->reason); SysFreeString(This->srcText); + release_dispex(&This->dispex); heap_free( This ); } @@ -289,6 +295,18 @@ static const struct IXMLDOMParseErrorVtbl parseError_vtbl = parseError_get_filepos }; +static const tid_t parseError_iface_tids[] = { + IXMLDOMParseError_tid, + 0 +}; + +static dispex_static_data_t parseError_dispex = { + NULL, + IXMLDOMParseError_tid, + NULL, + parseError_iface_tids +}; + IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR srcText, LONG line, LONG linepos, LONG filepos ) { @@ -309,5 +327,7 @@ IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR src This->linepos = linepos; This->filepos = filepos; + init_dispex(&This->dispex, (IUnknown*)&This->IXMLDOMParseError_iface, &parseError_dispex); + return &This->IXMLDOMParseError_iface; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 41fb835..e1be912 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10627,6 +10627,7 @@ static void test_dispex(void) { const DOMNodeType *type = dispex_types_test; IXMLDOMNodeList *node_list; + IXMLDOMParseError *error; IXMLDOMDocument *doc; IUnknown *unk; HRESULT hr; @@ -10663,6 +10664,14 @@ static void test_dispex(void) IUnknown_Release(unk); IXMLDOMNodeList_Release(node_list); + /* IXMLDOMParseError */ + hr = IXMLDOMDocument_get_parseError(doc, &error); + EXPECT_HR(hr, S_OK); + IXMLDOMParseError_QueryInterface(error, &IID_IUnknown, (void**)&unk); + test_domobj_dispex(unk); + IUnknown_Release(unk); + IXMLDOMParseError_Release(error); + IXMLDOMDocument_Release(doc); free_bstrs(); }

1 0

Aric Stewart : user32: Only attempt autoscroll line breaking on an edit control when we have a reasonable width to break to .
by Alexandre Julliard Nov. 2, 2011

Nov. 2, 2011

Module: wine Branch: master Commit: 5e3272421026aa928f76751d022ade5914810a32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e3272421026aa928f76751d0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 1 14:48:35 2011 -0500 user32: Only attempt autoscroll line breaking on an edit control when we have a reasonable width to break to. --- dlls/user32/edit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index a0bc962..7971333 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -600,7 +600,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta /* Line breaks just look back from the end and find the next break and try that. */ if (!(es->style & ES_AUTOHSCROLL)) { - if (current_line->width > fw) { + if (current_line->width > fw && fw > es->char_width) { INT prev, next; int w;

1 0