Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 69991: [CRT_APITEST] - Add tests for static initialization and static constructors CORE-10562
by tfaber＠svn.reactos.org 21 Nov '15

21 Nov '15

Author: tfaber Date: Sat Nov 21 12:04:36 2015 New Revision: 69991 URL: http://svn.reactos.org/svn/reactos?rev=69991&view=rev Log: [CRT_APITEST] - Add tests for static initialization and static constructors CORE-10562 Added: trunk/rostests/apitests/crt/static_construct.cpp (with props) trunk/rostests/apitests/crt/static_init.c (with props) Modified: trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake trunk/rostests/apitests/crt/testlist.c Modified: trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/msvcrt_crt_a… ============================================================================== --- trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] Sat Nov 21 12:04:36 2015 @@ -1261,6 +1261,8 @@ # wprintf_s.c # wscanf.c # wscanf_s.c + static_construct.cpp + static_init.c ) if(ARCH STREQUAL "i386") Added: trunk/rostests/apitests/crt/static_construct.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/static_const… ============================================================================== --- trunk/rostests/apitests/crt/static_construct.cpp (added) +++ trunk/rostests/apitests/crt/static_construct.cpp [iso-8859-1] Sat Nov 21 12:04:36 2015 @@ -0,0 +1,42 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for static C++ object construction + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> + +extern "C" +{ +extern int static_init_counter; + +static int static_init_counter_at_startup; +static int static_construct_counter_at_startup; + +int static_construct_counter = 789; +} + +struct init_static +{ + int m_counter; + + init_static() : + m_counter(2) + { + static_init_counter_at_startup = static_init_counter; + static_construct_counter_at_startup = static_construct_counter; + static_construct_counter++; + } +} init_static; + +START_TEST(static_construct) +{ + ok(static_init_counter_at_startup == 123, "static_init_counter at startup: %d\n", static_init_counter_at_startup); + ok(static_construct_counter_at_startup == 789, "static_construct_counter at startup: %d\n", static_construct_counter_at_startup); + + ok(static_init_counter == 123, "static_init_counter: %d\n", static_init_counter); + + ok(static_construct_counter == 790, "static_construct_counter: %d\n", static_construct_counter); + ok(init_static.m_counter == 2, "init_static.m_counter: %d\n", init_static.m_counter); +} Propchange: trunk/rostests/apitests/crt/static_construct.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/crt/static_init.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/static_init.… ============================================================================== --- trunk/rostests/apitests/crt/static_init.c (added) +++ trunk/rostests/apitests/crt/static_init.c [iso-8859-1] Sat Nov 21 12:04:36 2015 @@ -0,0 +1,18 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for static variable initialization + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> + +extern int static_construct_counter; + +int static_init_counter = 123; + +START_TEST(static_init) +{ + ok(static_init_counter == 123, "static_init_counter: %d\n", static_init_counter); + ok(static_construct_counter == 790, "static_construct_counter: %d\n", static_construct_counter); +} Propchange: trunk/rostests/apitests/crt/static_init.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/crt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/testlist.c?r… ============================================================================== --- trunk/rostests/apitests/crt/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/testlist.c [iso-8859-1] Sat Nov 21 12:04:36 2015 @@ -17,6 +17,9 @@ extern void func_strcpy(void); extern void func_wcstombs(void); +extern void func_static_construct(void); +extern void func_static_init(void); + const struct test winetest_testlist[] = { { "_vsnprintf", func__vsnprintf }, @@ -35,6 +38,9 @@ #elif defined(TEST_MSVCRT) { "_vscprintf", func__vscprintf }, { "_vscwprintf", func__vscwprintf }, + + { "static_construct", func_static_construct }, + { "static_init", func_static_init }, #elif defined(TEST_NTDLL) { "_vscwprintf", func__vscwprintf }, #elif defined(TEST_CRTDLL)

1 0

[akhaldi] 69990: [MSVIDC32] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 21 Nov '15

21 Nov '15

Author: akhaldi Date: Sat Nov 21 10:05:28 2015 New Revision: 69990 URL: http://svn.reactos.org/svn/reactos?rev=69990&view=rev Log: [MSVIDC32] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/msvidc32/msvideo1.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msvidc32/msvideo1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvideo… ============================================================================== --- trunk/reactos/dll/win32/msvidc32/msvideo1.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvidc32/msvideo1.c [iso-8859-1] Sat Nov 21 10:05:28 2015 @@ -303,16 +303,19 @@ if( (info==NULL) || (info->dwMagic!=CRAM_MAGIC) ) return ICERR_BADPARAM; - TRACE("planes = %d\n", in->bmiHeader.biPlanes ); - TRACE("bpp = %d\n", in->bmiHeader.biBitCount ); - TRACE("height = %d\n", in->bmiHeader.biHeight ); - TRACE("width = %d\n", in->bmiHeader.biWidth ); - TRACE("compr = %x\n", in->bmiHeader.biCompression ); + TRACE("in->planes = %d\n", in->bmiHeader.biPlanes ); + TRACE("in->bpp = %d\n", in->bmiHeader.biBitCount ); + TRACE("in->height = %d\n", in->bmiHeader.biHeight ); + TRACE("in->width = %d\n", in->bmiHeader.biWidth ); + TRACE("in->compr = 0x%x\n", in->bmiHeader.biCompression ); if( ( in->bmiHeader.biCompression != CRAM_MAGIC ) && ( in->bmiHeader.biCompression != MSVC_MAGIC ) && ( in->bmiHeader.biCompression != WHAM_MAGIC ) ) + { + TRACE("can't do 0x%x compression\n", in->bmiHeader.biCompression); return ICERR_BADFORMAT; + } if( ( in->bmiHeader.biBitCount != 16 ) && ( in->bmiHeader.biBitCount != 8 ) ) @@ -324,18 +327,21 @@ /* output must be same dimensions as input */ if( out ) { - if( in->bmiHeader.biBitCount != out->bmiHeader.biBitCount ) + TRACE("out->planes = %d\n", out->bmiHeader.biPlanes ); + TRACE("out->bpp = %d\n", out->bmiHeader.biBitCount ); + TRACE("out->height = %d\n", out->bmiHeader.biHeight ); + TRACE("out->width = %d\n", out->bmiHeader.biWidth ); + if(( in->bmiHeader.biBitCount != out->bmiHeader.biBitCount ) || + ( in->bmiHeader.biPlanes != out->bmiHeader.biPlanes ) || + ( in->bmiHeader.biHeight != out->bmiHeader.biHeight ) || + ( in->bmiHeader.biWidth != out->bmiHeader.biWidth )) + { + TRACE("incompatible output requested\n"); return ICERR_BADFORMAT; - if( in->bmiHeader.biPlanes != out->bmiHeader.biPlanes ) - return ICERR_BADFORMAT; - if( in->bmiHeader.biHeight != out->bmiHeader.biHeight ) - return ICERR_BADFORMAT; - if( in->bmiHeader.biWidth != out->bmiHeader.biWidth ) - return ICERR_BADFORMAT; + } } TRACE("OK!\n"); - return ICERR_OK; } @@ -556,12 +562,15 @@ break; case ICM_COMPRESS_QUERY: + r = ICERR_BADFORMAT; + /* fall through */ + case ICM_COMPRESS_GET_FORMAT: + case ICM_COMPRESS_END: + case ICM_COMPRESS: FIXME("compression not implemented\n"); - r = ICERR_BADFORMAT; break; case ICM_CONFIGURE: - r = ICERR_UNSUPPORTED; break; default: Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Nov 21 10:05:28 2015 @@ -129,7 +129,7 @@ reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvcrt40 # Out of sync reactos/dll/win32/msvfw32 # Synced to WineStaging-1.7.55 -reactos/dll/win32/msvidc32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/msvidc32 # Synced to WineStaging-1.7.55 reactos/dll/win32/msxml # Synced to WineStaging-1.7.47 reactos/dll/win32/msxml2 # Synced to WineStaging-1.7.47 reactos/dll/win32/msxml3 # Synced to WineStaging-1.7.47

1 0

[akhaldi] 69989: [MSVFW32_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 21 Nov '15

21 Nov '15

Author: akhaldi Date: Sat Nov 21 10:03:55 2015 New Revision: 69989 URL: http://svn.reactos.org/svn/reactos?rev=69989&view=rev Log: [MSVFW32_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/msvfw32/msvfw.c Modified: trunk/rostests/winetests/msvfw32/msvfw.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvfw32/msvfw.c… ============================================================================== --- trunk/rostests/winetests/msvfw32/msvfw.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvfw32/msvfw.c [iso-8859-1] Sat Nov 21 10:03:55 2015 @@ -28,6 +28,27 @@ static void test_OpenCase(void) { HIC h; + ICINFO info; + /* Check if default handler works */ + h = ICOpen(mmioFOURCC('v','i','d','c'),0,ICMODE_DECOMPRESS); + ok(0!=h,"ICOpen(vidc.0) failed\n"); + if (h) { + info.dwSize = sizeof(info); + info.szName[0] = 0; + ICGetInfo(h, &info, sizeof(info)); + trace("The default decompressor is %s\n", wine_dbgstr_w(info.szName)); + ok(ICClose(h)==ICERR_OK,"ICClose failed\n"); + } + h = ICOpen(mmioFOURCC('v','i','d','c'),0,ICMODE_COMPRESS); + ok(0!=h || broken(h == 0),"ICOpen(vidc.0) failed\n"); /* Not present in Win8 */ + if (h) { + info.dwSize = sizeof(info); + info.szName[0] = 0; + ICGetInfo(h, &info, sizeof(info)); + trace("The default compressor is %s\n", wine_dbgstr_w(info.szName)); + ok(ICClose(h)==ICERR_OK,"ICClose failed\n"); + } + /* Open a compressor with combinations of lowercase * and uppercase compressortype and handler. */ @@ -99,7 +120,7 @@ bo.biHeight = -bo.biHeight; err = ICDecompressQuery(h, &bi, &bo); - todo_wine ok(err == ICERR_OK, "Query cvid->RGB32 height<0: %d\n", err); + ok(err == ICERR_OK, "Query cvid->RGB32 height<0: %d\n", err); bo.biHeight = -bo.biHeight; ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); @@ -120,7 +141,7 @@ if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); bo.biHeight = - bo.biHeight; h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); - todo_wine ok(h != 0, "cvid->RGB16 height<0 failed\n"); + ok(h != 0, "cvid->RGB16 height<0 failed\n"); if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); bo.biHeight = - bo.biHeight; @@ -130,7 +151,7 @@ if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); bo.biHeight = - bo.biHeight; h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); - todo_wine ok(h != 0, "cvid->RGB32 height<0 failed\n"); + ok(h != 0, "cvid->RGB32 height<0 failed\n"); if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); bo.biHeight = - bo.biHeight; @@ -191,17 +212,82 @@ bi.biCompression = BI_RGB; bo.biBitCount = bi.biBitCount = 8; h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); - todo_wine ok(h != 0, "RGB8->RGB identity failed\n"); + ok(h != 0, "RGB8->RGB identity failed\n"); if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); bi.biCompression = BI_RLE8; h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); ok(h != 0, "RLE8->RGB again failed\n"); if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); +} + +static void test_ICSeqCompress(void) +{ + /* The purpose of this test is to validate sequential frame compressing + * functions. The MRLE codec will be used because Wine supports it and + * it is present in any Windows. + */ + HIC h; + DWORD err, vidc = mmioFOURCC('v','i','d','c'), mrle = mmioFOURCC('m', 'r', 'l', 'e'); + DWORD i; + LONG frame_len; + BOOL key_frame, ret; + char *frame; + COMPVARS pc; + struct { BITMAPINFOHEADER header; RGBQUAD map[256]; } + input_header = { {sizeof(BITMAPINFOHEADER), 32, 1, 1, 8, 0, 32*8, 0, 0, 256, 256}, + {{255,0,0}, {0,255,0}, {0,0,255}, {255,255,255}}}; + PBITMAPINFO bitmap = (PBITMAPINFO) &input_header; + static BYTE input[32] = {1,2,3,3,3,3,2,3,1}; + static const BYTE output_kf[] = {1,1,1,2,4,3,0,3,2,3,1,0,23,0,0,0,0,1}, /* key frame*/ + output_nkf[] = {0,0,0,1}; /* non key frame */ + + h = ICOpen(vidc, mrle, ICMODE_COMPRESS); + ok(h != NULL, "Expected non-NULL\n"); + + pc.cbSize = sizeof(pc); + pc.dwFlags = ICMF_COMPVARS_VALID; + pc.fccType = vidc; + pc.fccHandler = mrle; + pc.hic = h; + pc.lpbiIn = NULL; + pc.lpbiOut = NULL; + pc.lpBitsOut = pc.lpBitsPrev = pc.lpState = NULL; + pc.lQ = ICQUALITY_DEFAULT; + pc.lKey = 1; + pc.lDataRate = 300; + pc.lpState = NULL; + pc.cbState = 0; + + ret = ICSeqCompressFrameStart(&pc, bitmap); + ok(ret == TRUE, "Expected TRUE\n"); + /* Check that reserved pointers were allocated */ + ok(pc.lpbiIn != NULL, "Expected non-NULL\n"); + ok(pc.lpbiOut != NULL, "Expected non-NULL\n"); + + for(i = 0; i < 9; i++) + { + frame_len = 0; + frame = ICSeqCompressFrame(&pc, 0, input, &key_frame, &frame_len); + ok(frame != NULL, "Frame[%d]: Expected non-NULL\n", i); + if (frame_len == sizeof(output_nkf)) + ok(!memcmp(output_nkf, frame, frame_len), "Frame[%d]: Contents do not match\n", i); + else if (frame_len == sizeof(output_kf)) + ok(!memcmp(output_kf, frame, frame_len), "Frame[%d]: Contents do not match\n", i); + else + ok(0, "Unknown frame size of %d byten\n", frame_len); + } + + ICSeqCompressFrameEnd(&pc); + ICCompressorFree(&pc); + /* ICCompressorFree already closed the HIC */ + err = ICClose(h); + ok(err == ICERR_BADHANDLE, "Expected -8, got %d\n", err); } START_TEST(msvfw) { test_OpenCase(); test_Locate(); -} + test_ICSeqCompress(); +}

1 0

[akhaldi] 69988: [MSVFW32] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 21 Nov '15

21 Nov '15

Author: akhaldi Date: Sat Nov 21 10:03:40 2015 New Revision: 69988 URL: http://svn.reactos.org/svn/reactos?rev=69988&view=rev Log: [MSVFW32] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/msvfw32/drawdib.c trunk/reactos/dll/win32/msvfw32/mciwnd.c trunk/reactos/dll/win32/msvfw32/msvideo_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msvfw32/drawdib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/drawdib.… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/drawdib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/drawdib.c [iso-8859-1] Sat Nov 21 10:03:40 2015 @@ -303,7 +303,8 @@ UINT wFlags) { WINE_HDD *whdd; - BOOL ret = TRUE; + BOOL ret; + int reopen = 0; TRACE("(%p,%p,%d,%d,%d,%d,%p,%p,%d,%d,%d,%d,0x%08x)\n", hdd, hdc, xDst, yDst, dxDst, dyDst, lpbi, lpBits, xSrc, ySrc, dxSrc, dySrc, wFlags); @@ -325,11 +326,25 @@ #define CHANGED(x) (whdd->x != x) - if ((!whdd->begun) || - (!(wFlags & DDF_SAME_HDC) && CHANGED(hdc)) || - (!(wFlags & DDF_SAME_DRAW) && (CHANGED(lpbi) || CHANGED(dxSrc) || CHANGED(dySrc) || CHANGED(dxDst) || CHANGED(dyDst)))) - { - TRACE("Something changed!\n"); + /* Check if anything changed from the parameters passed and our struct. + * If anything changed we need to run DrawDibBegin again to ensure we + * can support the changes. + */ + if (!whdd->begun) + reopen = 1; + else if (!(wFlags & DDF_SAME_HDC) && CHANGED(hdc)) + reopen = 2; + else if (!(wFlags & DDF_SAME_DRAW)) + { + if (CHANGED(lpbi) && memcmp(lpbi, whdd->lpbi, sizeof(*lpbi))) reopen = 3; + else if (CHANGED(dxSrc)) reopen = 4; + else if (CHANGED(dySrc)) reopen = 5; + else if (CHANGED(dxDst)) reopen = 6; + else if (CHANGED(dyDst)) reopen = 7; + } + if (reopen) + { + TRACE("Something changed (reason %d)!\n", reopen); ret = DrawDibBegin(hdd, hdc, dxDst, dyDst, lpbi, dxSrc, dySrc, 0); if (!ret) return ret; @@ -337,7 +352,14 @@ #undef CHANGED - if ((dxDst == -1) && (dyDst == -1)) + /* If source dimensions are not specified derive them from bitmap header */ + if (dxSrc == -1 && dySrc == -1) + { + dxSrc = lpbi->biWidth; + dySrc = lpbi->biHeight; + } + /* If destination dimensions are not specified derive them from source */ + if (dxDst == -1 && dyDst == -1) { dxDst = dxSrc; dyDst = dySrc; @@ -371,9 +393,10 @@ SelectPalette(hdc, whdd->hpal, FALSE); } - if (!(StretchBlt(whdd->hdc, xDst, yDst, dxDst, dyDst, whdd->hMemDC, xSrc, ySrc, dxSrc, dySrc, SRCCOPY))) - ret = FALSE; - + ret = StretchBlt(whdd->hdc, xDst, yDst, dxDst, dyDst, whdd->hMemDC, xSrc, ySrc, dxSrc, dySrc, SRCCOPY); + TRACE("Painting %dx%d at %d,%d from %dx%d at %d,%d -> %d\n", + dxDst, dyDst, xDst, yDst, dxSrc, dySrc, xSrc, ySrc, ret); + return ret; } Modified: trunk/reactos/dll/win32/msvfw32/mciwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/mciwnd.c… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/mciwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/mciwnd.c [iso-8859-1] Sat Nov 21 10:03:40 2015 @@ -1063,27 +1063,33 @@ case MCIWNDM_GETDEVICEA: { + int len = 0; + char *str = (char *)lParam; MCI_SYSINFO_PARMSA mci_sysinfo; - mci_sysinfo.lpstrReturn = (LPSTR)lParam; + mci_sysinfo.lpstrReturn = str; mci_sysinfo.dwRetSize = wParam; mwi->lasterror = mciSendCommandA(mwi->mci, MCI_SYSINFO, MCI_SYSINFO_INSTALLNAME, (DWORD_PTR)&mci_sysinfo); - TRACE("MCIWNDM_GETDEVICEA: %s\n", debugstr_an((LPSTR)lParam, wParam)); + while(len < wParam && str[len]) len++; + TRACE("MCIWNDM_GETDEVICEA: %s\n", debugstr_an(str, len)); return 0; } case MCIWNDM_GETDEVICEW: { + int len = 0; + WCHAR *str = (WCHAR *)lParam; MCI_SYSINFO_PARMSW mci_sysinfo; - mci_sysinfo.lpstrReturn = (LPWSTR)lParam; + mci_sysinfo.lpstrReturn = str; mci_sysinfo.dwRetSize = wParam; mwi->lasterror = mciSendCommandW(mwi->mci, MCI_SYSINFO, MCI_SYSINFO_INSTALLNAME, (DWORD_PTR)&mci_sysinfo); - TRACE("MCIWNDM_GETDEVICEW: %s\n", debugstr_wn((LPWSTR)lParam, wParam)); + while(len < wParam && str[len]) len++; + TRACE("MCIWNDM_GETDEVICEW: %s\n", debugstr_wn(str, len)); return 0; } Modified: trunk/reactos/dll/win32/msvfw32/msvideo_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvideo_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvideo_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/msvideo_main.c [iso-8859-1] Sat Nov 21 10:03:40 2015 @@ -38,27 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvideo); -static inline const char *wine_dbgstr_fcc( DWORD fcc ) -{ - return wine_dbg_sprintf("%c%c%c%c", - LOBYTE(LOWORD(fcc)), HIBYTE(LOWORD(fcc)), - LOBYTE(HIWORD(fcc)), HIBYTE(HIWORD(fcc))); -} - -static WINE_HIC* MSVIDEO_FirstHic /* = NULL */; - -typedef struct _reg_driver reg_driver; -struct _reg_driver -{ - DWORD fccType; - DWORD fccHandler; - DRIVERPROC proc; - LPWSTR name; - reg_driver* next; -}; - -static reg_driver* reg_driver_list = NULL; - /* This one is a macro in order to work for both ASCII and Unicode */ #define fourcc_to_string(str, fcc) do { \ (str)[0] = LOBYTE(LOWORD(fcc)); \ @@ -66,6 +45,64 @@ (str)[2] = LOBYTE(HIWORD(fcc)); \ (str)[3] = HIBYTE(HIWORD(fcc)); \ } while(0) + +static inline const char *wine_dbgstr_fcc( DWORD fcc ) +{ + char fcc_str[5]; + fourcc_to_string(fcc_str, fcc); + fcc_str[4] = '\0'; + /* Last byte may be ' ' in some cases like "DIB " */ + if (isalnum(fcc_str[0]) && isalnum(fcc_str[1]) && isalnum(fcc_str[2]) + && (isalnum(fcc_str[3]) || isspace(fcc_str[3]))) + return wine_dbg_sprintf("%s", fcc_str); + return wine_dbg_sprintf("0x%08x", fcc); +} + +static const char *wine_dbgstr_icerr( int ret ) +{ + const char *str; + if (ret <= ICERR_CUSTOM) + return wine_dbg_sprintf("ICERR_CUSTOM (%d)", ret); +#define XX(x) case (x): str = #x; break + switch (ret) + { + XX(ICERR_OK); + XX(ICERR_DONTDRAW); + XX(ICERR_NEWPALETTE); + XX(ICERR_GOTOKEYFRAME); + XX(ICERR_STOPDRAWING); + XX(ICERR_UNSUPPORTED); + XX(ICERR_BADFORMAT); + XX(ICERR_MEMORY); + XX(ICERR_INTERNAL); + XX(ICERR_BADFLAGS); + XX(ICERR_BADPARAM); + XX(ICERR_BADSIZE); + XX(ICERR_BADHANDLE); + XX(ICERR_CANTUPDATE); + XX(ICERR_ABORT); + XX(ICERR_ERROR); + XX(ICERR_BADBITDEPTH); + XX(ICERR_BADIMAGESIZE); + default: str = wine_dbg_sprintf("UNKNOWN (%d)", ret); + } +#undef XX + return str; +} + +static WINE_HIC* MSVIDEO_FirstHic /* = NULL */; + +typedef struct _reg_driver reg_driver; +struct _reg_driver +{ + DWORD fccType; + DWORD fccHandler; + DRIVERPROC proc; + LPWSTR name; + reg_driver* next; +}; + +static reg_driver* reg_driver_list = NULL; HMODULE MSVFW32_hModule; @@ -165,7 +202,7 @@ ret = SendDriverMessage(whic->hdrv, msg, lParam1, lParam2); } - TRACE(" -> 0x%08lx\n", ret); + TRACE(" -> %s\n", wine_dbgstr_icerr(ret)); return ret; } @@ -282,8 +319,8 @@ */ BOOL VFWAPI ICInfo( DWORD fccType, DWORD fccHandler, ICINFO *lpicinfo) { - TRACE("(%s,%s/%08x,%p)\n", - wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), fccHandler, lpicinfo); + TRACE("(%s,%s,%p)\n", + wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), lpicinfo); lpicinfo->fccType = fccType; lpicinfo->fccHandler = fccHandler; @@ -391,6 +428,27 @@ TRACE("(%s,%s,0x%08x)\n", wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), wMode); + if (!fccHandler) /* No specific handler, return the first valid for wMode */ + { + HIC local; + ICINFO info; + DWORD loop = 0; + info.dwSize = sizeof(info); + while(ICInfo(fccType, loop++, &info)) + { + /* Ensure fccHandler is not 0x0 because we will recurse on ICOpen */ + if(!info.fccHandler) + continue; + local = ICOpen(fccType, info.fccHandler, wMode); + if (local != 0) + { + TRACE("Returning %s as defult handler for %s\n", + wine_dbgstr_fcc(info.fccHandler), wine_dbgstr_fcc(fccType)); + return local; + } + } + } + /* Check if there is a registered driver that matches */ driver = reg_driver_list; while(driver) @@ -403,22 +461,22 @@ driver = driver->next; if (driver && driver->proc) - /* The driver has been registered at runtime with its driverproc */ + /* The driver has been registered at runtime with its driverproc */ return ICOpenFunction(fccType, fccHandler, wMode, driver->proc); /* Well, lParam2 is in fact a LPVIDEO_OPEN_PARMS, but it has the * same layout as ICOPEN */ - icopen.dwSize = sizeof(ICOPEN); - icopen.fccType = fccType; - icopen.fccHandler = fccHandler; - icopen.dwVersion = 0x00001000; /* FIXME */ - icopen.dwFlags = wMode; - icopen.dwError = 0; - icopen.pV1Reserved = NULL; - icopen.pV2Reserved = NULL; - icopen.dnDevNode = 0; /* FIXME */ - + icopen.dwSize = sizeof(ICOPEN); + icopen.fccType = fccType; + icopen.fccHandler = fccHandler; + icopen.dwVersion = 0x00001000; /* FIXME */ + icopen.dwFlags = wMode; + icopen.dwError = 0; + icopen.pV1Reserved = NULL; + icopen.pV2Reserved = NULL; + icopen.dnDevNode = 0; /* FIXME */ + if (!driver) { /* normalize to lower case as in 'vidc' */ ((char*)&fccType)[0] = tolower(((char*)&fccType)[0]); @@ -427,13 +485,13 @@ ((char*)&fccType)[3] = tolower(((char*)&fccType)[3]); icopen.fccType = fccType; /* Seek the driver in the registry */ - fourcc_to_string(codecname, fccType); + fourcc_to_string(codecname, fccType); codecname[4] = '.'; - fourcc_to_string(codecname + 5, fccHandler); + fourcc_to_string(codecname + 5, fccHandler); codecname[9] = '\0'; hdrv = OpenDriver(codecname, drv32W, (LPARAM)&icopen); - if (!hdrv) + if (!hdrv) return 0; } else { /* The driver has been registered at runtime with its name */ @@ -472,15 +530,15 @@ TRACE("(%s,%s,%d,%p)\n", wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), wMode, lpfnHandler); - icopen.dwSize = sizeof(ICOPEN); - icopen.fccType = fccType; - icopen.fccHandler = fccHandler; - icopen.dwVersion = ICVERSION; - icopen.dwFlags = wMode; - icopen.dwError = 0; - icopen.pV1Reserved = NULL; - icopen.pV2Reserved = NULL; - icopen.dnDevNode = 0; /* FIXME */ + icopen.dwSize = sizeof(ICOPEN); + icopen.fccType = fccType; + icopen.fccHandler = fccHandler; + icopen.dwVersion = ICVERSION; + icopen.dwFlags = wMode; + icopen.dwError = 0; + icopen.pV1Reserved = NULL; + icopen.pV2Reserved = NULL; + icopen.dnDevNode = 0; /* FIXME */ whic = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_HIC)); if (!whic) return 0; @@ -556,7 +614,7 @@ lstrcpyW(picinfo->szDriver, ii.szDriver); } - TRACE(" -> 0x%08lx\n", ret); + TRACE(" -> %s\n", wine_dbgstr_icerr(ret)); return ret; } @@ -641,8 +699,8 @@ if (fccType == streamtypeVIDEO) return ICLocate(ICTYPE_VIDEO, fccHandler, lpbiIn, lpbiOut, wMode); - WARN("(%s,%s,%p,%p,0x%04x) not found!\n", - wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), lpbiIn, lpbiOut, wMode); + ERR("Required media codec '%s %s' not found!\n", + wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler)); return 0; } @@ -753,7 +811,7 @@ icd.ckid = 0; ret = ICSendMessage(hic,ICM_DECOMPRESS,(DWORD_PTR)&icd,sizeof(ICDECOMPRESS)); - TRACE("-> %d\n",ret); + TRACE("-> %s\n",wine_dbgstr_icerr(ret)); return ret; } @@ -1358,7 +1416,7 @@ if (pc->lKey && pc->lKeyCount == (pc->lKey - 1)) /* No key frames if pc->lKey == 0 */ pc->lKeyCount = 0; - icComp->dwFlags = 0; + icComp->dwFlags = 0; } icComp->lpInput = lpBits; @@ -1367,46 +1425,56 @@ icComp->lpPrev = pc->lpBitsPrev; ret = ICSendMessage(pc->hic, ICM_COMPRESS, (DWORD_PTR)icComp, sizeof(*icComp)); - if (icComp->dwFlags & AVIIF_KEYFRAME) - { - pc->lKeyCount = 1; - *pfKey = TRUE; - TRACE("Key frame\n"); - } - else - *pfKey = FALSE; - - *plSize = icComp->lpbiOutput->biSizeImage; - TRACE(" -- 0x%08x\n", ret); if (ret == ICERR_OK) { - LPVOID oldprev, oldout; -/* We shift Prev and Out, so we don't have to allocate and release memory */ - oldprev = pc->lpBitsPrev; - oldout = pc->lpBitsOut; - pc->lpBitsPrev = oldout; - pc->lpBitsOut = oldprev; - - TRACE("returning: %p\n", icComp->lpOutput); - return icComp->lpOutput; + LPVOID oldprev, oldout; + + if (icComp->dwFlags & AVIIF_KEYFRAME) + { + pc->lKeyCount = 1; + *pfKey = TRUE; + TRACE("Key frame\n"); + } + else + *pfKey = FALSE; + + *plSize = icComp->lpbiOutput->biSizeImage; + + /* We shift Prev and Out, so we don't have to allocate and release memory */ + oldprev = pc->lpBitsPrev; + oldout = pc->lpBitsOut; + pc->lpBitsPrev = oldout; + pc->lpBitsOut = oldprev; + + TRACE("returning: %p, compressed frame size %u\n", icComp->lpOutput, *plSize); + return icComp->lpOutput; } return NULL; } -/*********************************************************************** - * ICSeqCompressFrameEnd [MSVFW32.@] - */ -void VFWAPI ICSeqCompressFrameEnd(PCOMPVARS pc) -{ - DWORD ret; - TRACE("(%p)\n", pc); - ret = ICSendMessage(pc->hic, ICM_COMPRESS_END, 0, 0); - TRACE(" -- %x\n", ret); +static void clear_compvars(PCOMPVARS pc) +{ HeapFree(GetProcessHeap(), 0, pc->lpbiIn); HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev); HeapFree(GetProcessHeap(), 0, pc->lpBitsOut); HeapFree(GetProcessHeap(), 0, pc->lpState); pc->lpbiIn = pc->lpBitsPrev = pc->lpBitsOut = pc->lpState = NULL; + if (pc->dwFlags & 0x80000000) + { + HeapFree(GetProcessHeap(), 0, pc->lpbiOut); + pc->lpbiOut = NULL; + pc->dwFlags &= ~0x80000000; + } +} + +/*********************************************************************** + * ICSeqCompressFrameEnd [MSVFW32.@] + */ +void VFWAPI ICSeqCompressFrameEnd(PCOMPVARS pc) +{ + TRACE("(%p)\n", pc); + ICSendMessage(pc->hic, ICM_COMPRESS_END, 0, 0); + clear_compvars(pc); } /*********************************************************************** @@ -1418,68 +1486,106 @@ * it doesn't appear to be used though */ DWORD ret; + ICCOMPRESS* icComp; pc->lpbiIn = HeapAlloc(GetProcessHeap(), 0, sizeof(BITMAPINFO)); if (!pc->lpbiIn) return FALSE; *pc->lpbiIn = *lpbiIn; - pc->lpBitsPrev = HeapAlloc(GetProcessHeap(), 0, pc->lpbiIn->bmiHeader.biSizeImage); + + pc->lpState = HeapAlloc(GetProcessHeap(), 0, sizeof(ICCOMPRESS) + + sizeof(*icComp->lpckid) + sizeof(*icComp->lpdwFlags)); + if (!pc->lpState) + goto error; + + pc->cbState = sizeof(ICCOMPRESS); + + if (!pc->lpbiOut) + { + /* Ask compressor for needed header size */ + int size = ICSendMessage(pc->hic, ICM_COMPRESS_GET_FORMAT, + (DWORD_PTR)pc->lpbiIn, 0); + if (size <= 0) + goto error; + + pc->lpbiOut = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (!pc->lpbiOut) + goto error; + /* Flag to show that we allocated lpbiOut for proper cleanup */ + pc->dwFlags |= 0x80000000; + + ret = ICSendMessage(pc->hic, ICM_COMPRESS_GET_FORMAT, + (DWORD_PTR)pc->lpbiIn, (DWORD_PTR)pc->lpbiOut); + if (ret != ICERR_OK) + { + ERR("Could not get output format from compressor\n"); + goto error; + } + if (!pc->lpbiOut->bmiHeader.biSizeImage) + { + /* If we can't know the output frame size for sure at least allocate + * the same size of the input frame and also at least 8Kb to be sure + * that poor compressors will have enough memory to work if the input + * frame is too small. + */ + pc->lpbiOut->bmiHeader.biSizeImage = max(8192, pc->lpbiIn->bmiHeader.biSizeImage); + ERR("Bad codec! Invalid output frame size, guessing from input\n"); + } + } + + TRACE("Input: %ux%u, fcc %s, bpp %u, size %u\n", + pc->lpbiIn->bmiHeader.biWidth, pc->lpbiIn->bmiHeader.biHeight, + wine_dbgstr_fcc(pc->lpbiIn->bmiHeader.biCompression), + pc->lpbiIn->bmiHeader.biBitCount, + pc->lpbiIn->bmiHeader.biSizeImage); + TRACE("Output: %ux%u, fcc %s, bpp %u, size %u\n", + pc->lpbiOut->bmiHeader.biWidth, pc->lpbiOut->bmiHeader.biHeight, + wine_dbgstr_fcc(pc->lpbiOut->bmiHeader.biCompression), + pc->lpbiOut->bmiHeader.biBitCount, + pc->lpbiOut->bmiHeader.biSizeImage); + + /* Buffer for compressed frame data */ + pc->lpBitsOut = HeapAlloc(GetProcessHeap(), 0, pc->lpbiOut->bmiHeader.biSizeImage); + if (!pc->lpBitsOut) + goto error; + + /* Buffer for previous compressed frame data */ + pc->lpBitsPrev = HeapAlloc(GetProcessHeap(), 0, pc->lpbiOut->bmiHeader.biSizeImage); if (!pc->lpBitsPrev) - { - HeapFree(GetProcessHeap(), 0, pc->lpbiIn); - return FALSE; - } - - pc->lpState = HeapAlloc(GetProcessHeap(), 0, sizeof(ICCOMPRESS)); - if (!pc->lpState) - { - HeapFree(GetProcessHeap(), 0, pc->lpbiIn); - HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev); - return FALSE; - } - pc->cbState = sizeof(ICCOMPRESS); - - pc->lpBitsOut = HeapAlloc(GetProcessHeap(), 0, pc->lpbiIn->bmiHeader.biSizeImage); - if (!pc->lpBitsOut) - { - HeapFree(GetProcessHeap(), 0, pc->lpbiIn); - HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev); - HeapFree(GetProcessHeap(), 0, pc->lpState); - return FALSE; - } + goto error; + TRACE("Compvars:\n" - "\tpc:\n" "\tsize: %i\n" - "\tflags: %i\n" + "\tflags: 0x%x\n" "\thic: %p\n" - "\ttype: %x\n" - "\thandler: %x\n" + "\ttype: %s\n" + "\thandler: %s\n" "\tin/out: %p/%p\n" - "key/data/quality: %i/%i/%i\n", - pc->cbSize, pc->dwFlags, pc->hic, pc->fccType, pc->fccHandler, - pc->lpbiIn, pc->lpbiOut, pc->lKey, pc->lDataRate, pc->lQ); + "\tkey/data/quality: %i/%i/%i\n", + pc->cbSize, pc->dwFlags, pc->hic, wine_dbgstr_fcc(pc->fccType), + wine_dbgstr_fcc(pc->fccHandler), pc->lpbiIn, pc->lpbiOut, pc->lKey, + pc->lDataRate, pc->lQ); ret = ICSendMessage(pc->hic, ICM_COMPRESS_BEGIN, (DWORD_PTR)pc->lpbiIn, (DWORD_PTR)pc->lpbiOut); - TRACE(" -- %x\n", ret); if (ret == ICERR_OK) { - ICCOMPRESS* icComp = pc->lpState; - /* Initialise some variables */ - pc->lFrame = 0; pc->lKeyCount = 0; - - icComp->lpbiOutput = &pc->lpbiOut->bmiHeader; - icComp->lpbiInput = &pc->lpbiIn->bmiHeader; - icComp->lpckid = NULL; - icComp->dwFrameSize = 0; - icComp->dwQuality = pc->lQ; - icComp->lpbiPrev = &pc->lpbiIn->bmiHeader; - return TRUE; - } - HeapFree(GetProcessHeap(), 0, pc->lpbiIn); - HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev); - HeapFree(GetProcessHeap(), 0, pc->lpState); - HeapFree(GetProcessHeap(), 0, pc->lpBitsOut); - pc->lpBitsPrev = pc->lpbiIn = pc->lpState = pc->lpBitsOut = NULL; + icComp = pc->lpState; + /* Initialise some variables */ + pc->lFrame = 0; pc->lKeyCount = 0; + + icComp->lpbiOutput = &pc->lpbiOut->bmiHeader; + icComp->lpbiInput = &pc->lpbiIn->bmiHeader; + icComp->lpckid = (DWORD *)(icComp + 1); + *icComp->lpckid = 0; + icComp->lpdwFlags = (DWORD *)((char *)(icComp + 1) + sizeof(*icComp->lpckid)); + *icComp->lpdwFlags = 0; + icComp->dwFrameSize = 0; + icComp->dwQuality = pc->lQ; + icComp->lpbiPrev = &pc->lpbiIn->bmiHeader; + return TRUE; + } +error: + clear_compvars(pc); return FALSE; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Nov 21 10:03:40 2015 @@ -128,7 +128,7 @@ reactos/dll/win32/mstask # Synced to WineStaging-1.7.47 reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvcrt40 # Out of sync -reactos/dll/win32/msvfw32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/msvfw32 # Synced to WineStaging-1.7.55 reactos/dll/win32/msvidc32 # Synced to WineStaging-1.7.47 reactos/dll/win32/msxml # Synced to WineStaging-1.7.47 reactos/dll/win32/msxml2 # Synced to WineStaging-1.7.47

1 0

[akhaldi] 69987: [MSRLE32_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 21 Nov '15

21 Nov '15

Author: akhaldi Date: Sat Nov 21 10:00:13 2015 New Revision: 69987 URL: http://svn.reactos.org/svn/reactos?rev=69987&view=rev Log: [MSRLE32_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/msrle32/msrle.c Modified: trunk/rostests/winetests/msrle32/msrle.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msrle32/msrle.c… ============================================================================== --- trunk/rostests/winetests/msrle32/msrle.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msrle32/msrle.c [iso-8859-1] Sat Nov 21 10:00:13 2015 @@ -99,7 +99,68 @@ ICClose(hic); } +static void test_raw_decompress(void) +{ + DWORD codecs[] = {FCC('D', 'I', 'B', ' '), FCC('R', 'A', 'W', ' '), + FCC('M', 'R', 'L', 'E'), BI_RGB}, i, hr; + BITMAPINFO bi; + BITMAPINFOHEADER *bih, biho; + HIC hic; + ICINFO codec_info; + void *bits, *outbits; + + /* Create an uncompressed 200x200 bitmap */ + bih = &bi.bmiHeader; + bih->biSize = sizeof(*bih); + bih->biWidth = 200; + bih->biHeight = 200; + bih->biPlanes = 1; + bih->biBitCount = 24; + bih->biCompression = BI_RGB; + bih->biSizeImage = bih->biWidth * (bih->biBitCount / 8) * bih->biHeight; + bih->biXPelsPerMeter = 10000; + bih->biYPelsPerMeter = 10000; + bih->biClrUsed = 0; + bih->biClrImportant = 0; + biho = *bih; + + bits = HeapAlloc(GetProcessHeap(), 0, bih->biSizeImage); + ok(bits != NULL, "Expected non-NULL value\n"); + outbits = HeapAlloc(GetProcessHeap(), 0, bih->biSizeImage); + ok(outbits != NULL, "Expected non-NULL value\n"); + + for (i = 0; i < sizeof(codecs) / sizeof(codecs[0]); i++) + { + memset(bits, i + 0xAF, bih->biSizeImage); + + /* Check which codec is able to decompress uncompressed data */ + hic = ICLocate(FCC('V', 'I', 'D', 'C'), codecs[i], bih, NULL, ICMODE_DECOMPRESS); + ok(hic != NULL, "Test[%d]: Expected non-NULL return\n", i); + + /* Now wich is this codec? Windows returns MRLE for uncompressed cases */ + memset(&codec_info, 0, sizeof(codec_info)); + hr = ICGetInfo(hic, &codec_info, sizeof(codec_info)); + ok(hr == sizeof(codec_info), "Test[%d]: Incorrect amount of data returned\n", i); + ok(codec_info.fccType == FCC('v', 'i', 'd', 'c'), + "Test[%d]: Expected a video type, got 0x%x\n", i, codec_info.fccType); + ok(codec_info.fccHandler == FCC('M', 'R', 'L', 'E'), + "Test[%d]: Expected MRLE, got 0x%x\n", i, codec_info.fccHandler); + + /* Decompress the frame and check if we get the same output */ + memset(outbits, 0, bih->biSizeImage); + hr = ICDecompress(hic, 0, bih, bits, &biho, outbits); + ok(hr == ICERR_OK, "Test[%d]: Expected ICERR_OK, got %d\n", i, hr); + ok(!memcmp(bits, outbits, bih->biSizeImage), "Test[%d]: Image contents do not match!\n", i); + + hr = ICClose(hic); + ok(hr == ICERR_OK, "Test[%d]: Expected ICERR_OK, got %d\n", i, hr); + } + HeapFree(GetProcessHeap(), 0, bits); + HeapFree(GetProcessHeap(), 0, outbits); +} + START_TEST(msrle) { test_encode(); + test_raw_decompress(); }

1 0

[akhaldi] 69986: [MSRLE32] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 21 Nov '15

21 Nov '15

Author: akhaldi Date: Sat Nov 21 09:59:56 2015 New Revision: 69986 URL: http://svn.reactos.org/svn/reactos?rev=69986&view=rev Log: [MSRLE32] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/msrle32/msrle32.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msrle32/msrle32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle32.… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle32.c [iso-8859-1] Sat Nov 21 09:59:56 2015 @@ -1596,7 +1596,7 @@ /* check input format if given */ if (lpbiIn != NULL) { - if (!isSupportedMRLE(lpbiIn)) + if (!isSupportedMRLE(lpbiIn) && !isSupportedDIB(lpbiIn)) return ICERR_BADFORMAT; } @@ -1607,11 +1607,11 @@ if (lpbiIn != NULL) { if (lpbiIn->biWidth != lpbiOut->biWidth) - hr = ICERR_UNSUPPORTED; + hr = ICERR_UNSUPPORTED; if (lpbiIn->biHeight != lpbiOut->biHeight) - hr = ICERR_UNSUPPORTED; + hr = ICERR_UNSUPPORTED; if (lpbiIn->biBitCount > lpbiOut->biBitCount) - hr = ICERR_UNSUPPORTED; + hr = ICERR_UNSUPPORTED; } } @@ -1645,49 +1645,51 @@ if (pi->bDecompress) DecompressEnd(pi); - rgbIn = (const RGBQUAD*)((const BYTE*)lpbiIn + lpbiIn->biSize); - rgbOut = (const RGBQUAD*)((const BYTE*)lpbiOut + lpbiOut->biSize); - - switch (lpbiOut->biBitCount) { - case 4: - case 8: - pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed); - if (pi->palette_map == NULL) - return ICERR_MEMORY; - - for (i = 0; i < lpbiIn->biClrUsed; i++) { - pi->palette_map[i] = MSRLE32_GetNearestPaletteIndex(lpbiOut->biClrUsed, rgbOut, rgbIn[i]); - } - break; - case 15: - case 16: - pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed * 2); - if (pi->palette_map == NULL) - return ICERR_MEMORY; - - for (i = 0; i < lpbiIn->biClrUsed; i++) { - WORD color; - - if (lpbiOut->biBitCount == 15) - color = ((rgbIn[i].rgbRed >> 3) << 10) - | ((rgbIn[i].rgbGreen >> 3) << 5) | (rgbIn[i].rgbBlue >> 3); - else - color = ((rgbIn[i].rgbRed >> 3) << 11) - | ((rgbIn[i].rgbGreen >> 3) << 5) | (rgbIn[i].rgbBlue >> 3); - - pi->palette_map[i * 2 + 1] = color >> 8; - pi->palette_map[i * 2 + 0] = color & 0xFF; + if (lpbiIn->biCompression != BI_RGB) + { + rgbIn = (const RGBQUAD*)((const BYTE*)lpbiIn + lpbiIn->biSize); + rgbOut = (const RGBQUAD*)((const BYTE*)lpbiOut + lpbiOut->biSize); + + switch (lpbiOut->biBitCount) { + case 4: + case 8: + pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed); + if (pi->palette_map == NULL) + return ICERR_MEMORY; + + for (i = 0; i < lpbiIn->biClrUsed; i++) { + pi->palette_map[i] = MSRLE32_GetNearestPaletteIndex(lpbiOut->biClrUsed, rgbOut, rgbIn[i]); + } + break; + case 15: + case 16: + pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed * 2); + if (pi->palette_map == NULL) + return ICERR_MEMORY; + + for (i = 0; i < lpbiIn->biClrUsed; i++) { + WORD color; + + if (lpbiOut->biBitCount == 15) + color = ((rgbIn[i].rgbRed >> 3) << 10) + | ((rgbIn[i].rgbGreen >> 3) << 5) | (rgbIn[i].rgbBlue >> 3); + else + color = ((rgbIn[i].rgbRed >> 3) << 11) + | ((rgbIn[i].rgbGreen >> 3) << 5) | (rgbIn[i].rgbBlue >> 3); + + pi->palette_map[i * 2 + 1] = color >> 8; + pi->palette_map[i * 2 + 0] = color & 0xFF; + }; + break; + case 24: + case 32: + pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed * sizeof(RGBQUAD)); + if (pi->palette_map == NULL) + return ICERR_MEMORY; + memcpy(pi->palette_map, rgbIn, lpbiIn->biClrUsed * sizeof(RGBQUAD)); + break; }; - break; - case 24: - case 32: - pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed * sizeof(RGBQUAD)); - if (pi->palette_map == NULL) - return ICERR_MEMORY; - memcpy(pi->palette_map, rgbIn, lpbiIn->biClrUsed * sizeof(RGBQUAD)); - break; - }; - + } pi->bDecompress = TRUE; return ICERR_OK; @@ -1717,6 +1719,14 @@ assert(pic->lpbiInput->biWidth == pic->lpbiOutput->biWidth); assert(pic->lpbiInput->biHeight == pic->lpbiOutput->biHeight); + + /* Uncompressed frame? */ + if (pic->lpbiInput->biCompression == BI_RGB) + { + pic->lpbiOutput->biSizeImage = pic->lpbiInput->biSizeImage; + memcpy(pic->lpOutput, pic->lpInput, pic->lpbiOutput->biSizeImage); + return ICERR_OK; + } pic->lpbiOutput->biSizeImage = DIBWIDTHBYTES(*pic->lpbiOutput) * pic->lpbiOutput->biHeight; if (pic->lpbiInput->biBitCount == 4) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Nov 21 09:59:56 2015 @@ -122,7 +122,7 @@ reactos/dll/win32/msisys.ocx # Synced to WineStaging-1.7.47 reactos/dll/win32/msnet32 # Synced to WineStaging-1.7.47 reactos/dll/win32/mspatcha # Synced to WineStaging-1.7.47 -reactos/dll/win32/msrle32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/msrle32 # Synced to WineStaging-1.7.55 reactos/dll/win32/mssign32 # Synced to WineStaging-1.7.47 reactos/dll/win32/mssip32 # Synced to WineStaging-1.7.47 reactos/dll/win32/mstask # Synced to WineStaging-1.7.47

1 0

[akhaldi] 69985: [WINTRUST_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 21 Nov '15

21 Nov '15

Author: akhaldi Date: Sat Nov 21 09:52:21 2015 New Revision: 69985 URL: http://svn.reactos.org/svn/reactos?rev=69985&view=rev Log: [WINTRUST_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/wintrust/softpub.c Modified: trunk/rostests/winetests/wintrust/softpub.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/softpu… ============================================================================== --- trunk/rostests/winetests/wintrust/softpub.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wintrust/softpub.c [iso-8859-1] Sat Nov 21 09:52:21 2015 @@ -544,6 +544,7 @@ CRYPT_PROVIDER_DATA data = { 0 }; CRYPT_PROVIDER_SGNR sgnr = { sizeof(sgnr), { 0 } }; HRESULT ret; + BOOL b; if (!CertFreeCertificateChain_p) { @@ -563,8 +564,8 @@ ok(data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV] == TRUST_E_NOSIGNATURE, "Expected TRUST_E_NOSIGNATURE, got %08x\n", data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV]); - ret = funcs->pfnAddSgnr2Chain(&data, FALSE, 0, &sgnr); - if (ret) + b = funcs->pfnAddSgnr2Chain(&data, FALSE, 0, &sgnr); + if (b) { PCCERT_CONTEXT cert; @@ -577,8 +578,8 @@ { WINTRUST_DATA wintrust_data = { 0 }; - ret = funcs->pfnAddCert2Chain(&data, 0, FALSE, 0, cert); - ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); + b = funcs->pfnAddCert2Chain(&data, 0, FALSE, 0, cert); + ok(b == TRUE, "Expected TRUE, got %d\n", b); /* If pWintrustData isn't set, crashes attempting to access * pWintrustData->fdwRevocationChecks

1 0

[akhaldi] 69984: [WINTRUST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 21 Nov '15

21 Nov '15

Author: akhaldi Date: Sat Nov 21 09:52:04 2015 New Revision: 69984 URL: http://svn.reactos.org/svn/reactos?rev=69984&view=rev Log: [WINTRUST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/wintrust/register.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wintrust/register.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/registe… ============================================================================== --- trunk/reactos/dll/win32/wintrust/register.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/register.c [iso-8859-1] Sat Nov 21 09:52:04 2015 @@ -945,6 +945,8 @@ HRESULT CryptRegisterRes = S_OK; HRESULT TrustProviderRes = S_OK; HRESULT SIPAddProviderRes = S_OK; + HCRYPTPROV crypt_provider; + BOOL ret; TRACE("\n"); @@ -1062,6 +1064,11 @@ * a trust provider without a diagnostic policy). */ + /* Create a dummy context to force creation of the MachineGuid registry key. */ + ret = CryptAcquireContextW(&crypt_provider, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + if (ret) CryptReleaseContext(crypt_provider, 0); + else ERR("Failed to acquire cryptographic context: %u\n", GetLastError()); + /* If CryptRegisterRes is not S_OK it will always overrule the return value. */ if (CryptRegisterRes != S_OK) return CryptRegisterRes; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Nov 21 09:52:04 2015 @@ -210,7 +210,7 @@ reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 reactos/dll/win32/winscard # Synced to WineStaging-1.7.47 -reactos/dll/win32/wintrust # Synced to WineStaging-1.7.47 +reactos/dll/win32/wintrust # Synced to WineStaging-1.7.55 reactos/dll/win32/wldap32 # Synced to WineStaging-1.7.47 reactos/dll/win32/wmi # Synced to WineStaging-1.7.47 reactos/dll/win32/wmiutils # Synced to WineStaging-1.7.55

1 0

[akhaldi] 69983: [WMIUTLS] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 21 Nov '15

21 Nov '15

Author: akhaldi Date: Sat Nov 21 09:44:42 2015 New Revision: 69983 URL: http://svn.reactos.org/svn/reactos?rev=69983&view=rev Log: [WMIUTLS] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/wmiutils/path.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wmiutils/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmiutils/path.c?… ============================================================================== --- trunk/reactos/dll/win32/wmiutils/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wmiutils/path.c [iso-8859-1] Sat Nov 21 09:44:42 2015 @@ -1211,7 +1211,7 @@ LPWSTR wszNamespace) { FIXME("%p, %s, %s\n", iface, debugstr_w(wszMachine), debugstr_w(wszNamespace)); - return E_NOTIMPL; + return FALSE; } static BOOL WINAPI path_IsRelativeOrChild( @@ -1221,7 +1221,7 @@ LONG lFlags) { FIXME("%p, %s, %s, 0x%x\n", iface, debugstr_w(wszMachine), debugstr_w(wszNamespace), lFlags); - return E_NOTIMPL; + return FALSE; } static BOOL WINAPI path_IsLocal( @@ -1229,7 +1229,7 @@ LPCWSTR wszMachine) { FIXME("%p, %s\n", iface, debugstr_w(wszMachine)); - return E_NOTIMPL; + return FALSE; } static BOOL WINAPI path_IsSameClassName( @@ -1237,7 +1237,7 @@ LPCWSTR wszClass) { FIXME("%p, %s\n", iface, debugstr_w(wszClass)); - return E_NOTIMPL; + return FALSE; } static const struct IWbemPathVtbl path_vtbl = Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Nov 21 09:44:42 2015 @@ -213,7 +213,7 @@ reactos/dll/win32/wintrust # Synced to WineStaging-1.7.47 reactos/dll/win32/wldap32 # Synced to WineStaging-1.7.47 reactos/dll/win32/wmi # Synced to WineStaging-1.7.47 -reactos/dll/win32/wmiutils # Synced to WineStaging-1.7.47 +reactos/dll/win32/wmiutils # Synced to WineStaging-1.7.55 reactos/dll/win32/wmvcore # Synced to WineStaging-1.7.47 reactos/dll/win32/wshom.ocx # Synced to WineStaging-1.7.55 reactos/dll/win32/wtsapi32 # Synced to WineStaging-1.7.47

1 0

[akhaldi] 69982: [WING32] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 21 Nov '15

21 Nov '15

Author: akhaldi Date: Sat Nov 21 09:42:24 2015 New Revision: 69982 URL: http://svn.reactos.org/svn/reactos?rev=69982&view=rev Log: [WING32] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/wing32/wing32.c trunk/reactos/dll/win32/wing32/wing32.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wing32/wing32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wing32/wing32.c?… ============================================================================== --- trunk/reactos/dll/win32/wing32/wing32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wing32/wing32.c [iso-8859-1] Sat Nov 21 09:42:24 2015 @@ -26,21 +26,21 @@ /*********************************************************************** * WinGCreateDC (WING32.@) */ -HDC CALLBACK WinGCreateDC( void ) +HDC WINAPI WinGCreateDC( void ) { - return CreateCompatibleDC( NULL ); + return CreateCompatibleDC( 0 ); } /*********************************************************************** * WinGRecommendDIBFormat (WING32.@) */ -BOOL CALLBACK WinGRecommendDIBFormat( BITMAPINFO *bmi ) +BOOL WINAPI WinGRecommendDIBFormat( BITMAPINFO *bmi ) { if (!bmi) return FALSE; bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); bmi->bmiHeader.biWidth = 320; - bmi->bmiHeader.biHeight = -1; + bmi->bmiHeader.biHeight = 1; bmi->bmiHeader.biPlanes = 1; bmi->bmiHeader.biBitCount = 8; bmi->bmiHeader.biCompression = BI_RGB; @@ -56,23 +56,21 @@ /*********************************************************************** * WinGCreateBitmap (WING32.@) */ -HBITMAP CALLBACK WinGCreateBitmap( HDC hdc, BITMAPINFO *bmi, void **bits ) +HBITMAP WINAPI WinGCreateBitmap( HDC hdc, BITMAPINFO *bmi, void **bits ) { - return CreateDIBSection( hdc, bmi, 0, bits, 0, 0 ); + return CreateDIBSection( hdc, bmi, DIB_RGB_COLORS, bits, 0, 0 ); } /*********************************************************************** * WinGGetDIBPointer (WING32.@) */ -void * CALLBACK WinGGetDIBPointer( HBITMAP hbmp, BITMAPINFO *bmi ) +void * WINAPI WinGGetDIBPointer( HBITMAP hbmp, BITMAPINFO *bmi ) { DIBSECTION ds; - if (GetObject( hbmp, sizeof(ds), &ds ) == sizeof(ds)) + if (GetObjectW( hbmp, sizeof(ds), &ds ) == sizeof(ds)) { - if (bmi != NULL) - memcpy( &bmi->bmiHeader, &ds.dsBmih, sizeof(*bmi) ); - + bmi->bmiHeader = ds.dsBmih; return ds.dsBm.bmBits; } return NULL; @@ -81,7 +79,7 @@ /*********************************************************************** * WinGSetDIBColorTable (WING32.@) */ -UINT CALLBACK WinGSetDIBColorTable( HDC hdc, UINT start, UINT end, RGBQUAD *colors ) +UINT WINAPI WinGSetDIBColorTable( HDC hdc, UINT start, UINT end, RGBQUAD *colors ) { return SetDIBColorTable( hdc, start, end, colors ); } @@ -89,30 +87,30 @@ /*********************************************************************** * WinGGetDIBColorTable (WING32.@) */ -UINT CALLBACK WinGGetDIBColorTable( HDC hdc, UINT start, UINT end, RGBQUAD *colors ) +UINT WINAPI WinGGetDIBColorTable( HDC hdc, UINT start, UINT end, RGBQUAD *colors ) { return GetDIBColorTable( hdc, start, end, colors ); } /*********************************************************************** - * WinGCreateHalfTonePalette (WING32.@) + * WinGCreateHalftonePalette (WING32.@) */ -HPALETTE CALLBACK WinGCreateHalfTonePalette( void ) +HPALETTE WINAPI WinGCreateHalftonePalette( void ) { HDC hdc; HPALETTE hpal; - hdc = GetDC( NULL ); + hdc = GetDC( 0 ); hpal = CreateHalftonePalette( hdc ); - ReleaseDC( NULL, hdc ); + ReleaseDC( 0, hdc ); return hpal; } /*********************************************************************** - * WinGCreateHalfToneBrush (WING32.@) + * WinGCreateHalftoneBrush (WING32.@) */ -HBRUSH CALLBACK WinGCreateHalfToneBrush( HDC hdc, COLORREF color, INT type ) +HBRUSH WINAPI WinGCreateHalftoneBrush( HDC hdc, COLORREF color, INT type ) { return CreateSolidBrush( color ); } @@ -120,10 +118,10 @@ /*********************************************************************** * WinGStretchBlt (WING32.@) */ -BOOL CALLBACK WinGStretchBlt( HDC hdcDst, INT xDst, INT yDst, INT widthDst, INT heightDst, +BOOL WINAPI WinGStretchBlt( HDC hdcDst, INT xDst, INT yDst, INT widthDst, INT heightDst, HDC hdcSrc, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc ) { - int old_blt_mode; + INT old_blt_mode; BOOL ret; old_blt_mode = SetStretchBltMode( hdcDst, COLORONCOLOR ); @@ -136,7 +134,7 @@ /*********************************************************************** * WinGBitBlt (WING32.@) */ -BOOL CALLBACK WinGBitBlt( HDC hdcDst, INT xDst, INT yDst, INT width, +BOOL WINAPI WinGBitBlt( HDC hdcDst, INT xDst, INT yDst, INT width, INT height, HDC hdcSrc, INT xSrc, INT ySrc ) { return BitBlt( hdcDst, xDst, yDst, width, height, hdcSrc, xSrc, ySrc, SRCCOPY ); Modified: trunk/reactos/dll/win32/wing32/wing32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wing32/wing32.sp… ============================================================================== --- trunk/reactos/dll/win32/wing32/wing32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wing32/wing32.spec [iso-8859-1] Sat Nov 21 09:42:24 2015 @@ -1,8 +1,8 @@ @ stdcall WinGBitBlt(long long long long long long long long) @ stdcall WinGCreateBitmap(long ptr ptr) @ stdcall WinGCreateDC() -@ stdcall WinGCreateHalfToneBrush(long long long) -@ stdcall WinGCreateHalfTonePalette() +@ stdcall WinGCreateHalftoneBrush(long long long) +@ stdcall WinGCreateHalftonePalette() @ stdcall WinGGetDIBColorTable(long long long ptr) @ stdcall WinGGetDIBPointer(long ptr) @ stdcall WinGRecommendDIBFormat(ptr) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Nov 21 09:42:24 2015 @@ -203,7 +203,7 @@ reactos/dll/win32/windowscodecs # Synced to WineStaging-1.7.47 reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.7.47 reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.7.47 -reactos/dll/win32/wing32 # Out of sync +reactos/dll/win32/wing32 # Synced to WineStaging-1.7.55 reactos/dll/win32/winhttp # Synced to WineStaging-1.7.47 reactos/dll/win32/wininet # Synced to WineStaging-1.7.47 reactos/dll/win32/winmm # Forked at Wine-20050628

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs