March 2011 - Wine-Commits - list.winehq.org

Konrad Rzepecki : wined3d: Implement WINED3DFMT_YUY2 to WINED3DFMT_B5G6R5_UNORM conversion function.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: e1524883c10b63d05a82624eca7fb775c69e3cd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1524883c10b63d05a82624ec… Author: Konrad Rzepecki <hannibal(a)astral.lodz.pl> Date: Sun Mar 20 11:59:46 2011 +0100 wined3d: Implement WINED3DFMT_YUY2 to WINED3DFMT_B5G6R5_UNORM conversion function. --- dlls/wined3d/surface_base.c | 44 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 74fa196..4239f69 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -782,6 +782,49 @@ static void convert_yuy2_x8r8g8b8(const BYTE *src, BYTE *dst, } } +static void convert_yuy2_r5g6b5(const BYTE *src, BYTE *dst, + DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h) +{ + unsigned int x, y; + int c2, d, e, r2 = 0, g2 = 0, b2 = 0; + + TRACE("Converting %ux%u pixels, pitches %u %u\n", w, h, pitch_in, pitch_out); + + for (y = 0; y < h; ++y) + { + const BYTE *src_line = src + y * pitch_in; + WORD *dst_line = (WORD *)(dst + y * pitch_out); + for (x = 0; x < w; ++x) + { + /* YUV to RGB conversion formulas from http://en.wikipedia.org/wiki/YUV: + * C = Y - 16; D = U - 128; E = V - 128; + * R = cliptobyte((298 * C + 409 * E + 128) >> 8); + * G = cliptobyte((298 * C - 100 * D - 208 * E + 128) >> 8); + * B = cliptobyte((298 * C + 516 * D + 128) >> 8); + * Two adjacent YUY2 pixels are stored as four bytes: Y0 U Y1 V . + * U and V are shared between the pixels. + */ + if (!(x & 1)) /* for every even pixel, read new U and V */ + { + d = (int) src_line[1] - 128; + e = (int) src_line[3] - 128; + r2 = 409 * e + 128; + g2 = - 100 * d - 208 * e + 128; + b2 = 516 * d + 128; + } + c2 = 298 * ((int) src_line[0] - 16); + dst_line[x] = (cliptobyte((c2 + r2) >> 8) >> 3) << 11 /* red */ + | (cliptobyte((c2 + g2) >> 8) >> 2) << 5 /* green */ + | (cliptobyte((c2 + b2) >> 8) >> 3); /* blue */ + /* Scale RGB values to 0..255 range, + * then clip them if still not in range (may be negative), + * then shift them within DWORD if necessary. + */ + src_line += 2; + } + } +} + struct d3dfmt_convertor_desc { enum wined3d_format_id from, to; @@ -794,6 +837,7 @@ static const struct d3dfmt_convertor_desc convertors[] = {WINED3DFMT_B5G6R5_UNORM, WINED3DFMT_B8G8R8X8_UNORM, convert_r5g6b5_x8r8g8b8}, {WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8X8_UNORM, convert_a8r8g8b8_x8r8g8b8}, {WINED3DFMT_YUY2, WINED3DFMT_B8G8R8X8_UNORM, convert_yuy2_x8r8g8b8}, + {WINED3DFMT_YUY2, WINED3DFMT_B5G6R5_UNORM, convert_yuy2_r5g6b5}, }; static inline const struct d3dfmt_convertor_desc *find_convertor(enum wined3d_format_id from, enum wined3d_format_id to)

1 0

Dmitry Timoshkov : ntdll: Add a bunch of NtCreateFile tests.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: 3998820497423dcc0a619aef8c8b3ae13f166202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3998820497423dcc0a619aef8… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 22 19:38:44 2011 +0800 ntdll: Add a bunch of NtCreateFile tests. --- dlls/ntdll/tests/file.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 98 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 58e4a4b..cc91eb6 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3,6 +3,7 @@ * Copyright 2007 Jeff Latimer * Copyright 2007 Andrey Turkin * Copyright 2008 Jeff Zaroyko + * Copyright 2011 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1554,6 +1555,102 @@ todo_wine CloseHandle( dir ); } +static void test_NtCreateFile(void) +{ + static const struct test_data + { + DWORD disposition, attrib_in, status, result, attrib_out, needs_cleanup; + } td[] = + { + /* 0*/{ FILE_CREATE, FILE_ATTRIBUTE_READONLY, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, FALSE }, + /* 1*/{ FILE_CREATE, 0, STATUS_OBJECT_NAME_COLLISION, 0, 0, TRUE }, + /* 2*/{ FILE_CREATE, 0, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE, FALSE }, + /* 3*/{ FILE_OPEN, FILE_ATTRIBUTE_READONLY, 0, FILE_OPENED, FILE_ATTRIBUTE_ARCHIVE, TRUE }, + /* 4*/{ FILE_OPEN, FILE_ATTRIBUTE_READONLY, STATUS_OBJECT_NAME_NOT_FOUND, 0, 0, FALSE }, + /* 5*/{ FILE_OPEN_IF, 0, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE, FALSE }, + /* 6*/{ FILE_OPEN_IF, FILE_ATTRIBUTE_READONLY, 0, FILE_OPENED, FILE_ATTRIBUTE_ARCHIVE, FALSE }, + /* 7*/{ FILE_OVERWRITE, FILE_ATTRIBUTE_READONLY, 0, FILE_OVERWRITTEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, FALSE }, + /* 8*/{ FILE_OVERWRITE_IF, 0, STATUS_ACCESS_DENIED, 0, 0, FALSE }, + /* 9*/{ FILE_OVERWRITE_IF, FILE_ATTRIBUTE_READONLY, 0, FILE_OVERWRITTEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, FALSE }, + /*10*/{ FILE_SUPERSEDE, 0, 0, FILE_SUPERSEDED, FILE_ATTRIBUTE_ARCHIVE, FALSE }, + /*11*/{ FILE_SUPERSEDE, FILE_ATTRIBUTE_READONLY, 0, FILE_SUPERSEDED, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, TRUE }, + /*12*/{ FILE_SUPERSEDE, FILE_ATTRIBUTE_READONLY, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, TRUE } + }; + static const WCHAR fooW[] = {'f','o','o',0}; + static const WCHAR dotW[] = {'.',0}; + NTSTATUS status; + HANDLE handle; + WCHAR path[MAX_PATH]; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + UNICODE_STRING nameW; + DWORD ret, i; + + GetTempFileNameW(dotW, fooW, 0, path); + DeleteFileW(path); + pRtlDosPathNameToNtPathName_U(path, &nameW, NULL, NULL); + + attr.Length = sizeof(attr); + attr.RootDirectory = NULL; + attr.ObjectName = &nameW; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + status = pNtCreateFile(&handle, GENERIC_READ, &attr, &io, NULL, + td[i].attrib_in, FILE_SHARE_READ|FILE_SHARE_WRITE, + td[i].disposition, 0, NULL, 0); + + /* FIXME: completely remove once Wine is fixed */ + if (td[i].status == STATUS_ACCESS_DENIED) + { + todo_wine + ok(status == td[i].status, "%d: expected %#x got %#x\n", i, td[i].status, status); + CloseHandle(handle); + SetFileAttributesW(path, FILE_ATTRIBUTE_ARCHIVE); + continue; + } + + ok(status == td[i].status, "%d: expected %#x got %#x\n", i, td[i].status, status); + + if (status == STATUS_ACCESS_DENIED) + { + SetFileAttributesW(path, FILE_ATTRIBUTE_ARCHIVE); + continue; + } + + if (!status) + { + ok(io.Information == td[i].result,"%d: expected %#x got %#lx\n", i, td[i].result, io.Information); + + ret = GetFileAttributesW(path); + ret &= ~FILE_ATTRIBUTE_NOT_CONTENT_INDEXED; + /* FIXME: leave only 'else' case below once Wine is fixed */ + if (ret != td[i].attrib_out) + { + todo_wine + ok(ret == td[i].attrib_out, "%d: expected %#x got %#x\n", i, td[i].attrib_out, ret); + SetFileAttributesW(path, td[i].attrib_out); + } + else + ok(ret == td[i].attrib_out, "%d: expected %#x got %#x\n", i, td[i].attrib_out, ret); + + CloseHandle(handle); + } + + if (td[i].needs_cleanup) + { + SetFileAttributesW(path, FILE_ATTRIBUTE_ARCHIVE); + DeleteFileW(path); + } + } + + SetFileAttributesW(path, FILE_ATTRIBUTE_ARCHIVE); + DeleteFileW( path ); +} + START_TEST(file) { HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); @@ -1590,6 +1687,7 @@ START_TEST(file) pNtQueryDirectoryFile = (void *)GetProcAddress(hntdll, "NtQueryDirectoryFile"); pNtQueryVolumeInformationFile = (void *)GetProcAddress(hntdll, "NtQueryVolumeInformationFile"); + test_NtCreateFile(); create_file_test(); open_file_test(); delete_file_test();

1 0

Joshua Beck : winex11: Improved error handling in pglXMakeCurrent() call.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: ddada6753836faac170b9613b1d237d937b41ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddada6753836faac170b9613b… Author: Joshua Beck <jxb091000(a)utdallas.edu> Date: Thu Mar 24 01:50:33 2011 -0500 winex11: Improved error handling in pglXMakeCurrent() call. --- dlls/winex11.drv/opengl.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index a9cc178..b74bc0a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -344,8 +344,11 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) else win = root; - pglXMakeCurrent(gdi_display, win, ctx); - + if(pglXMakeCurrent(gdi_display, win, ctx) == 0) + { + ERR_(winediag)( "Unable to activate OpenGL context, most likely your OpenGL drivers haven't been installed correctly\n" ); + goto done; + } WineGLInfo.glVersion = (const char *) pglGetString(GL_VERSION); str = (const char *) pglGetString(GL_EXTENSIONS); WineGLInfo.glExtensions = HeapAlloc(GetProcessHeap(), 0, strlen(str)+1);

1 0

David Hedberg : msi: Add support for patching files.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: 6771ed40e808bfaadaee49aae9cbc7092686994a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6771ed40e808bfaadaee49aae… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Tue Mar 22 20:45:11 2011 +0100 msi: Add support for patching files. --- dlls/msi/action.c | 73 ++++++++++++++++++++++--- dlls/msi/files.c | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/helpers.c | 14 +++++ dlls/msi/msipriv.h | 14 +++++ dlls/msi/package.c | 1 + include/msidefs.h | 6 ++- 6 files changed, 252 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6771ed40e808bfaadaee4…

1 0

Austin English : mshtml: Avoid shadowing a parameter.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: c199a468578d03e051c2b2972de3c88262f65993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c199a468578d03e051c2b2972… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 21 17:40:33 2011 -0700 mshtml: Avoid shadowing a parameter. --- dlls/mshtml/htmlwindow.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 656999e..695b829 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2148,22 +2148,22 @@ static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD switch(prop->type) { case GLOBAL_SCRIPTVAR: { - IDispatchEx *dispex; + IDispatchEx *iface; IDispatch *disp; disp = get_script_disp(prop->script_host); if(!disp) return E_UNEXPECTED; - hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&iface); if(SUCCEEDED(hres)) { TRACE("%s >>>\n", debugstr_w(prop->name)); - hres = IDispatchEx_InvokeEx(dispex, prop->id, lcid, flags, params, res, ei, caller); + hres = IDispatchEx_InvokeEx(iface, prop->id, lcid, flags, params, res, ei, caller); if(hres == S_OK) TRACE("%s <<<\n", debugstr_w(prop->name)); else WARN("%s <<< %08x\n", debugstr_w(prop->name), hres); - IDispatchEx_Release(dispex); + IDispatchEx_Release(iface); }else { FIXME("No IDispatchEx\n"); }

1 0

André Hentschel : cabinet: Be more verbose.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: 9701621f0ff6ed5089780e70efb8e8c5a3667f72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9701621f0ff6ed5089780e70e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 21 22:41:00 2011 +0100 cabinet: Be more verbose. --- dlls/cabinet/fdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 5fc22cd..a004c1d 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2533,7 +2533,7 @@ BOOL __cdecl FDICopy( /* check if it's really a cabfile. Note that this doesn't implement the bug */ if (!FDI_read_entries(fdi, cabhf, &fdici, &(CAB(mii)))) { - ERR("FDIIsCabinet failed.\n"); + ERR("FDIIsCabinet failed: %u.\n", fdi->perf->erfOper); fdi->free(decomp_state); fdi->close(cabhf); return FALSE;

1 0

Konrad Rzepecki : msvcrt: Implement _mbslwr_s.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: 332d5954ed0335dc54040dd67942494ae942d224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=332d5954ed0335dc54040dd67… Author: Konrad Rzepecki <hannibal(a)astral.lodz.pl> Date: Sun Mar 20 02:19:02 2011 +0100 msvcrt: Implement _mbslwr_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 40 ++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 60 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 104 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index a4589e1..1812407 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -921,7 +921,7 @@ @ stub _mbslen_l @ cdecl _mbslwr(str) msvcrt._mbslwr @ stub _mbslwr_l -@ stub _mbslwr_s +@ cdecl _mbslwr_s(str long) msvcrt._mbslwr_s @ stub _mbslwr_s_l @ cdecl _mbsnbcat(str str long) msvcrt._mbsnbcat @ stub _mbsnbcat_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b491d87..8b58e7d 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -767,7 +767,7 @@ @ stub _mbslen_l @ cdecl _mbslwr(str) msvcrt._mbslwr @ stub _mbslwr_l -@ stub _mbslwr_s +@ cdecl _mbslwr_s(str long) msvcrt._mbslwr_s @ stub _mbslwr_s_l @ cdecl _mbsnbcat(str str long) msvcrt._mbsnbcat @ stub _mbsnbcat_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index d1cae36..d18651d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -755,7 +755,7 @@ @ stub _mbslen_l @ cdecl _mbslwr(str) msvcrt._mbslwr @ stub _mbslwr_l -@ stub _mbslwr_s +@ cdecl _mbslwr_s(str long) msvcrt._mbslwr_s @ stub _mbslwr_s_l @ cdecl _mbsnbcat(str str long) msvcrt._mbsnbcat @ stub _mbsnbcat_l diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 081aa88..2a2ac72 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1544,6 +1544,46 @@ unsigned char* CDECL _mbslwr(unsigned char* s) /********************************************************************* + * _mbslwr_s(MSVCRT.@) + */ +int CDECL _mbslwr_s(unsigned char* s, MSVCRT_size_t len) +{ + if (!s && !len) + { + return 0; + } + else if (!s || !len) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + if (get_locale()->locinfo->mb_cur_max > 1) + { + unsigned int c; + for ( ; *s && len > 0; len--) + { + c = _mbctolower(_mbsnextc(s)); + /* Note that I assume that the size of the character is unchanged */ + if (c > 255) + { + *s++=(c>>8); + c=c & 0xff; + } + *s++=c; + } + } + else for ( ; *s && len > 0; s++, len--) *s = tolower(*s); + if (*s) + { + *s = '\0'; + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + return 0; +} + + +/********************************************************************* * _mbsupr(MSVCRT.@) */ unsigned char* CDECL _mbsupr(unsigned char* s) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e43c3f5..103142e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -703,7 +703,7 @@ # stub _mbslen_l @ cdecl _mbslwr(str) # stub _mbslwr_l -# stub _mbslwr_s +@ cdecl _mbslwr_s(str long) # stub _mbslwr_s_l @ cdecl _mbsnbcat(str str long) # stub _mbsnbcat_l diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index e231077..f3d8dc4 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -77,6 +77,7 @@ static unsigned char *p_mbctype; static _invalid_parameter_handler (__cdecl *p_set_invalid_parameter_handler)(_invalid_parameter_handler); static int (__cdecl *p_wcslwr_s)(wchar_t*,size_t); static errno_t (__cdecl *p_mbsupr_s)(unsigned char *str, size_t numberOfElements); +static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements); #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) @@ -1769,6 +1770,63 @@ static void test__mbsupr_s(void) } +static void test__mbslwr_s(void) +{ + errno_t ret; + unsigned char buffer[20]; + + if (!p_mbslwr_s) + { + win_skip("Skipping _mbslwr_s tests\n"); + return; + } + + errno = EBADF; + ret = p_mbslwr_s(NULL, 0); + ok(ret == 0, "Expected _mbslwr_s to return 0, got %d\n", ret); + + errno = EBADF; + ret = p_mbslwr_s(NULL, sizeof(buffer)); + ok(ret == EINVAL, "Expected _mbslwr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + errno = EBADF; + ret = p_mbslwr_s(buffer, 0); + ok(ret == EINVAL, "Expected _mbslwr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + memcpy(buffer, "ABCDEFGH", sizeof("ABCDEFGH")); + errno = EBADF; + ret = p_mbslwr_s(buffer, sizeof("ABCDEFGH")); + ok(ret == 0, "Expected _mbslwr_s to return 0, got %d\n", ret); + ok(!memcmp(buffer, "abcdefgh", sizeof("abcdefgh")), + "Expected the output buffer to be \"abcdefgh\", got \"%s\"\n", + buffer); + + memcpy(buffer, "ABCDEFGH", sizeof("ABCDEFGH")); + errno = EBADF; + ret = p_mbslwr_s(buffer, sizeof(buffer)); + ok(ret == 0, "Expected _mbslwr_s to return 0, got %d\n", ret); + ok(!memcmp(buffer, "abcdefgh", sizeof("abcdefgh")), + "Expected the output buffer to be \"abcdefgh\", got \"%s\"\n", + buffer); + + memcpy(buffer, "ABCDEFGH", sizeof("ABCDEFGH")); + errno = EBADF; + ret = p_mbslwr_s(buffer, 4); + ok(ret == EINVAL, "Expected _mbslwr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + memcpy(buffer, "ABCDEFGH\0IJKLMNOP", sizeof("ABCDEFGH\0IJKLMNOP")); + errno = EBADF; + ret = p_mbslwr_s(buffer, sizeof(buffer)); + ok(ret == 0, "Expected _mbslwr_s to return 0, got %d\n", ret); + ok(!memcmp(buffer, "abcdefgh\0IJKLMNOP", sizeof("abcdefgh\0IJKLMNOP")), + "Expected the output buffer to be \"abcdefgh\\0IJKLMNOP\", got \"%s\"\n", + buffer); + +} + static void test__ultoa_s(void) { errno_t ret; @@ -1880,6 +1938,7 @@ START_TEST(string) p_set_invalid_parameter_handler = (void *) GetProcAddress(hMsvcrt, "_set_invalid_parameter_handler"); p_wcslwr_s = (void*)GetProcAddress(hMsvcrt, "_wcslwr_s"); p_mbsupr_s = (void*)GetProcAddress(hMsvcrt, "_mbsupr_s"); + p_mbslwr_s = (void*)GetProcAddress(hMsvcrt, "_mbslwr_s"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -1921,4 +1980,5 @@ START_TEST(string) test__ultoa_s(); test__wcslwr_s(); test__mbsupr_s(); + test__mbslwr_s(); }

1 0

Konrad Rzepecki : wined3d: Prevent crash when blit_priv is NULL.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: 37aadc9e377d7840a607dbabff10de375f9fdde8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37aadc9e377d7840a607dbabf… Author: Konrad Rzepecki <hannibal(a)astral.lodz.pl> Date: Sun Mar 20 11:58:08 2011 +0100 wined3d: Prevent crash when blit_priv is NULL. --- dlls/wined3d/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 104b445..ec959cc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3924,8 +3924,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT } /* Special cases for RenderTargets */ - if ((This->resource.usage & WINED3DUSAGE_RENDERTARGET) - || (src && (src->resource.usage & WINED3DUSAGE_RENDERTARGET))) + if (This->resource.device->blit_priv && ((This->resource.usage & WINED3DUSAGE_RENDERTARGET) + || (src && (src->resource.usage & WINED3DUSAGE_RENDERTARGET)))) { if (SUCCEEDED(IWineD3DSurfaceImpl_BltOverride(This, DestRect, src, SrcRect, flags, DDBltFx, Filter))) return WINED3D_OK;

1 0

Dmitry Timoshkov : winex11.drv: Do not use any window types except _NET_WM_WINDOW_TYPE_NORMAL.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: 5ef58c11ce28c963908672f5c5c1fde866272ba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ef58c11ce28c963908672f5c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 22 15:11:40 2011 +0800 winex11.drv: Do not use any window types except _NET_WM_WINDOW_TYPE_NORMAL. Main window of the Atom Zombie Smasher game has WS_DLGFRAME style set, but Metacity allows making fullscreen ONLY normal windows, so do not use any window types except _NET_WM_WINDOW_TYPE_NORMAL. --- dlls/winex11.drv/window.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 0e55619..e2ffccc 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1169,17 +1169,7 @@ static void set_wm_hints( Display *display, struct x11drv_win_data *data ) /* size hints */ set_size_hints( display, data, style ); - /* set the WM_WINDOW_TYPE */ - if (style & WS_THICKFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); - else if (ex_style & WS_EX_APPWINDOW) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); - else if (style & WS_MINIMIZEBOX) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); - else if (style & WS_DLGFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); - else if (ex_style & WS_EX_DLGMODALFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); - /* many window managers don't handle utility windows very well, so we don't use TYPE_UTILITY here */ - else if (ex_style & WS_EX_TOOLWINDOW) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); - else if ((style & WS_POPUP) && owner) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); - else window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); - + window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_WINDOW_TYPE), XA_ATOM, 32, PropModeReplace, (unsigned char*)&window_type, 1);

1 0

Konrad Rzepecki : msvcrt: Implement _mbsupr_s.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: 0b3175cb24a6ae9c3a1f6c97c9cc24dea5b8a1c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b3175cb24a6ae9c3a1f6c97c… Author: Konrad Rzepecki <hannibal(a)astral.lodz.pl> Date: Sun Mar 20 02:17:12 2011 +0100 msvcrt: Implement _mbsupr_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 40 ++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 60 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 104 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 473f663..a4589e1 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1001,7 +1001,7 @@ @ stub _mbstrnlen_l @ cdecl _mbsupr(str) msvcrt._mbsupr @ stub _mbsupr_l -@ stub _mbsupr_s +@ cdecl _mbsupr_s(str long) msvcrt._mbsupr_s @ stub _mbsupr_s_l @ stub _mbtowc_l @ cdecl _memccpy(ptr ptr long long) msvcrt._memccpy diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 9da91db..b491d87 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -847,7 +847,7 @@ @ stub _mbstrnlen_l @ cdecl _mbsupr(str) msvcrt._mbsupr @ stub _mbsupr_l -@ stub _mbsupr_s +@ cdecl _mbsupr_s(str long) msvcrt._mbsupr_s @ stub _mbsupr_s_l @ stub _mbtowc_l @ cdecl _memccpy(ptr ptr long long) msvcrt._memccpy diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 96d4589..d1cae36 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -835,7 +835,7 @@ @ stub _mbstrnlen_l @ cdecl _mbsupr(str) msvcrt._mbsupr @ stub _mbsupr_l -@ stub _mbsupr_s +@ cdecl _mbsupr_s(str long) msvcrt._mbsupr_s @ stub _mbsupr_s_l @ stub _mbtowc_l @ cdecl _memccpy(ptr ptr long long) msvcrt._memccpy diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 5767242..081aa88 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1572,6 +1572,46 @@ unsigned char* CDECL _mbsupr(unsigned char* s) /********************************************************************* + * _mbsupr_s(MSVCRT.@) + */ +int CDECL _mbsupr_s(unsigned char* s, MSVCRT_size_t len) +{ + if (!s && !len) + { + return 0; + } + else if (!s || !len) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + if (get_locale()->locinfo->mb_cur_max > 1) + { + unsigned int c; + for ( ; *s && len > 0; len--) + { + c = _mbctoupper(_mbsnextc(s)); + /* Note that I assume that the size of the character is unchanged */ + if (c > 255) + { + *s++=(c>>8); + c=c & 0xff; + } + *s++=c; + } + } + else for ( ; *s && len > 0; s++, len--) *s = toupper(*s); + if (*s) + { + *s = '\0'; + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + return 0; +} + + +/********************************************************************* * _mbsspn (MSVCRT.@) */ MSVCRT_size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* set) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c324dea..e43c3f5 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -783,7 +783,7 @@ # stub _mbstrnlen_l @ cdecl _mbsupr(str) # stub _mbsupr_l -# stub _mbsupr_s +@ cdecl _mbsupr_s(str long) # stub _mbsupr_s_l # stub _mbtowc_l @ cdecl _memccpy(ptr ptr long long) ntdll._memccpy diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index dfa38e6..e231077 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -76,6 +76,7 @@ static int *p__mb_cur_max; static unsigned char *p_mbctype; static _invalid_parameter_handler (__cdecl *p_set_invalid_parameter_handler)(_invalid_parameter_handler); static int (__cdecl *p_wcslwr_s)(wchar_t*,size_t); +static errno_t (__cdecl *p_mbsupr_s)(unsigned char *str, size_t numberOfElements); #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) @@ -1711,6 +1712,63 @@ static void test__mbsnbcat_s(void) "Expected the output buffer string to be \"\\0inosaurdu\" without ending null terminator\n"); } +static void test__mbsupr_s(void) +{ + errno_t ret; + unsigned char buffer[20]; + + if (!p_mbsupr_s) + { + win_skip("Skipping _mbsupr_s tests\n"); + return; + } + + errno = EBADF; + ret = p_mbsupr_s(NULL, 0); + ok(ret == 0, "Expected _mbsupr_s to return 0, got %d\n", ret); + + errno = EBADF; + ret = p_mbsupr_s(NULL, sizeof(buffer)); + ok(ret == EINVAL, "Expected _mbsupr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + errno = EBADF; + ret = p_mbsupr_s(buffer, 0); + ok(ret == EINVAL, "Expected _mbsupr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + memcpy(buffer, "abcdefgh", sizeof("abcdefgh")); + errno = EBADF; + ret = p_mbsupr_s(buffer, sizeof("abcdefgh")); + ok(ret == 0, "Expected _mbsupr_s to return 0, got %d\n", ret); + ok(!memcmp(buffer, "ABCDEFGH", sizeof("ABCDEFGH")), + "Expected the output buffer to be \"ABCDEFGH\", got \"%s\"\n", + buffer); + + memcpy(buffer, "abcdefgh", sizeof("abcdefgh")); + errno = EBADF; + ret = p_mbsupr_s(buffer, sizeof(buffer)); + ok(ret == 0, "Expected _mbsupr_s to return 0, got %d\n", ret); + ok(!memcmp(buffer, "ABCDEFGH", sizeof("ABCDEFGH")), + "Expected the output buffer to be \"ABCDEFGH\", got \"%s\"\n", + buffer); + + memcpy(buffer, "abcdefgh", sizeof("abcdefgh")); + errno = EBADF; + ret = p_mbsupr_s(buffer, 4); + ok(ret == EINVAL, "Expected _mbsupr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + memcpy(buffer, "abcdefgh\0ijklmnop", sizeof("abcdefgh\0ijklmnop")); + errno = EBADF; + ret = p_mbsupr_s(buffer, sizeof(buffer)); + ok(ret == 0, "Expected _mbsupr_s to return 0, got %d\n", ret); + ok(!memcmp(buffer, "ABCDEFGH\0ijklmnop", sizeof("ABCDEFGH\0ijklmnop")), + "Expected the output buffer to be \"ABCDEFGH\\0ijklmnop\", got \"%s\"\n", + buffer); + +} + static void test__ultoa_s(void) { errno_t ret; @@ -1821,6 +1879,7 @@ START_TEST(string) p_ultoa_s = (void *)GetProcAddress(hMsvcrt, "_ultoa_s"); p_set_invalid_parameter_handler = (void *) GetProcAddress(hMsvcrt, "_set_invalid_parameter_handler"); p_wcslwr_s = (void*)GetProcAddress(hMsvcrt, "_wcslwr_s"); + p_mbsupr_s = (void*)GetProcAddress(hMsvcrt, "_mbsupr_s"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -1861,4 +1920,5 @@ START_TEST(string) test__mbsnbcat_s(); test__ultoa_s(); test__wcslwr_s(); + test__mbsupr_s(); }

1 0