November 2012 - Wine-Commits

Piotr Caban : msvcrt: Added wcrtomb implementation.
by Alexandre Julliard Nov. 30, 2012

Nov. 30, 2012

Module: wine Branch: master Commit: c0ce611ebd3684dcc59fb4803dbd0fa2af87bf73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0ce611ebd3684dcc59fb4803… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 29 21:49:42 2012 +0000 msvcrt: Added wcrtomb implementation. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6a88832..ecf44fd 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1445,7 +1445,7 @@ @ cdecl vswprintf_s(ptr long wstr ptr) MSVCRT_vswprintf_s @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf @ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s -# stub wcrtomb(ptr long ptr) +@ cdecl wcrtomb(ptr long ptr) MSVCRT_wcrtomb # stub wcrtomb_s(ptr ptr long long ptr) @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 08628d4..555e63a 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1083,7 +1083,25 @@ INT CDECL MSVCRT_wctob( MSVCRT_wint_t wchar ) */ INT CDECL MSVCRT_wctomb( char *dst, MSVCRT_wchar_t ch ) { - return WideCharToMultiByte( get_locinfo()->lc_codepage, 0, &ch, 1, dst, 6, NULL, NULL ); + 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) +{ + if(s) + *s = 0; + return MSVCRT_wctomb(dst, ch); } /*********************************************************************

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_VSGetConstantBuffers().
by Alexandre Julliard Nov. 30, 2012

Nov. 30, 2012

Module: wine Branch: master Commit: 027ef4ccdb9e2067a0576c26c4bbcd1601d19545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=027ef4ccdb9e2067a0576c26c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 29 22:44:46 2012 +0100 d3d10core: Implement d3d10_device_VSGetConstantBuffers(). --- dlls/d3d10core/device.c | 21 ++++++++++++++++++++- dlls/wined3d/device.c | 13 +++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 6c25e7b..25439b0 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -500,8 +500,27 @@ static void STDMETHODCALLTYPE d3d10_device_ResolveSubresource(ID3D10Device *ifac static void STDMETHODCALLTYPE d3d10_device_VSGetConstantBuffers(ID3D10Device *iface, UINT start_slot, UINT buffer_count, ID3D10Buffer **buffers) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); + + for (i = 0; i < buffer_count; ++i) + { + struct wined3d_buffer *wined3d_buffer; + struct d3d10_buffer *buffer_impl; + + if (!(wined3d_buffer = wined3d_device_get_vs_cb(device->wined3d_device, start_slot + i))) + { + buffers[i] = NULL; + continue; + } + + buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + buffers[i] = &buffer_impl->ID3D10Buffer_iface; + ID3D10Buffer_AddRef(buffers[i]); + } } static void STDMETHODCALLTYPE d3d10_device_PSGetShaderResources(ID3D10Device *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1aecff8..57e1de9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2571,6 +2571,19 @@ void CDECL wined3d_device_set_vs_cb(struct wined3d_device *device, UINT idx, str } } +struct wined3d_buffer * CDECL wined3d_device_get_vs_cb(const struct wined3d_device *device, UINT idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + if (idx >= MAX_CONSTANT_BUFFERS) + { + WARN("Invalid constant buffer index %u.\n", idx); + return NULL; + } + + return device->stateBlock->state.vs_cb[idx]; +} + HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device, UINT start_register, const BOOL *constants, UINT bool_count) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 66dc056..b7b04df 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -94,6 +94,7 @@ @ cdecl wined3d_device_get_vertex_declaration(ptr) @ cdecl wined3d_device_get_vertex_shader(ptr) @ cdecl wined3d_device_get_viewport(ptr ptr) +@ cdecl wined3d_device_get_vs_cb(ptr long) @ cdecl wined3d_device_get_vs_consts_b(ptr long ptr long) @ cdecl wined3d_device_get_vs_consts_f(ptr long ptr long) @ cdecl wined3d_device_get_vs_consts_i(ptr long ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9506f81..7b1e043 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2170,6 +2170,7 @@ void __cdecl wined3d_device_get_transform(const struct wined3d_device *device, struct wined3d_vertex_declaration * __cdecl wined3d_device_get_vertex_declaration(const struct wined3d_device *device); struct wined3d_shader * __cdecl wined3d_device_get_vertex_shader(const struct wined3d_device *device); void __cdecl wined3d_device_get_viewport(const struct wined3d_device *device, struct wined3d_viewport *viewport); +struct wined3d_buffer * __cdecl wined3d_device_get_vs_cb(const struct wined3d_device *device, UINT idx); HRESULT __cdecl wined3d_device_get_vs_consts_b(const struct wined3d_device *device, UINT start_register, BOOL *constants, UINT bool_count); HRESULT __cdecl wined3d_device_get_vs_consts_f(const struct wined3d_device *device,

1 0

Francois Gouget : testbot/testagentd: Fix the buffer reallocation in vset_status().
by Alexandre Julliard Nov. 30, 2012

Nov. 30, 2012

Module: tools Branch: master Commit: 6587169d46cd96d75919b6578ca5e71cb07087a0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6587169d46cd96d75919b657… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 30 12:15:04 2012 +0100 testbot/testagentd: Fix the buffer reallocation in vset_status(). --- testbot/src/testagentd/testagentd.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 4d5a13e..4973fd5 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -190,12 +190,15 @@ static void vset_status(const char* format, va_list valist) { int len; va_list args; - len = 1; + len = 0; do { if (len >= status_size) { - status_size = (len +0xf) & ~0xf; + /* len does not count the trailing '\0'. So add 1 and round up + * to the next 16 bytes multiple. + */ + status_size = (len + 1 + 0xf) & ~0xf; status = realloc(status, status_size); } va_copy(args, valist);

1 0

Francois Gouget : testbot/testagentd: Only rebuild the iso file if the Windows binary has changed.
by Alexandre Julliard Nov. 30, 2012

Nov. 30, 2012

Module: tools Branch: master Commit: 405dfa8493c192b846956976af79b8af3bfaa9f5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=405dfa8493c192b846956976… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 30 12:15:47 2012 +0100 testbot/testagentd: Only rebuild the iso file if the Windows binary has changed. But always recreate the winetest directory from scratch in case it was left from a previous failed build. --- testbot/src/testagentd/Makefile | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/testbot/src/testagentd/Makefile b/testbot/src/testagentd/Makefile index 6090d02..f6035be 100644 --- a/testbot/src/testagentd/Makefile +++ b/testbot/src/testagentd/Makefile @@ -27,7 +27,10 @@ TestAgentd.exe: testagentd.obj platform_windows.obj C_SRCS = testagentd.c platform_unix.c platform_windows.c $(C_SRCS:.c=.o) $(C_SRCS:.c=.obj): platform.h -iso: windows +iso: winetestbot.iso + +winetestbot.iso: TestAgentd.exe + rm -rf winetest mkdir winetest cp TestAgentd.exe winetest mkisofs="mkisofs"; \

1 0

Alexandre Julliard : gdi32: Avoid creating a copy of the pattern bits for the R2_COPYPEN case.
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Module: wine Branch: master Commit: a796ad5ed8d06c6ac2edb67242e00b646bf1e6ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=a796ad5ed8d06c6ac2edb6724… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 29 17:59:59 2012 +0100 gdi32: Avoid creating a copy of the pattern bits for the R2_COPYPEN case. --- dlls/gdi32/dibdrv/objects.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index b658af6..8dee8e8 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1782,7 +1782,7 @@ static BOOL alloc_brush_mask_bits( dib_brush *brush ) static void free_brush_mask_bits( dib_brush *brush ) { - HeapFree(GetProcessHeap(), 0, brush->masks.and); + if (brush->masks.xor != brush->dib.bits.ptr) HeapFree(GetProcessHeap(), 0, brush->masks.xor); brush->masks.and = brush->masks.xor = NULL; } @@ -1798,6 +1798,12 @@ static BOOL create_pattern_brush_bits( dib_brush *brush ) DWORD *brush_bits = brush->dib.bits.ptr; DWORD *and_bits, *xor_bits; + if (brush->rop == R2_COPYPEN) + { + brush->masks.xor = brush_bits; /* use the pattern bits directly */ + return TRUE; + } + if (!alloc_brush_mask_bits( brush )) return FALSE; and_bits = brush->masks.and;

1 0

Nikolay Sivov : dwrite: Handle allocation error (Coverity).
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Module: wine Branch: master Commit: 0e179e08b67f3d7b69e1a258fd0e8318f8f6f3ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e179e08b67f3d7b69e1a258f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 07:38:21 2012 -0500 dwrite: Handle allocation error (Coverity). --- dlls/dwrite/font.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 7d332b7..0ec581b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -930,6 +930,13 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) ret = GetOutlineTextMetricsW(hdc, 0, NULL); otm = heap_alloc(ret); + if (!otm) + { + heap_free(This); + DeleteDC(hdc); + DeleteObject(hfont); + return E_OUTOFMEMORY; + } otm->otmSize = ret; ret = GetOutlineTextMetricsW(hdc, otm->otmSize, otm);

1 0

Nikolay Sivov : msxml3: Initialize body pointer and size for unknown types (Coverity).
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Module: wine Branch: master Commit: 2684eee0b243c3e7977c9c3a8582ac49d8215604 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2684eee0b243c3e7977c9c3a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 07:52:53 2012 -0500 msxml3: Initialize body pointer and size for unknown types (Coverity). --- dlls/msxml3/httprequest.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 3f02337..7fbb836 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -699,14 +699,14 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * size++; break; } + default: + FIXME("unsupported body data type %d\n", V_VT(body)); + /* fall through */ case VT_EMPTY: case VT_ERROR: ptr = NULL; size = 0; break; - default: - FIXME("unsupported body data type %d\n", V_VT(body)); - break; } bsc->body = GlobalAlloc(GMEM_FIXED, size);

1 0

Piotr Caban : msvcrt: Added mbrtowc tests.
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Module: wine Branch: master Commit: f20a85a5da003ebe3e920847641c8097f255a373 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f20a85a5da003ebe3e9208476… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 29 09:23:20 2012 +0000 msvcrt: Added mbrtowc tests. --- dlls/msvcrt/tests/string.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 73e7414..743b5b3 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -86,6 +86,7 @@ static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements static int (__cdecl *p_wctob)(wint_t); static int (__cdecl *p_tolower)(int); static size_t (__cdecl *p_mbrlen)(const char*, size_t, mbstate_t*); +static size_t (__cdecl *p_mbrtowc)(wchar_t*, const char*, size_t, mbstate_t*); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -319,6 +320,28 @@ static void test_mbcp(void) ok(state == mbstring[0], "incorrect state value (%x)\n", state); expect_eq(p_mbrlen((const char*)&mbstring[1], 1, &state), 2, int, "%d"); } + + /* mbrtowc */ + if(!setlocale(LC_ALL, ".936") || !p_mbrtowc) { + win_skip("mbrtowc tests\n"); + }else { + mbstate_t state = 0; + wchar_t dst; + expect_eq(p_mbrtowc(&dst, (const char*)mbstring, 2, NULL), 2, int, "%d"); + ok(dst == 0x6c28, "dst = %x, expected 0x6c28\n", dst); + expect_eq(p_mbrtowc(&dst, (const char*)mbstring+2, 2, NULL), 2, int, "%d"); + ok(dst == 0x3f, "dst = %x, expected 0x3f\n", dst); + expect_eq(p_mbrtowc(&dst, (const char*)mbstring+3, 2, NULL), 1, int, "%d"); + ok(dst == 0x20, "dst = %x, expected 0x20\n", dst); + expect_eq(p_mbrtowc(&dst, (const char*)mbstring, 1, NULL), -2, int, "%d"); + ok(dst == 0, "dst = %x, expected 0\n", dst); + expect_eq(p_mbrtowc(&dst, (const char*)mbstring, 1, &state), -2, int, "%d"); + ok(dst == 0, "dst = %x, expected 0\n", dst); + ok(state == mbstring[0], "incorrect state value (%x)\n", state); + expect_eq(p_mbrtowc(&dst, (const char*)mbstring+1, 1, &state), 2, int, "%d"); + ok(dst == 0x6c28, "dst = %x, expected 0x6c28\n", dst); + ok(state == 0, "incorrect state value (%x)\n", state); + } setlocale(LC_ALL, "C"); /* _mbccpy/_mbsncpy */ @@ -2320,6 +2343,7 @@ START_TEST(string) p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob"); p_tolower = (void*)GetProcAddress(hMsvcrt, "tolower"); p_mbrlen = (void*)GetProcAddress(hMsvcrt, "mbrlen"); + p_mbrtowc = (void*)GetProcAddress(hMsvcrt, "mbrtowc"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */

1 0

Andrew Talbot : uxtheme: Remove unused variable.
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Module: wine Branch: master Commit: 925a4411e8dac1e3fd9ff3c81736a2324d50b87c URL: http://source.winehq.org/git/wine.git/?a=commit;h=925a4411e8dac1e3fd9ff3c81… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 28 20:37:26 2012 +0000 uxtheme: Remove unused variable. --- dlls/uxtheme/msstyles.c | 1 - dlls/uxtheme/system.c | 3 --- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 0adb70d..8205a12 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -48,7 +48,6 @@ static BOOL MSSTYLES_GetNextToken(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LP static void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics); static HRESULT MSSTYLES_GetFont (LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LOGFONTW* logfont); -extern HINSTANCE hDllInst; extern int alphaBlendMode; #define MSSTYLES_VERSION 0x0003 diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 6ee1dac..8947587 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -57,7 +57,6 @@ static const WCHAR szDllName[] = {'D','l','l','N','a','m','e','\0'}; static const WCHAR szIniDocumentation[] = {'d','o','c','u','m','e','n','t','a','t','i','o','n','\0'}; -DECLSPEC_HIDDEN HINSTANCE hDllInst; DECLSPEC_HIDDEN ATOM atDialogThemeEnabled; static DWORD dwThemeAppProperties = STAP_ALLOW_NONCLIENT | STAP_ALLOW_CONTROLS; @@ -537,8 +536,6 @@ void UXTHEME_InitSystem(HINSTANCE hInst) 'u','x','_','d','i','a','l','o','g','t','h','e','m','e','\0' }; - hDllInst = hInst; - atWindowTheme = GlobalAddAtomW(szWindowTheme); atSubAppName = GlobalAddAtomW(szSubAppName); atSubIdList = GlobalAddAtomW(szSubIdList);

1 0

Andrew Talbot : shdocvw: Remove unused variable.
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Module: wine Branch: master Commit: acb1d678a982972255980628772330e23a9768a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acb1d678a9829722559806287… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 28 20:37:23 2012 +0000 shdocvw: Remove unused variable. --- dlls/shdocvw/shdocvw.h | 2 -- dlls/shdocvw/shdocvw_main.c | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index e741482..341cdc5 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -50,8 +50,6 @@ extern LONG SHDOCVW_refCount DECLSPEC_HIDDEN; static inline void SHDOCVW_LockModule(void) { InterlockedIncrement( &SHDOCVW_refCount ); } static inline void SHDOCVW_UnlockModule(void) { InterlockedDecrement( &SHDOCVW_refCount ); } -extern HINSTANCE shdocvw_hinstance DECLSPEC_HIDDEN; - /* memory allocation functions */ diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index db9034c..be1588c 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -41,7 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); LONG SHDOCVW_refCount = 0; -HINSTANCE shdocvw_hinstance = 0; static HMODULE SHDOCVW_hshell32 = 0; static HINSTANCE ieframe_instance; @@ -148,7 +147,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) switch (fdwReason) { case DLL_PROCESS_ATTACH: - shdocvw_hinstance = hinst; break; case DLL_PROCESS_DETACH: if (SHDOCVW_hshell32) FreeLibrary(SHDOCVW_hshell32);

1 0