Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 62915: [MSCTF] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 23 Apr '14

23 Apr '14

Author: akhaldi Date: Wed Apr 23 14:32:35 2014 New Revision: 62915 URL: http://svn.reactos.org/svn/reactos?rev=62915&view=rev Log: [MSCTF] * Sync with Wine 1.7.17. CORE-8080 Added: trunk/reactos/dll/win32/msctf/msctf_classes.rgs - copied unchanged from r62887, trunk/reactos/dll/win32/msctf/msctf.rgs Removed: trunk/reactos/dll/win32/msctf/msctf.rgs Modified: trunk/reactos/dll/win32/msctf/categorymgr.c trunk/reactos/dll/win32/msctf/compartmentmgr.c trunk/reactos/dll/win32/msctf/context.c trunk/reactos/dll/win32/msctf/displayattributemgr.c trunk/reactos/dll/win32/msctf/documentmgr.c trunk/reactos/dll/win32/msctf/inputprocessor.c trunk/reactos/dll/win32/msctf/langbarmgr.c trunk/reactos/dll/win32/msctf/msctf_classes.idl trunk/reactos/dll/win32/msctf/range.c trunk/reactos/dll/win32/msctf/threadmgr.c trunk/reactos/dll/win32/msctf/version.rc trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/msctf/categorymgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/categorymg… Modified: trunk/reactos/dll/win32/msctf/compartmentmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/compartmen… Modified: trunk/reactos/dll/win32/msctf/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/context.c?… Modified: trunk/reactos/dll/win32/msctf/displayattributemgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/displayatt… Modified: trunk/reactos/dll/win32/msctf/documentmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/documentmg… Modified: trunk/reactos/dll/win32/msctf/inputprocessor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/inputproce… Modified: trunk/reactos/dll/win32/msctf/langbarmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/langbarmgr… Removed: trunk/reactos/dll/win32/msctf/msctf.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf.rgs?… Modified: trunk/reactos/dll/win32/msctf/msctf_classes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf_clas… Modified: trunk/reactos/dll/win32/msctf/range.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/range.c?re… Modified: trunk/reactos/dll/win32/msctf/threadmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/threadmgr.… Modified: trunk/reactos/dll/win32/msctf/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/version.rc… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 62914: [MSCMS_WINETEST] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 23 Apr '14

23 Apr '14

Author: akhaldi Date: Wed Apr 23 14:27:54 2014 New Revision: 62914 URL: http://svn.reactos.org/svn/reactos?rev=62914&view=rev Log: [MSCMS_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/mscms/profile.c Modified: trunk/rostests/winetests/mscms/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mscms/profile.c… ============================================================================== --- trunk/rostests/winetests/mscms/profile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mscms/profile.c [iso-8859-1] Wed Apr 23 14:27:54 2014 @@ -59,7 +59,7 @@ static BOOL (WINAPI *pUninstallColorProfileA)(PCSTR,PCSTR,BOOL); static BOOL (WINAPI *pUninstallColorProfileW)(PCWSTR,PCWSTR,BOOL); -static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,PDISPLAY_DEVICE,DWORD); +static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,PDISPLAY_DEVICEA,DWORD); #define GETFUNCPTR(func) p##func = (void *)GetProcAddress( hmscms, #func ); \ if (!p##func) return FALSE; @@ -122,6 +122,8 @@ 'c','o','l','o','r','\\','s','r','g','b',' ','c','o','l','o','r',' ', 's','p','a','c','e',' ','p','r','o','f','i','l','e','.','i','c','m',0 }; +static BOOL have_color_profile; + static const unsigned char rgbheader[] = { 0x48, 0x0c, 0x00, 0x00, 0x6f, 0x6e, 0x69, 0x4c, 0x00, 0x00, 0x10, 0x02, 0x72, 0x74, 0x6e, 0x6d, 0x20, 0x42, 0x47, 0x52, 0x20, 0x5a, 0x59, 0x58, @@ -669,7 +671,7 @@ ok( !ret, "EnumColorProfilesA() succeeded (%d)\n", GetLastError() ); ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); - if (standardprofile) + if (have_color_profile) ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); else todo_wine ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); @@ -683,7 +685,7 @@ size = total; ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); - if (standardprofile) + if (have_color_profile) ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); else todo_wine ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); @@ -723,7 +725,7 @@ ok( !ret, "EnumColorProfilesW() succeeded (%d)\n", GetLastError() ); ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); - if (standardprofileW) + if (have_color_profile) ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); else todo_wine ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); @@ -736,7 +738,7 @@ size = total; ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); - if (standardprofileW) + if (have_color_profile) ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); else todo_wine ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); @@ -1244,17 +1246,16 @@ BOOL ret; char profile[MAX_PATH], basename[MAX_PATH]; DWORD error, size = sizeof(profile); - DISPLAY_DEVICE display; + DISPLAY_DEVICEA display, monitor; BOOL res; - DISPLAY_DEVICE monitor; if (testprofile && pEnumDisplayDevicesA) { - display.cb = sizeof( DISPLAY_DEVICE ); + display.cb = sizeof( DISPLAY_DEVICEA ); res = pEnumDisplayDevicesA( NULL, 0, &display, 0 ); ok( res, "Can't get display info\n" ); - monitor.cb = sizeof( DISPLAY_DEVICE ); + monitor.cb = sizeof( DISPLAY_DEVICEA ); res = pEnumDisplayDevicesA( display.DeviceName, 0, &monitor, 0 ); if (res) { @@ -1316,6 +1317,21 @@ else skip("Unable to obtain monitor name\n"); } +} + +static BOOL have_profile(void) +{ + char glob[MAX_PATH + sizeof("\\*.icm")]; + DWORD size = MAX_PATH; + HANDLE handle; + WIN32_FIND_DATAA data; + + if (!pGetColorDirectoryA( NULL, glob, &size )) return FALSE; + lstrcatA( glob, "\\*.icm" ); + handle = FindFirstFileA( glob, &data ); + if (handle == INVALID_HANDLE_VALUE) return FALSE; + FindClose( handle ); + return TRUE; } START_TEST(profile) @@ -1379,9 +1395,9 @@ } /* If found, create a temporary copy for testing purposes */ - if (standardprofile && GetTempPath( sizeof(path), path )) - { - if (GetTempFileName( path, "rgb", 0, file )) + if (standardprofile && GetTempPathA( sizeof(path), path )) + { + if (GetTempFileNameA( path, "rgb", 0, file )) { if (CopyFileA( standardprofile, file, FALSE )) { @@ -1393,6 +1409,8 @@ } } + have_color_profile = have_profile(); + test_GetColorDirectoryA(); test_GetColorDirectoryW();

1 0

[akhaldi] 62913: [MSCMS] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 23 Apr '14

23 Apr '14

Author: akhaldi Date: Wed Apr 23 14:27:40 2014 New Revision: 62913 URL: http://svn.reactos.org/svn/reactos?rev=62913&view=rev Log: [MSCMS] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/mscms/mscms_main.c trunk/reactos/dll/win32/mscms/transform.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mscms/mscms_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/mscms_main… ============================================================================== --- trunk/reactos/dll/win32/mscms/mscms_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscms/mscms_main.c [iso-8859-1] Wed Apr 23 14:27:40 2014 @@ -53,6 +53,8 @@ DisableThreadLibraryCalls( hinst ); #ifdef HAVE_LCMS2 cmsSetLogErrorHandler( lcms_error_handler ); +#else + ERR( "No support for liblcms2, expect problems\n" ); #endif break; case DLL_PROCESS_DETACH: Modified: trunk/reactos/dll/win32/mscms/transform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/transform.… ============================================================================== --- trunk/reactos/dll/win32/mscms/transform.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscms/transform.c [iso-8859-1] Wed Apr 23 14:27:40 2014 @@ -60,7 +60,7 @@ static DWORD from_bmformat( BMFORMAT format ) { - static int quietfixme = 0; + static BOOL quietfixme = FALSE; TRACE( "bitmap format: 0x%08x\n", format ); switch (format) @@ -71,10 +71,10 @@ case BM_xRGBQUADS: return TYPE_ARGB_8; case BM_xBGRQUADS: return TYPE_ABGR_8; default: - if (quietfixme == 0) + if (!quietfixme) { FIXME("unhandled bitmap format 0x%x\n", format); - quietfixme = 1; + quietfixme = TRUE; } return TYPE_RGB_8; } 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] Wed Apr 23 14:27:40 2014 @@ -111,7 +111,7 @@ reactos/dll/win32/msacm32/msacm32.drv # Synced to Wine-1.7.17 reactos/dll/win32/msadp32.acm # Synced to Wine-1.7.17 reactos/dll/win32/mscat32 # Synced to Wine-1.7.1 -reactos/dll/win32/mscms # Synced to Wine-1.7.1 +reactos/dll/win32/mscms # Synced to Wine-1.7.17 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to Wine-1.7.1 reactos/dll/win32/msftedit # Synced to Wine-1.7.1

1 0

[akhaldi] 62912: [MSADP32.ACM] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 23 Apr '14

23 Apr '14

Author: akhaldi Date: Wed Apr 23 14:24:59 2014 New Revision: 62912 URL: http://svn.reactos.org/svn/reactos?rev=62912&view=rev Log: [MSADP32.ACM] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/msadp32.acm/msadp32.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msadp32.acm/msadp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msadp32.acm/msad… ============================================================================== --- trunk/reactos/dll/win32/msadp32.acm/msadp32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msadp32.acm/msadp32.c [iso-8859-1] Wed Apr 23 14:24:59 2014 @@ -225,6 +225,11 @@ if (*idelta < 16) *idelta = 16; } +static inline unsigned char C168(short s) +{ + return HIBYTE(s) ^ (unsigned char)0x80; +} + static void cvtSSms16K(const ACMDRVSTREAMINSTANCE *adsi, const unsigned char* src, LPDWORD nsrc, unsigned char* dst, LPDWORD ndst) @@ -236,10 +241,10 @@ int nsamp; int nsamp_blk = ((ADPCMWAVEFORMAT*)adsi->pwfxSrc)->wSamplesPerBlock; DWORD nblock = min(*nsrc / adsi->pwfxSrc->nBlockAlign, - *ndst / (nsamp_blk * 2 * 2)); + *ndst / (nsamp_blk * adsi->pwfxDst->nBlockAlign)); *nsrc = nblock * adsi->pwfxSrc->nBlockAlign; - *ndst = nblock * nsamp_blk * 2 * 2; + *ndst = nblock * nsamp_blk * adsi->pwfxDst->nBlockAlign; nsamp_blk -= 2; /* see below for samples from block head */ for (; nblock > 0; nblock--) @@ -258,18 +263,34 @@ sample2L = R16(src); src += 2; sample2R = R16(src); src += 2; - /* store samples from block head */ - W16(dst, sample2L); dst += 2; - W16(dst, sample2R); dst += 2; - W16(dst, sample1L); dst += 2; - W16(dst, sample1R); dst += 2; - - for (nsamp = nsamp_blk; nsamp > 0; nsamp--) - { - process_nibble(*src >> 4, &ideltaL, &sample1L, &sample2L, &coeffL); - W16(dst, sample1L); dst += 2; - process_nibble(*src++ & 0x0F, &ideltaR, &sample1R, &sample2R, &coeffR); - W16(dst, sample1R); dst += 2; + if(adsi->pwfxDst->wBitsPerSample == 8){ + /* store samples from block head */ + *dst = C168(sample2L); ++dst; + *dst = C168(sample2R); ++dst; + *dst = C168(sample1L); ++dst; + *dst = C168(sample1R); ++dst; + + for (nsamp = nsamp_blk; nsamp > 0; nsamp--) + { + process_nibble(*src >> 4, &ideltaL, &sample1L, &sample2L, &coeffL); + *dst = C168(sample1L); ++dst; + process_nibble(*src++ & 0x0F, &ideltaR, &sample1R, &sample2R, &coeffR); + *dst = C168(sample1R); ++dst; + } + }else if(adsi->pwfxDst->wBitsPerSample == 16){ + /* store samples from block head */ + W16(dst, sample2L); dst += 2; + W16(dst, sample2R); dst += 2; + W16(dst, sample1L); dst += 2; + W16(dst, sample1R); dst += 2; + + for (nsamp = nsamp_blk; nsamp > 0; nsamp--) + { + process_nibble(*src >> 4, &ideltaL, &sample1L, &sample2L, &coeffL); + W16(dst, sample1L); dst += 2; + process_nibble(*src++ & 0x0F, &ideltaR, &sample1R, &sample2R, &coeffR); + W16(dst, sample1R); dst += 2; + } } src = in_src + adsi->pwfxSrc->nBlockAlign; } @@ -285,10 +306,10 @@ int nsamp; int nsamp_blk = ((ADPCMWAVEFORMAT*)adsi->pwfxSrc)->wSamplesPerBlock; DWORD nblock = min(*nsrc / adsi->pwfxSrc->nBlockAlign, - *ndst / (nsamp_blk * 2)); + *ndst / (nsamp_blk * adsi->pwfxDst->nBlockAlign)); *nsrc = nblock * adsi->pwfxSrc->nBlockAlign; - *ndst = nblock * nsamp_blk * 2; + *ndst = nblock * nsamp_blk * adsi->pwfxDst->nBlockAlign; nsamp_blk -= 2; /* see below for samples from block head */ for (; nblock > 0; nblock--) @@ -303,16 +324,30 @@ sample2 = R16(src); src += 2; /* store samples from block head */ - W16(dst, sample2); dst += 2; - W16(dst, sample1); dst += 2; - - for (nsamp = nsamp_blk; nsamp > 0; nsamp -= 2) - { - process_nibble(*src >> 4, &idelta, &sample1, &sample2, &coeff); - W16(dst, sample1); dst += 2; - process_nibble(*src++ & 0x0F, &idelta, &sample1, &sample2, &coeff); - W16(dst, sample1); dst += 2; + if(adsi->pwfxDst->wBitsPerSample == 8){ + *dst = C168(sample2); ++dst; + *dst = C168(sample1); ++dst; + + for (nsamp = nsamp_blk; nsamp > 0; nsamp -= 2) + { + process_nibble(*src >> 4, &idelta, &sample1, &sample2, &coeff); + *dst = C168(sample1); ++dst; + process_nibble(*src++ & 0x0F, &idelta, &sample1, &sample2, &coeff); + *dst = C168(sample1); ++dst; + } + }else if(adsi->pwfxDst->wBitsPerSample == 16){ + W16(dst, sample2); dst += 2; + W16(dst, sample1); dst += 2; + + for (nsamp = nsamp_blk; nsamp > 0; nsamp -= 2) + { + process_nibble(*src >> 4, &idelta, &sample1, &sample2, &coeff); + W16(dst, sample1); dst += 2; + process_nibble(*src++ & 0x0F, &idelta, &sample1, &sample2, &coeff); + W16(dst, sample1); dst += 2; + } } + src = in_src + adsi->pwfxSrc->nBlockAlign; } } @@ -555,12 +590,9 @@ else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_ADPCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { - /* resampling or mono <=> stereo not available - * ADPCM algo only define 16 bit per sample output - */ + /* resampling or mono <=> stereo not available */ if (adsi->pwfxSrc->nSamplesPerSec != adsi->pwfxDst->nSamplesPerSec || - adsi->pwfxSrc->nChannels != adsi->pwfxDst->nChannels || - adsi->pwfxDst->wBitsPerSample != 16) + adsi->pwfxSrc->nChannels != adsi->pwfxDst->nChannels) goto theEnd; #if 0 @@ -579,9 +611,9 @@ #endif /* adpcm decoding... */ - if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 2) + if (adsi->pwfxDst->nChannels == 2) aad->convert = cvtSSms16K; - if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 1) + else if (adsi->pwfxDst->nChannels == 1) aad->convert = cvtMMms16K; } else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && 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] Wed Apr 23 14:24:59 2014 @@ -109,7 +109,7 @@ reactos/dll/win32/mprapi # Synced to Wine-1.7.1 reactos/dll/win32/msacm32 # Synced to Wine-1.7.17 reactos/dll/win32/msacm32/msacm32.drv # Synced to Wine-1.7.17 -reactos/dll/win32/msadp32.acm # Synced to Wine-1.7.1 +reactos/dll/win32/msadp32.acm # Synced to Wine-1.7.17 reactos/dll/win32/mscat32 # Synced to Wine-1.7.1 reactos/dll/win32/mscms # Synced to Wine-1.7.1 reactos/dll/win32/mscoree # Synced to Wine-1.5.4

1 0

[akhaldi] 62911: [MSACM32.DRV] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 23 Apr '14

23 Apr '14

Author: akhaldi Date: Wed Apr 23 14:22:56 2014 New Revision: 62911 URL: http://svn.reactos.org/svn/reactos?rev=62911&view=rev Log: [MSACM32.DRV] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/msacm32/msacm32.drv/CMakeLists.txt trunk/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msacm32/msacm32.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm32.… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm32.drv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm32.drv/CMakeLists.txt [iso-8859-1] Wed Apr 23 14:22:56 2014 @@ -1,18 +1,14 @@ - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(msacm32.drv msacm32.drv.spec) -add_library(msacm32.drv SHARED wavemap.c wavemap.rc +add_library(msacm32.drv SHARED + wavemap.c + wavemap.rc ${CMAKE_CURRENT_BINARY_DIR}/msacm32.def) set_module_type(msacm32.drv win32dll UNICODE) - set_target_properties(msacm32.drv PROPERTIES SUFFIX "") - target_link_libraries(msacm32.drv wine) - -add_importlibs(msacm32.drv msvcrt msacm32 user32 winmm advapi32 kernel32 ntdll) -add_dependencies(msacm32.drv psdk) +add_importlibs(msacm32.drv msacm32 user32 winmm advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET msacm32.drv DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm32.… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c [iso-8859-1] Wed Apr 23 14:22:56 2014 @@ -337,7 +337,7 @@ if (ash->cbSrcLength > ash->cbSrcLengthUsed) FIXME("Not all src buffer has been written, expect bogus sound\n"); else if (ash->cbSrcLength < ash->cbSrcLengthUsed) - ERR("CoDec has read more data than it is allowed to\n"); + ERR("Codec has read more data than it is allowed to\n"); if (ash->cbDstLengthUsed == 0) { /* something went wrong in decoding */ @@ -675,7 +675,7 @@ return; } - if (hWave != wim->u.in.hInnerWave && uMsg != WIM_OPEN) + if (uMsg != WIM_OPEN && hWave != wim->u.in.hInnerWave) ERR("Shouldn't happen (%p %p)\n", hWave, wim->u.in.hInnerWave); switch (uMsg) { 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] Wed Apr 23 14:22:56 2014 @@ -48,181 +48,182 @@ reactos/dll/directx/wine/quartz # Synced to Wine-1.7.17 reactos/dll/directx/wine/wined3d # Synced to Wine-1.7.17 -reactos/dll/win32/activeds # Synced to Wine-1.7.1 -reactos/dll/win32/actxprxy # Synced to Wine-1.7.17 -reactos/dll/win32/advpack # Synced to Wine-1.7.1 -reactos/dll/win32/atl # Synced to Wine-1.7.1 -reactos/dll/win32/atl100 # Synced to Wine-1.7.1 -reactos/dll/win32/atl80 # Synced to Wine-1.7.1 -reactos/dll/win32/avifil32 # Synced to Wine-1.7.17 -reactos/dll/win32/bcrypt # Synced to Wine-1.7.17 -reactos/dll/win32/browseui # Out of sync -reactos/dll/win32/cabinet # Synced to Wine-1.7.17 -reactos/dll/win32/clusapi # Synced to Wine-1.7.1 -reactos/dll/win32/comcat # Synced to Wine-1.7.1 -reactos/dll/win32/comctl32 # Synced to Wine 1.7.17 -reactos/dll/win32/comdlg32 # Synced to Wine 1.7.17 -reactos/dll/win32/compstui # Synced to Wine-1.7.1 -reactos/dll/win32/credui # Synced to Wine-1.7.1 -reactos/dll/win32/crypt32 # Synced to Wine-1.7.17 -reactos/dll/win32/cryptdlg # Synced to Wine-1.7.1 -reactos/dll/win32/cryptdll # Synced to Wine-1.7.1 -reactos/dll/win32/cryptnet # Synced to Wine-1.7.17 -reactos/dll/win32/cryptui # Synced to Wine-1.7.1 -reactos/dll/win32/dbghelp # Synced to Wine-1.7.1 -reactos/dll/win32/dciman32 # Synced to Wine-1.7.1 -reactos/dll/win32/dwmapi # Synced to Wine-1.7.17 -reactos/dll/win32/faultrep # Synced to Wine-1.7.1 -reactos/dll/win32/fusion # Synced to Wine-1.7.1 -reactos/dll/win32/gdiplus # Synced to Wine-1.7.17 -reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.7.17 -reactos/dll/win32/hlink # Synced to Wine-1.7.17 -reactos/dll/win32/hnetcfg # Synced to Wine-1.7.1 -reactos/dll/win32/httpapi # Synced to Wine-1.7.1 -reactos/dll/win32/iccvid # Synced to Wine-1.7.1 -reactos/dll/win32/icmp # Out of sync -reactos/dll/win32/ieframe # Synced to Wine-1.7.1 -reactos/dll/win32/imaadp32.acm # Synced to Wine-1.7.1 -reactos/dll/win32/imagehlp # Synced to Wine-1.7.17 -reactos/dll/win32/imm32 # Synced to Wine-1.7.1 -reactos/dll/win32/inetcomm # Synced to Wine-1.7.17 -reactos/dll/win32/inetmib1 # Synced to Wine-1.7.1 -reactos/dll/win32/initpki # Synced to Wine-1.7.1 -reactos/dll/win32/inseng # Synced to Wine-1.7.1 -reactos/dll/win32/iphlpapi # Out of sync -reactos/dll/win32/itircl # Synced to Wine-1.7.1 -reactos/dll/win32/itss # Synced to Wine-1.7.17 -reactos/dll/win32/jscript # Synced to Wine-1.7.17 -reactos/dll/win32/loadperf # Synced to Wine-1.7.1 -reactos/dll/win32/localspl # Synced to Wine-1.7.17 -reactos/dll/win32/localui # Synced to Wine-1.7.1 -reactos/dll/win32/lz32 # Synced to Wine-1.7.1 -reactos/dll/win32/mapi32 # Synced to Wine-1.7.17 -reactos/dll/win32/mciavi32 # Synced to Wine-1.7.1 -reactos/dll/win32/mcicda # Synced to Wine-1.7.1 -reactos/dll/win32/mciqtz32 # Synced to Wine-1.7.17 -reactos/dll/win32/mciseq # Synced to Wine-1.7.1 -reactos/dll/win32/mciwave # Synced to Wine-1.7.1 -reactos/dll/win32/mlang # Synced to Wine-1.7.17 -reactos/dll/win32/mmdevapi # Synced to Wine-1.7.1 -reactos/dll/win32/mpr # Synced to Wine-1.7.1 -reactos/dll/win32/mprapi # Synced to Wine-1.7.1 -reactos/dll/win32/msacm32 # Synced to Wine-1.7.17 -reactos/dll/win32/msadp32.acm # Synced to Wine-1.7.1 -reactos/dll/win32/mscat32 # Synced to Wine-1.7.1 -reactos/dll/win32/mscms # Synced to Wine-1.7.1 -reactos/dll/win32/mscoree # Synced to Wine-1.5.4 -reactos/dll/win32/msctf # Synced to Wine-1.7.1 -reactos/dll/win32/msftedit # Synced to Wine-1.7.1 -reactos/dll/win32/msg711.acm # Synced to Wine-1.7.1 -reactos/dll/win32/msgsm32.acm # Synced to Wine-1.7.1 -reactos/dll/win32/mshtml # Synced to Wine-1.7.1 -reactos/dll/win32/mshtml.tlb # Synced to Wine-1.7.1 -reactos/dll/win32/msi # Synced to Wine-1.7.1 -reactos/dll/win32/msimg32 # Synced to Wine-1.7.1 -reactos/dll/win32/msimtf # Synced to Wine-1.7.1 -reactos/dll/win32/msisip # Synced to Wine-1.7.1 -reactos/dll/win32/msisys.ocx # Synced to Wine-1.7.1 -reactos/dll/win32/msnet32 # Synced to Wine-1.7.1 -reactos/dll/win32/msrle32 # Synced to Wine-1.7.1 -reactos/dll/win32/mssign32 # Synced to Wine-1.7.1 -reactos/dll/win32/mssip32 # Synced to Wine-1.7.1 -reactos/dll/win32/mstask # Synced to Wine-1.7.1 -reactos/dll/win32/msvcrt20 # Out of sync -reactos/dll/win32/msvcrt40 # Out of sync -reactos/dll/win32/msvfw32 # Synced to Wine-1.7.1 -reactos/dll/win32/msvidc32 # Synced to Wine-1.7.1 -reactos/dll/win32/msxml # Synced to Wine-1.7.1 -reactos/dll/win32/msxml2 # Synced to Wine-1.7.1 -reactos/dll/win32/msxml3 # Synced to Wine-1.7.1 -reactos/dll/win32/msxml4 # Synced to Wine-1.7.1 -reactos/dll/win32/msxml6 # Synced to Wine-1.7.1 -reactos/dll/win32/nddeapi # Synced to Wine-1.7.1 -reactos/dll/win32/netapi32 # Forked at Wine-1.3.34 -reactos/dll/win32/ntdsapi # Synced to Wine-1.7.1 -reactos/dll/win32/ntprint # Synced to Wine-1.7.1 -reactos/dll/win32/objsel # Synced to Wine-1.7.1 -reactos/dll/win32/odbc32 # Synced to Wine-1.7.1. Depends on port of Linux ODBC. -reactos/dll/win32/odbccp32 # Synced to Wine-1.7.1 -reactos/dll/win32/ole32 # Synced to Wine-1.7.1 -reactos/dll/win32/oleacc # Synced to Wine-1.7.1 -reactos/dll/win32/oleaut32 # Synced to Wine-1.7.1 -reactos/dll/win32/olecli32 # Synced to Wine-1.7.1 -reactos/dll/win32/oledlg # Synced to Wine-1.7.1 -reactos/dll/win32/olepro32 # Synced to Wine-1.7.1 -reactos/dll/win32/olesvr32 # Synced to Wine-1.7.1 -reactos/dll/win32/olethk32 # Synced to Wine-1.7.1 -reactos/dll/win32/pdh # Synced to Wine-1.7.1 -reactos/dll/win32/pidgen # Synced to Wine-1.7.1 -reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 -reactos/dll/win32/printui # Synced to Wine-1.7.1 -reactos/dll/win32/propsys # Synced to Wine-1.7.1 -reactos/dll/win32/pstorec # Synced to Wine-1.7.1 -reactos/dll/win32/qmgr # Synced to Wine-1.7.1 -reactos/dll/win32/qmgrprxy # Synced to Wine-1.7.1 -reactos/dll/win32/query # Synced to Wine-1.7.1 -reactos/dll/win32/rasapi32 # Synced to Wine-1.7.1 -reactos/dll/win32/resutils # Synced to Wine-1.7.1 -reactos/dll/win32/riched20 # Synced to Wine-1.7.1 -reactos/dll/win32/riched32 # Synced to Wine-1.7.1 -reactos/dll/win32/rpcrt4 # Synced to Wine-1.7.1 -reactos/dll/win32/rsabase # Synced to Wine-1.7.1 -reactos/dll/win32/rsaenh # Synced to Wine-1.7.17 -reactos/dll/win32/sccbase # Synced to Wine-1.7.1 -reactos/dll/win32/schannel # Synced to Wine-1.7.1 -reactos/dll/win32/scrrun # Synced to Wine-1.7.1 -reactos/dll/win32/secur32 # Forked -reactos/dll/win32/security # Forked (different .spec) -reactos/dll/win32/sensapi # Synced to Wine-1.7.1 -reactos/dll/win32/setupapi # Forked at Wine-20050524 -reactos/dll/win32/shdoclc # Synced to Wine-1.7.1 -reactos/dll/win32/shdocvw # Synced to Wine-1.7.1 -reactos/dll/win32/shell32 # Forked at Wine-20071011 -reactos/dll/win32/shfolder # Synced to Wine-1.7.1 -reactos/dll/win32/shlwapi # Synced to Wine-1.7.1 -reactos/dll/win32/slbcsp # Synced to Wine-1.7.1 -reactos/dll/win32/snmpapi # Synced to Wine-1.7.1 -reactos/dll/win32/softpub # Synced to Wine-1.7.1 -reactos/dll/win32/spoolss # Synced to Wine-1.7.1 -reactos/dll/win32/stdole2.tlb # Synced to Wine-1.7.1 -reactos/dll/win32/stdole32.tlb # Synced to Wine-1.7.1 -reactos/dll/win32/sti # Synced to Wine-1.7.1 -reactos/dll/win32/sxs # Synced to Wine-1.7.1 -reactos/dll/win32/tapi32 # Synced to Wine-1.7.1 -reactos/dll/win32/traffic # Synced to Wine-1.7.1 -reactos/dll/win32/twain_32 # Synced to Wine-1.7.1 -reactos/dll/win32/unicows # Synced to Wine-1.3.32 (Win9x only, why do we need this?!) -reactos/dll/win32/updspapi # Synced to Wine-1.7.1 -reactos/dll/win32/url # Synced to Wine-1.7.1 -reactos/dll/win32/urlmon # Synced to Wine-1.7.1 -reactos/dll/win32/usp10 # Synced to Wine-1.7.14 -reactos/dll/win32/uxtheme # Forked -reactos/dll/win32/vbscript # Synced to Wine-1.7.1 -reactos/dll/win32/version # Synced to Wine-1.7.1 -reactos/dll/win32/wbemdisp # Synced to Wine-1.7.1 -reactos/dll/win32/wbemprox # Synced to Wine-1.7.2 -reactos/dll/win32/wer # Autosync -reactos/dll/win32/windowscodecs # Synced to Wine-1.7.1 -reactos/dll/win32/windowscodecsext # Synced to Wine-1.7.1 -reactos/dll/win32/winemp3.acm # Synced to Wine-1.7.1 -reactos/dll/win32/wing32 # Out of sync -reactos/dll/win32/winhttp # Synced to Wine-1.7.1 -reactos/dll/win32/wininet # Synced to Wine-1.7.1 -reactos/dll/win32/winmm # Forked at Wine-20050628 -reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 -reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 -reactos/dll/win32/wintrust # Synced to Wine-1.7.1 -reactos/dll/win32/wldap32 # Synced to Wine-1.7.1 -reactos/dll/win32/wmi # Synced to Wine-1.7.1 -reactos/dll/win32/wtsapi32 # Synced to Wine-1.7.1 -reactos/dll/win32/wuapi # Synced to Wine-1.7.1 -reactos/dll/win32/xinput1_1 # Synced to Wine-1.7.1 -reactos/dll/win32/xinput1_2 # Synced to Wine-1.7.1 -reactos/dll/win32/xinput1_3 # Synced to Wine-1.7.1 -reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.7.1 -reactos/dll/win32/xmllite # Synced to Wine-1.7.17 - -reactos/dll/cpl/inetcpl # Synced to Wine-1.7.1 +reactos/dll/win32/activeds # Synced to Wine-1.7.1 +reactos/dll/win32/actxprxy # Synced to Wine-1.7.17 +reactos/dll/win32/advpack # Synced to Wine-1.7.1 +reactos/dll/win32/atl # Synced to Wine-1.7.1 +reactos/dll/win32/atl100 # Synced to Wine-1.7.1 +reactos/dll/win32/atl80 # Synced to Wine-1.7.1 +reactos/dll/win32/avifil32 # Synced to Wine-1.7.17 +reactos/dll/win32/bcrypt # Synced to Wine-1.7.17 +reactos/dll/win32/browseui # Out of sync +reactos/dll/win32/cabinet # Synced to Wine-1.7.17 +reactos/dll/win32/clusapi # Synced to Wine-1.7.1 +reactos/dll/win32/comcat # Synced to Wine-1.7.1 +reactos/dll/win32/comctl32 # Synced to Wine 1.7.17 +reactos/dll/win32/comdlg32 # Synced to Wine 1.7.17 +reactos/dll/win32/compstui # Synced to Wine-1.7.1 +reactos/dll/win32/credui # Synced to Wine-1.7.1 +reactos/dll/win32/crypt32 # Synced to Wine-1.7.17 +reactos/dll/win32/cryptdlg # Synced to Wine-1.7.1 +reactos/dll/win32/cryptdll # Synced to Wine-1.7.1 +reactos/dll/win32/cryptnet # Synced to Wine-1.7.17 +reactos/dll/win32/cryptui # Synced to Wine-1.7.1 +reactos/dll/win32/dbghelp # Synced to Wine-1.7.1 +reactos/dll/win32/dciman32 # Synced to Wine-1.7.1 +reactos/dll/win32/dwmapi # Synced to Wine-1.7.17 +reactos/dll/win32/faultrep # Synced to Wine-1.7.1 +reactos/dll/win32/fusion # Synced to Wine-1.7.1 +reactos/dll/win32/gdiplus # Synced to Wine-1.7.17 +reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.7.17 +reactos/dll/win32/hlink # Synced to Wine-1.7.17 +reactos/dll/win32/hnetcfg # Synced to Wine-1.7.1 +reactos/dll/win32/httpapi # Synced to Wine-1.7.1 +reactos/dll/win32/iccvid # Synced to Wine-1.7.1 +reactos/dll/win32/icmp # Out of sync +reactos/dll/win32/ieframe # Synced to Wine-1.7.1 +reactos/dll/win32/imaadp32.acm # Synced to Wine-1.7.1 +reactos/dll/win32/imagehlp # Synced to Wine-1.7.17 +reactos/dll/win32/imm32 # Synced to Wine-1.7.1 +reactos/dll/win32/inetcomm # Synced to Wine-1.7.17 +reactos/dll/win32/inetmib1 # Synced to Wine-1.7.1 +reactos/dll/win32/initpki # Synced to Wine-1.7.1 +reactos/dll/win32/inseng # Synced to Wine-1.7.1 +reactos/dll/win32/iphlpapi # Out of sync +reactos/dll/win32/itircl # Synced to Wine-1.7.1 +reactos/dll/win32/itss # Synced to Wine-1.7.17 +reactos/dll/win32/jscript # Synced to Wine-1.7.17 +reactos/dll/win32/loadperf # Synced to Wine-1.7.1 +reactos/dll/win32/localspl # Synced to Wine-1.7.17 +reactos/dll/win32/localui # Synced to Wine-1.7.1 +reactos/dll/win32/lz32 # Synced to Wine-1.7.1 +reactos/dll/win32/mapi32 # Synced to Wine-1.7.17 +reactos/dll/win32/mciavi32 # Synced to Wine-1.7.1 +reactos/dll/win32/mcicda # Synced to Wine-1.7.1 +reactos/dll/win32/mciqtz32 # Synced to Wine-1.7.17 +reactos/dll/win32/mciseq # Synced to Wine-1.7.1 +reactos/dll/win32/mciwave # Synced to Wine-1.7.1 +reactos/dll/win32/mlang # Synced to Wine-1.7.17 +reactos/dll/win32/mmdevapi # Synced to Wine-1.7.1 +reactos/dll/win32/mpr # Synced to Wine-1.7.1 +reactos/dll/win32/mprapi # Synced to Wine-1.7.1 +reactos/dll/win32/msacm32 # Synced to Wine-1.7.17 +reactos/dll/win32/msacm32/msacm32.drv # Synced to Wine-1.7.17 +reactos/dll/win32/msadp32.acm # Synced to Wine-1.7.1 +reactos/dll/win32/mscat32 # Synced to Wine-1.7.1 +reactos/dll/win32/mscms # Synced to Wine-1.7.1 +reactos/dll/win32/mscoree # Synced to Wine-1.5.4 +reactos/dll/win32/msctf # Synced to Wine-1.7.1 +reactos/dll/win32/msftedit # Synced to Wine-1.7.1 +reactos/dll/win32/msg711.acm # Synced to Wine-1.7.1 +reactos/dll/win32/msgsm32.acm # Synced to Wine-1.7.1 +reactos/dll/win32/mshtml # Synced to Wine-1.7.1 +reactos/dll/win32/mshtml.tlb # Synced to Wine-1.7.1 +reactos/dll/win32/msi # Synced to Wine-1.7.1 +reactos/dll/win32/msimg32 # Synced to Wine-1.7.1 +reactos/dll/win32/msimtf # Synced to Wine-1.7.1 +reactos/dll/win32/msisip # Synced to Wine-1.7.1 +reactos/dll/win32/msisys.ocx # Synced to Wine-1.7.1 +reactos/dll/win32/msnet32 # Synced to Wine-1.7.1 +reactos/dll/win32/msrle32 # Synced to Wine-1.7.1 +reactos/dll/win32/mssign32 # Synced to Wine-1.7.1 +reactos/dll/win32/mssip32 # Synced to Wine-1.7.1 +reactos/dll/win32/mstask # Synced to Wine-1.7.1 +reactos/dll/win32/msvcrt20 # Out of sync +reactos/dll/win32/msvcrt40 # Out of sync +reactos/dll/win32/msvfw32 # Synced to Wine-1.7.1 +reactos/dll/win32/msvidc32 # Synced to Wine-1.7.1 +reactos/dll/win32/msxml # Synced to Wine-1.7.1 +reactos/dll/win32/msxml2 # Synced to Wine-1.7.1 +reactos/dll/win32/msxml3 # Synced to Wine-1.7.1 +reactos/dll/win32/msxml4 # Synced to Wine-1.7.1 +reactos/dll/win32/msxml6 # Synced to Wine-1.7.1 +reactos/dll/win32/nddeapi # Synced to Wine-1.7.1 +reactos/dll/win32/netapi32 # Forked at Wine-1.3.34 +reactos/dll/win32/ntdsapi # Synced to Wine-1.7.1 +reactos/dll/win32/ntprint # Synced to Wine-1.7.1 +reactos/dll/win32/objsel # Synced to Wine-1.7.1 +reactos/dll/win32/odbc32 # Synced to Wine-1.7.1. Depends on port of Linux ODBC. +reactos/dll/win32/odbccp32 # Synced to Wine-1.7.1 +reactos/dll/win32/ole32 # Synced to Wine-1.7.1 +reactos/dll/win32/oleacc # Synced to Wine-1.7.1 +reactos/dll/win32/oleaut32 # Synced to Wine-1.7.1 +reactos/dll/win32/olecli32 # Synced to Wine-1.7.1 +reactos/dll/win32/oledlg # Synced to Wine-1.7.1 +reactos/dll/win32/olepro32 # Synced to Wine-1.7.1 +reactos/dll/win32/olesvr32 # Synced to Wine-1.7.1 +reactos/dll/win32/olethk32 # Synced to Wine-1.7.1 +reactos/dll/win32/pdh # Synced to Wine-1.7.1 +reactos/dll/win32/pidgen # Synced to Wine-1.7.1 +reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 +reactos/dll/win32/printui # Synced to Wine-1.7.1 +reactos/dll/win32/propsys # Synced to Wine-1.7.1 +reactos/dll/win32/pstorec # Synced to Wine-1.7.1 +reactos/dll/win32/qmgr # Synced to Wine-1.7.1 +reactos/dll/win32/qmgrprxy # Synced to Wine-1.7.1 +reactos/dll/win32/query # Synced to Wine-1.7.1 +reactos/dll/win32/rasapi32 # Synced to Wine-1.7.1 +reactos/dll/win32/resutils # Synced to Wine-1.7.1 +reactos/dll/win32/riched20 # Synced to Wine-1.7.1 +reactos/dll/win32/riched32 # Synced to Wine-1.7.1 +reactos/dll/win32/rpcrt4 # Synced to Wine-1.7.1 +reactos/dll/win32/rsabase # Synced to Wine-1.7.1 +reactos/dll/win32/rsaenh # Synced to Wine-1.7.17 +reactos/dll/win32/sccbase # Synced to Wine-1.7.1 +reactos/dll/win32/schannel # Synced to Wine-1.7.1 +reactos/dll/win32/scrrun # Synced to Wine-1.7.1 +reactos/dll/win32/secur32 # Forked +reactos/dll/win32/security # Forked (different .spec) +reactos/dll/win32/sensapi # Synced to Wine-1.7.1 +reactos/dll/win32/setupapi # Forked at Wine-20050524 +reactos/dll/win32/shdoclc # Synced to Wine-1.7.1 +reactos/dll/win32/shdocvw # Synced to Wine-1.7.1 +reactos/dll/win32/shell32 # Forked at Wine-20071011 +reactos/dll/win32/shfolder # Synced to Wine-1.7.1 +reactos/dll/win32/shlwapi # Synced to Wine-1.7.1 +reactos/dll/win32/slbcsp # Synced to Wine-1.7.1 +reactos/dll/win32/snmpapi # Synced to Wine-1.7.1 +reactos/dll/win32/softpub # Synced to Wine-1.7.1 +reactos/dll/win32/spoolss # Synced to Wine-1.7.1 +reactos/dll/win32/stdole2.tlb # Synced to Wine-1.7.1 +reactos/dll/win32/stdole32.tlb # Synced to Wine-1.7.1 +reactos/dll/win32/sti # Synced to Wine-1.7.1 +reactos/dll/win32/sxs # Synced to Wine-1.7.1 +reactos/dll/win32/tapi32 # Synced to Wine-1.7.1 +reactos/dll/win32/traffic # Synced to Wine-1.7.1 +reactos/dll/win32/twain_32 # Synced to Wine-1.7.1 +reactos/dll/win32/unicows # Synced to Wine-1.3.32 (Win9x only, why do we need this?!) +reactos/dll/win32/updspapi # Synced to Wine-1.7.1 +reactos/dll/win32/url # Synced to Wine-1.7.1 +reactos/dll/win32/urlmon # Synced to Wine-1.7.1 +reactos/dll/win32/usp10 # Synced to Wine-1.7.14 +reactos/dll/win32/uxtheme # Forked +reactos/dll/win32/vbscript # Synced to Wine-1.7.1 +reactos/dll/win32/version # Synced to Wine-1.7.1 +reactos/dll/win32/wbemdisp # Synced to Wine-1.7.1 +reactos/dll/win32/wbemprox # Synced to Wine-1.7.2 +reactos/dll/win32/wer # Autosync +reactos/dll/win32/windowscodecs # Synced to Wine-1.7.1 +reactos/dll/win32/windowscodecsext # Synced to Wine-1.7.1 +reactos/dll/win32/winemp3.acm # Synced to Wine-1.7.1 +reactos/dll/win32/wing32 # Out of sync +reactos/dll/win32/winhttp # Synced to Wine-1.7.1 +reactos/dll/win32/wininet # Synced to Wine-1.7.1 +reactos/dll/win32/winmm # Forked at Wine-20050628 +reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 +reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 +reactos/dll/win32/wintrust # Synced to Wine-1.7.1 +reactos/dll/win32/wldap32 # Synced to Wine-1.7.1 +reactos/dll/win32/wmi # Synced to Wine-1.7.1 +reactos/dll/win32/wtsapi32 # Synced to Wine-1.7.1 +reactos/dll/win32/wuapi # Synced to Wine-1.7.1 +reactos/dll/win32/xinput1_1 # Synced to Wine-1.7.1 +reactos/dll/win32/xinput1_2 # Synced to Wine-1.7.1 +reactos/dll/win32/xinput1_3 # Synced to Wine-1.7.1 +reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.7.1 +reactos/dll/win32/xmllite # Synced to Wine-1.7.17 + +reactos/dll/cpl/inetcpl # Synced to Wine-1.7.1 ReactOS shares the following programs with Winehq. @@ -246,7 +247,7 @@ from Winehq CVS. If you are looking to update something in these files check Wine current souces first as it may already be fixed. -reactos/lib/3rdparty/strmbase # Synced to Wine-1.7.17 +reactos/lib/3rdparty/strmbase # Synced to Wine-1.7.17 advapi32 - reactos/dll/win32/advapi32/crypt/*.c # Synced to Wine-1.7.1

1 0

[akhaldi] 62910: [MSACM32_WINETEST] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 23 Apr '14

23 Apr '14

Author: akhaldi Date: Wed Apr 23 14:16:25 2014 New Revision: 62910 URL: http://svn.reactos.org/svn/reactos?rev=62910&view=rev Log: [MSACM32_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/msacm32/msacm.c Modified: trunk/rostests/winetests/msacm32/msacm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msacm32/msacm.c… ============================================================================== --- trunk/rostests/winetests/msacm32/msacm.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msacm32/msacm.c [iso-8859-1] Wed Apr 23 14:16:25 2014 @@ -33,7 +33,7 @@ #include "msacm.h" static BOOL CALLBACK FormatTagEnumProc(HACMDRIVERID hadid, - PACMFORMATTAGDETAILS paftd, + PACMFORMATTAGDETAILSA paftd, DWORD_PTR dwInstance, DWORD fdwSupport) { @@ -44,7 +44,7 @@ } static BOOL CALLBACK FormatEnumProc(HACMDRIVERID hadid, - LPACMFORMATDETAILS pafd, + LPACMFORMATDETAILSA pafd, DWORD_PTR dwInstance, DWORD fd) { @@ -59,7 +59,7 @@ DWORD fdwSupport) { MMRESULT rc; - ACMDRIVERDETAILS dd; + ACMDRIVERDETAILSA dd; HACMDRIVER had; DWORD dwDriverPriority; @@ -79,48 +79,48 @@ } /* try an invalid pointer */ - rc = acmDriverDetails(hadid, 0, 0); - ok(rc == MMSYSERR_INVALPARAM, - "acmDriverDetails(): rc = %08x, should be %08x\n", + rc = acmDriverDetailsA(hadid, 0, 0); + ok(rc == MMSYSERR_INVALPARAM, + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); /* try an invalid structure size */ ZeroMemory(&dd, sizeof(dd)); - rc = acmDriverDetails(hadid, &dd, 0); - ok(rc == MMSYSERR_INVALPARAM, - "acmDriverDetails(): rc = %08x, should be %08x\n", + rc = acmDriverDetailsA(hadid, &dd, 0); + ok(rc == MMSYSERR_INVALPARAM, + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); /* MSDN says this should fail but it doesn't in practice */ dd.cbStruct = 4; - rc = acmDriverDetails(hadid, &dd, 0); + rc = acmDriverDetailsA(hadid, &dd, 0); ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NOTSUPPORTED, - "acmDriverDetails(): rc = %08x, should be %08x\n", + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); /* try an invalid handle */ dd.cbStruct = sizeof(dd); - rc = acmDriverDetails((HACMDRIVERID)1, &dd, 0); - ok(rc == MMSYSERR_INVALHANDLE, - "acmDriverDetails(): rc = %08x, should be %08x\n", + rc = acmDriverDetailsA((HACMDRIVERID)1, &dd, 0); + ok(rc == MMSYSERR_INVALHANDLE, + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALHANDLE); /* try an invalid handle and pointer */ - rc = acmDriverDetails((HACMDRIVERID)1, 0, 0); - ok(rc == MMSYSERR_INVALPARAM, - "acmDriverDetails(): rc = %08x, should be %08x\n", + rc = acmDriverDetailsA((HACMDRIVERID)1, 0, 0); + ok(rc == MMSYSERR_INVALPARAM, + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); /* try invalid details */ - rc = acmDriverDetails(hadid, &dd, -1); + rc = acmDriverDetailsA(hadid, &dd, -1); ok(rc == MMSYSERR_INVALFLAG, - "acmDriverDetails(): rc = %08x, should be %08x\n", + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALFLAG); /* try valid parameters */ - rc = acmDriverDetails(hadid, &dd, 0); + rc = acmDriverDetailsA(hadid, &dd, 0); ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NOTSUPPORTED, - "acmDriverDetails(): rc = %08x, should be %08x\n", + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); /* cbStruct should contain size of returned data (at most sizeof(dd)) @@ -128,7 +128,7 @@ */ if (rc == MMSYSERR_NOERROR) { ok(dd.cbStruct == sizeof(dd), - "acmDriverDetails(): cbStruct = %08x\n", dd.cbStruct); + "acmDriverDetailsA(): cbStruct = %08x\n", dd.cbStruct); } if (rc == MMSYSERR_NOERROR && winetest_interactive) { @@ -274,27 +274,27 @@ "acmMetrics(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); if (rc == MMSYSERR_NOERROR) { - ACMFORMATDETAILS fd; + ACMFORMATDETAILSA fd; WAVEFORMATEX * pwfx; - ACMFORMATTAGDETAILS aftd; + ACMFORMATTAGDETAILSA aftd; /* try bad pointer */ - rc = acmFormatEnum(had, 0, FormatEnumProc, 0, 0); + rc = acmFormatEnumA(had, 0, FormatEnumProc, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmFormatEnum(): rc = %08x, should be %08x\n", + "acmFormatEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); /* try bad structure size */ ZeroMemory(&fd, sizeof(fd)); - rc = acmFormatEnum(had, &fd, FormatEnumProc, 0, 0); + rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmFormatEnum(): rc = %08x, should be %08x\n", + "acmFormatEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); fd.cbStruct = sizeof(fd) - 1; - rc = acmFormatEnum(had, &fd, FormatEnumProc, 0, 0); + rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmFormatEnum(): rc = %08x, should be %08x\n", + "acmFormatEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); if (dwSize < sizeof(WAVEFORMATEX)) @@ -311,43 +311,43 @@ fd.dwFormatTag = WAVE_FORMAT_UNKNOWN; /* try valid parameters */ - rc = acmFormatEnum(had, &fd, FormatEnumProc, 0, 0); + rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); ok(rc == MMSYSERR_NOERROR, - "acmFormatEnum(): rc = %08x, should be %08x\n", + "acmFormatEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); /* try bad pointer */ - rc = acmFormatTagEnum(had, 0, FormatTagEnumProc, 0, 0); + rc = acmFormatTagEnumA(had, 0, FormatTagEnumProc, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmFormatTagEnum(): rc = %08x, should be %08x\n", + "acmFormatTagEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); /* try bad structure size */ ZeroMemory(&aftd, sizeof(aftd)); - rc = acmFormatTagEnum(had, &aftd, FormatTagEnumProc, 0, 0); + rc = acmFormatTagEnumA(had, &aftd, FormatTagEnumProc, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmFormatTagEnum(): rc = %08x, should be %08x\n", + "acmFormatTagEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); aftd.cbStruct = sizeof(aftd) - 1; - rc = acmFormatTagEnum(had, &aftd, FormatTagEnumProc, 0, 0); + rc = acmFormatTagEnumA(had, &aftd, FormatTagEnumProc, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmFormatTagEnum(): rc = %08x, should be %08x\n", + "acmFormatTagEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); aftd.cbStruct = sizeof(aftd); aftd.dwFormatTag = WAVE_FORMAT_UNKNOWN; /* try bad flag */ - rc = acmFormatTagEnum(had, &aftd, FormatTagEnumProc, 0, 1); + rc = acmFormatTagEnumA(had, &aftd, FormatTagEnumProc, 0, 1); ok(rc == MMSYSERR_INVALFLAG, - "acmFormatTagEnum(): rc = %08x, should be %08x\n", + "acmFormatTagEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALFLAG); /* try valid parameters */ - rc = acmFormatTagEnum(had, &aftd, FormatTagEnumProc, 0, 0); + rc = acmFormatTagEnumA(had, &aftd, FormatTagEnumProc, 0, 0); ok(rc == MMSYSERR_NOERROR, - "acmFormatTagEnum(): rc = %08x, should be %08x\n", + "acmFormatTagEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); HeapFree(GetProcessHeap(), 0, pwfx); @@ -454,7 +454,7 @@ trace("%s: %u\n", get_metric(uMetric), dwMetric); } -static void msacm_tests(void) +static void driver_tests(void) { MMRESULT rc; DWORD dwACMVersion = acmGetVersion(); @@ -488,7 +488,90 @@ rc, MMSYSERR_NOERROR); } +static void test_prepareheader(void) +{ + HACMSTREAM has; + ADPCMWAVEFORMAT *src; + WAVEFORMATEX dst; + MMRESULT mr; + ACMSTREAMHEADER hdr; + BYTE buf[sizeof(WAVEFORMATEX) + 32], pcm[512], input[512]; + ADPCMCOEFSET *coef; + + src = (ADPCMWAVEFORMAT*)buf; + coef = src->aCoef; + src->wfx.cbSize = 32; + src->wfx.wFormatTag = WAVE_FORMAT_ADPCM; + src->wfx.nSamplesPerSec = 22050; + src->wfx.wBitsPerSample = 4; + src->wfx.nChannels = 1; + src->wfx.nBlockAlign = 512; + src->wfx.nAvgBytesPerSec = 11025; + src->wSamplesPerBlock = 0x3f4; + src->wNumCoef = 7; + coef[0].iCoef1 = 0x0100; + coef[0].iCoef2 = 0x0000; + coef[1].iCoef1 = 0x0200; + coef[1].iCoef2 = 0xff00; + coef[2].iCoef1 = 0x0000; + coef[2].iCoef2 = 0x0000; + coef[3].iCoef1 = 0x00c0; + coef[3].iCoef2 = 0x0040; + coef[4].iCoef1 = 0x00f0; + coef[4].iCoef2 = 0x0000; + coef[5].iCoef1 = 0x01cc; + coef[5].iCoef2 = 0xff30; + coef[6].iCoef1 = 0x0188; + coef[6].iCoef2 = 0xff18; + + dst.cbSize = 0; + dst.wFormatTag = WAVE_FORMAT_PCM; + dst.nSamplesPerSec = 22050; + dst.wBitsPerSample = 8; + dst.nChannels = 1; + dst.nBlockAlign = dst.wBitsPerSample * dst.nChannels / 8; + dst.nAvgBytesPerSec = dst.nSamplesPerSec * dst.nBlockAlign; + + mr = acmStreamOpen(&has, NULL, (WAVEFORMATEX*)src, &dst, NULL, 0, 0, 0); + ok(mr == MMSYSERR_NOERROR, "open failed: 0x%x\n", mr); + + memset(&hdr, 0, sizeof(hdr)); + hdr.cbStruct = sizeof(hdr); + hdr.pbSrc = input; + hdr.cbSrcLength = sizeof(input); + hdr.pbDst = pcm; + hdr.cbDstLength = sizeof(pcm); + + mr = acmStreamPrepareHeader(has, &hdr, 0); + ok(mr == MMSYSERR_NOERROR, "prepare failed: 0x%x\n", mr); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_PREPARED, "header wasn't prepared: 0x%x\n", hdr.fdwStatus); + + mr = acmStreamUnprepareHeader(has, &hdr, 0); + ok(mr == MMSYSERR_NOERROR, "unprepare failed: 0x%x\n", mr); + ok(hdr.fdwStatus == 0, "header wasn't unprepared: 0x%x\n", hdr.fdwStatus); + + memset(&hdr, 0, sizeof(hdr)); + hdr.cbStruct = sizeof(hdr); + hdr.pbSrc = input; + hdr.cbSrcLength = sizeof(input); + hdr.pbDst = pcm; + hdr.cbDstLength = sizeof(pcm); + hdr.fdwStatus = ACMSTREAMHEADER_STATUSF_DONE; + + mr = acmStreamPrepareHeader(has, &hdr, 0); + ok(mr == MMSYSERR_NOERROR, "prepare failed: 0x%x\n", mr); + ok(hdr.fdwStatus == (ACMSTREAMHEADER_STATUSF_PREPARED | ACMSTREAMHEADER_STATUSF_DONE), "header wasn't prepared: 0x%x\n", hdr.fdwStatus); + + mr = acmStreamUnprepareHeader(has, &hdr, 0); + ok(mr == MMSYSERR_NOERROR, "unprepare failed: 0x%x\n", mr); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%x\n", hdr.fdwStatus); + + mr = acmStreamClose(has, 0); + ok(mr == MMSYSERR_NOERROR, "close failed: 0x%x\n", mr); +} + START_TEST(msacm) { - msacm_tests(); -} + driver_tests(); + test_prepareheader(); +}

1 0

[akhaldi] 62909: [MSACM32] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 23 Apr '14

23 Apr '14

Author: akhaldi Date: Wed Apr 23 14:15:25 2014 New Revision: 62909 URL: http://svn.reactos.org/svn/reactos?rev=62909&view=rev Log: [MSACM32] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/msacm32/stream.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msacm32/stream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/stream.c… ============================================================================== --- trunk/reactos/dll/win32/msacm32/stream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/stream.c [iso-8859-1] Wed Apr 23 14:15:25 2014 @@ -298,9 +298,6 @@ if (fdwPrepare) ret = MMSYSERR_INVALFLAG; - if (pash->fdwStatus & ACMSTREAMHEADER_STATUSF_DONE) - return MMSYSERR_NOERROR; - /* Note: the ACMSTREAMHEADER and ACMDRVSTREAMHEADER structs are of same * size. some fields are private to msacm internals, and are exposed * in ACMSTREAMHEADER in the dwReservedDriver array @@ -321,7 +318,7 @@ ret = MSACM_Message((HACMDRIVER)was->pDrv, ACMDM_STREAM_PREPARE, (LPARAM)&was->drvInst, (LPARAM)padsh); if (ret == MMSYSERR_NOERROR || ret == MMSYSERR_NOTSUPPORTED) { ret = MMSYSERR_NOERROR; - padsh->fdwStatus &= ~(ACMSTREAMHEADER_STATUSF_DONE|ACMSTREAMHEADER_STATUSF_INQUEUE); + padsh->fdwStatus &= ~ACMSTREAMHEADER_STATUSF_INQUEUE; padsh->fdwStatus |= ACMSTREAMHEADER_STATUSF_PREPARED; padsh->fdwPrepared = padsh->fdwStatus; padsh->dwPrepared = 0; @@ -464,8 +461,8 @@ ret = MSACM_Message((HACMDRIVER)was->pDrv, ACMDM_STREAM_UNPREPARE, (LPARAM)&was->drvInst, (LPARAM)padsh); if (ret == MMSYSERR_NOERROR || ret == MMSYSERR_NOTSUPPORTED) { ret = MMSYSERR_NOERROR; - padsh->fdwStatus &= ~(ACMSTREAMHEADER_STATUSF_DONE|ACMSTREAMHEADER_STATUSF_INQUEUE|ACMSTREAMHEADER_STATUSF_PREPARED); - } - TRACE("=> (%d)\n", ret); - return ret; -} + padsh->fdwStatus &= ~(ACMSTREAMHEADER_STATUSF_INQUEUE|ACMSTREAMHEADER_STATUSF_PREPARED); + } + TRACE("=> (%d)\n", ret); + return ret; +} 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] Wed Apr 23 14:15:25 2014 @@ -107,7 +107,7 @@ reactos/dll/win32/mmdevapi # Synced to Wine-1.7.1 reactos/dll/win32/mpr # Synced to Wine-1.7.1 reactos/dll/win32/mprapi # Synced to Wine-1.7.1 -reactos/dll/win32/msacm32 # Synced to Wine-1.7.1 +reactos/dll/win32/msacm32 # Synced to Wine-1.7.17 reactos/dll/win32/msadp32.acm # Synced to Wine-1.7.1 reactos/dll/win32/mscat32 # Synced to Wine-1.7.1 reactos/dll/win32/mscms # Synced to Wine-1.7.1

1 0

[akhaldi] 62908: [MLANG] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 23 Apr '14

23 Apr '14

Author: akhaldi Date: Wed Apr 23 14:10:33 2014 New Revision: 62908 URL: http://svn.reactos.org/svn/reactos?rev=62908&view=rev Log: [MLANG] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/mlang/mlang.c trunk/reactos/dll/win32/mlang/mlang_classes.idl trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mlang/mlang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/mlang.c?re… ============================================================================== --- trunk/reactos/dll/win32/mlang/mlang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mlang/mlang.c [iso-8859-1] Wed Apr 23 14:10:33 2014 @@ -39,6 +39,7 @@ //#include "objbase.h" #include <rpcproxy.h> #include <mlang.h> +#include <mimeole.h> #include <wine/unicode.h> #include <wine/debug.h> @@ -46,8 +47,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mlang); //#include "initguid.h" - -#define CP_UNICODE 1200 static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj); static HRESULT MLangConvertCharset_create(IUnknown *outer, void **obj); @@ -577,8 +576,8 @@ static int han2zen(unsigned char *p1, unsigned char *p2) { - int maru = FALSE; - int nigori = FALSE; + BOOL maru = FALSE; + BOOL nigori = FALSE; static const unsigned char char1[] = {129,129,129,129,129,131,131,131,131, 131,131,131,131,131,131,129,131,131,131,131,131,131,131,131,131,131, 131,131,131,131,131,131,131,131,131,131,131,131,131,131,131,131,131, @@ -625,7 +624,7 @@ DWORD i = 0; int j = 0; unsigned char p2,p; - int shifted = FALSE; + BOOL shifted = FALSE; while (i < count) { @@ -693,7 +692,7 @@ DWORD i = 0; int j = 0; unsigned char p2,p; - int shifted = FALSE; + BOOL shifted = FALSE; while (i < count) { @@ -3487,10 +3486,28 @@ LONG* pcchLine, LONG* pcchSkip) { + LONG i, line = cchSrc, skip = 0; + FIXME("(%p)->%i %i %s %i %i %p %p\n", iface, locale, uCodePage, debugstr_an(pszSrc,cchSrc), cchSrc, cMaxColumns, pcchLine, pcchSkip); - *pcchLine = cchSrc; - *pcchSkip = 0; + if (uCodePage == CP_USASCII && cchSrc > cMaxColumns) + { + for (line = cMaxColumns, i = cMaxColumns - 1; i >= 0; i--) + { + if (pszSrc[i] == ' ') + { + while (i >= 0 && pszSrc[i] == ' ') + { + i--; + line--; + skip++; + } + break; + } + } + } + *pcchLine = line; + *pcchSkip = skip; return S_OK; } Modified: trunk/reactos/dll/win32/mlang/mlang_classes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/mlang_clas… ============================================================================== --- trunk/reactos/dll/win32/mlang/mlang_classes.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mlang/mlang_classes.idl [iso-8859-1] Wed Apr 23 14:10:33 2014 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#pragma makedep register [ helpstring("Multi Language Support"), 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] Wed Apr 23 14:10:33 2014 @@ -103,7 +103,7 @@ reactos/dll/win32/mciqtz32 # Synced to Wine-1.7.17 reactos/dll/win32/mciseq # Synced to Wine-1.7.1 reactos/dll/win32/mciwave # Synced to Wine-1.7.1 -reactos/dll/win32/mlang # Synced to Wine-1.7.1 +reactos/dll/win32/mlang # Synced to Wine-1.7.17 reactos/dll/win32/mmdevapi # Synced to Wine-1.7.1 reactos/dll/win32/mpr # Synced to Wine-1.7.1 reactos/dll/win32/mprapi # Synced to Wine-1.7.1

1 0

[akhaldi] 62907: [MCIQTZ32] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 23 Apr '14

23 Apr '14

Author: akhaldi Date: Wed Apr 23 14:06:15 2014 New Revision: 62907 URL: http://svn.reactos.org/svn/reactos?rev=62907&view=rev Log: [MCIQTZ32] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/mciqtz32/mciqtz.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mciqtz32/mciqtz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciqtz32/mciqtz.… ============================================================================== --- trunk/reactos/dll/win32/mciqtz32/mciqtz.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciqtz32/mciqtz.c [iso-8859-1] Wed Apr 23 14:06:15 2014 @@ -264,7 +264,7 @@ if (wma->uninit) CoUninitialize(); - wma->uninit = 0; + wma->uninit = FALSE; return MCIERR_INTERNAL; } @@ -736,13 +736,13 @@ if (dwFlags & MCI_DGV_WHERE_SOURCE) { if (dwFlags & MCI_DGV_WHERE_MAX) - FIXME("MCI_DGV_WHERE_SOURCE_MAX stub %s\n", wine_dbgstr_rect(&rc)); + FIXME("MCI_DGV_WHERE_SOURCE_MAX stub\n"); IBasicVideo_GetSourcePosition(wma->vidbasic, &rc.left, &rc.top, &rc.right, &rc.bottom); TRACE("MCI_DGV_WHERE_SOURCE %s\n", wine_dbgstr_rect(&rc)); } if (dwFlags & MCI_DGV_WHERE_DESTINATION) { if (dwFlags & MCI_DGV_WHERE_MAX) - FIXME("MCI_DGV_WHERE_DESTINATION_MAX stub %s\n", wine_dbgstr_rect(&rc)); + FIXME("MCI_DGV_WHERE_DESTINATION_MAX stub\n"); IBasicVideo_GetDestinationPosition(wma->vidbasic, &rc.left, &rc.top, &rc.right, &rc.bottom); TRACE("MCI_DGV_WHERE_DESTINATION %s\n", wine_dbgstr_rect(&rc)); } 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] Wed Apr 23 14:06:15 2014 @@ -100,7 +100,7 @@ reactos/dll/win32/mapi32 # Synced to Wine-1.7.17 reactos/dll/win32/mciavi32 # Synced to Wine-1.7.1 reactos/dll/win32/mcicda # Synced to Wine-1.7.1 -reactos/dll/win32/mciqtz32 # Synced to Wine-1.7.1 +reactos/dll/win32/mciqtz32 # Synced to Wine-1.7.17 reactos/dll/win32/mciseq # Synced to Wine-1.7.1 reactos/dll/win32/mciwave # Synced to Wine-1.7.1 reactos/dll/win32/mlang # Synced to Wine-1.7.1

1 0

[akhaldi] 62906: [MAPI32_WINETEST] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 23 Apr '14

23 Apr '14

Author: akhaldi Date: Wed Apr 23 14:03:16 2014 New Revision: 62906 URL: http://svn.reactos.org/svn/reactos?rev=62906&view=rev Log: [MAPI32_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/mapi32/prop.c Modified: trunk/rostests/winetests/mapi32/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mapi32/prop.c?r… ============================================================================== --- trunk/rostests/winetests/mapi32/prop.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mapi32/prop.c [iso-8859-1] Wed Apr 23 14:03:16 2014 @@ -716,7 +716,7 @@ GUID iids[4], *iid = iids; SCODE res; ULONG pt, exp, ulRet; - int success = 1; + BOOL success = TRUE; if (!pScCountProps) {

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