Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 69981: [VERSION] 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:38:47 2015 New Revision: 69981 URL: http://svn.reactos.org/svn/reactos?rev=69981&view=rev Log: [VERSION] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/version/version.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/version/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/version/version.… ============================================================================== --- trunk/reactos/dll/win32/version/version.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/version/version.c [iso-8859-1] Sat Nov 21 09:38:47 2015 @@ -1372,7 +1372,7 @@ alloclen = 1000; buf=HeapAlloc(GetProcessHeap(), 0, alloclen); if(buf == NULL) { - WARN("Memory exausted while fetching version info!\n"); + WARN("Memory exhausted while fetching version info!\n"); return NULL; } while (1) { @@ -1386,7 +1386,7 @@ HeapFree(GetProcessHeap(), 0, buf); buf = HeapAlloc(GetProcessHeap(), 0, alloclen); if(buf == NULL) { - WARN("Memory exausted while fetching version info!\n"); + WARN("Memory exhausted while fetching version info!\n"); return NULL; } } else { 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:38:47 2015 @@ -196,7 +196,7 @@ reactos/dll/win32/usp10 # Synced to WineStaging-1.7.47 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to WineStaging-1.7.47 -reactos/dll/win32/version # Synced to WineStaging-1.7.47 +reactos/dll/win32/version # Synced to WineStaging-1.7.55 reactos/dll/win32/vssapi # Synced to WineStaging-1.7.47 reactos/dll/win32/wbemdisp # Synced to WineStaging-1.7.47 reactos/dll/win32/wbemprox # Synced to WineStaging-1.7.47

1 0

[akhaldi] 69980: [URLMON_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:37:15 2015 New Revision: 69980 URL: http://svn.reactos.org/svn/reactos?rev=69980&view=rev Log: [URLMON_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/urlmon/protocol.c trunk/rostests/winetests/urlmon/url.c Modified: trunk/rostests/winetests/urlmon/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/protocol… ============================================================================== --- trunk/rostests/winetests/urlmon/protocol.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/protocol.c [iso-8859-1] Sat Nov 21 09:37:15 2015 @@ -31,7 +31,7 @@ //#include "winbase.h" #include <winnls.h> #include <ole2.h> -//#include "urlmon.h" +#include <urlmon.h> #include <wininet.h> static HRESULT (WINAPI *pCoInternetGetSession)(DWORD, IInternetSession **, DWORD); @@ -892,6 +892,9 @@ case BINDSTATUS_RESERVED_7: trace("BINDSTATUS_RESERVED_7\n"); break; + case BINDSTATUS_RESERVED_8: + trace("BINDSTATUS_RESERVED_8\n"); + break; default: ok(0, "Unexpected status %d (%d)\n", ulStatusCode, ulStatusCode-BINDSTATUS_LAST); }; @@ -1410,6 +1413,9 @@ CHECK_EXPECT(GetBindString_ROOTDOC_URL); ok(cEl == 1, "cEl=%d, expected 1\n", cEl); return E_NOTIMPL; + case BINDSTRING_ENTERPRISE_ID: + ok(cEl == 1, "cEl=%d, expected 1\n", cEl); + return E_NOTIMPL; default: ok(0, "unexpected ulStringType %d\n", ulStringType); } Modified: trunk/rostests/winetests/urlmon/url.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/url.c?re… ============================================================================== --- trunk/rostests/winetests/urlmon/url.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/url.c [iso-8859-1] Sat Nov 21 09:37:15 2015 @@ -2871,7 +2871,7 @@ url_a = (flags & BINDTEST_INVALID_CN) ? "https://209.46.25.134/favicon.ico" : "https://test.winehq.org/tests/hello.html"; break; case FTP_TEST: - url_a = "ftp://ftp.winehq.org/pub/other/winelogo.xcf.tar.bz2"; + url_a = "ftp://ftp.winehq.org/welcome.msg"; break; default: url_a = "winetest:test";

1 0

[akhaldi] 69979: [PSDK] Add missing BINDSTRING_ENTERPRISE_ID.
by akhaldi＠svn.reactos.org 21 Nov '15

21 Nov '15

Author: akhaldi Date: Sat Nov 21 09:36:54 2015 New Revision: 69979 URL: http://svn.reactos.org/svn/reactos?rev=69979&view=rev Log: [PSDK] Add missing BINDSTRING_ENTERPRISE_ID. Modified: trunk/reactos/include/psdk/urlmon.idl Modified: trunk/reactos/include/psdk/urlmon.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/urlmon.idl?re… ============================================================================== --- trunk/reactos/include/psdk/urlmon.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/urlmon.idl [iso-8859-1] Sat Nov 21 09:36:54 2015 @@ -729,7 +729,8 @@ BINDSTRING_ROOTDOC_URL, BINDSTRING_INITIAL_FILENAME, BINDSTRING_PROXY_USERNAME, - BINDSTRING_PROXY_PASSWORD + BINDSTRING_PROXY_PASSWORD, + BINDSTRING_ENTERPRISE_ID } BINDSTRING; HRESULT GetBindInfo(

1 0

[akhaldi] 69978: [URLMON] 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:32:38 2015 New Revision: 69978 URL: http://svn.reactos.org/svn/reactos?rev=69978&view=rev Log: [URLMON] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/urlmon/session.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/urlmon/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/session.c… ============================================================================== --- trunk/reactos/dll/win32/urlmon/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/session.c [iso-8859-1] Sat Nov 21 09:32:38 2015 @@ -540,7 +540,7 @@ ' ','(','c','o','m','p','a','t','i','b','l','e',';', ' ','M','S','I','E',' ','8','.','0',';', ' ','W','i','n','d','o','w','s',' ','%','s','%','d','.','%','d',';', - ' ','%','s',';',' ','T','r','i','d','e','n','t','/','5','.','0',0}; + ' ','%','s','T','r','i','d','e','n','t','/','5','.','0',0}; static const WCHAR post_platform_keyW[] = {'S','O','F','T','W','A','R','E', '\\','M','i','c','r','o','s','o','f','t', @@ -550,9 +550,8 @@ '\\','5','.','0','\\','U','s','e','r',' ','A','g','e','n','t', '\\','P','o','s','t',' ','P','l','a','t','f','o','r','m',0}; static const WCHAR ntW[] = {'N','T',' ',0}; - static const WCHAR win32W[] = {'W','i','n','3','2',0}; - static const WCHAR win64W[] = {'W','i','n','6','4',0}; - static const WCHAR wow64W[] = {'W','O','W','6','4',0}; + static const WCHAR win64W[] = {'W','i','n','6','4',';',' ','x','6','4',';',' ',0}; + static const WCHAR wow64W[] = {'W','O','W','6','4',';',' ',0}; static const WCHAR emptyW[] = {0}; if(user_agent) @@ -566,7 +565,7 @@ else if(IsWow64Process(GetCurrentProcess(), &is_wow) && is_wow) os_type = wow64W; else - os_type = win32W; + os_type = emptyW; sprintfW(buf, formatW, is_nt, info.dwMajorVersion, info.dwMinorVersion, os_type); len = strlenW(buf); 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:32:38 2015 @@ -192,7 +192,7 @@ reactos/dll/win32/twain_32 # Synced to WineStaging-1.7.37 reactos/dll/win32/updspapi # Synced to WineStaging-1.7.47 reactos/dll/win32/url # Synced to WineStaging-1.7.47 -reactos/dll/win32/urlmon # Synced to WineStaging-1.7.47 +reactos/dll/win32/urlmon # Synced to WineStaging-1.7.55 reactos/dll/win32/usp10 # Synced to WineStaging-1.7.47 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to WineStaging-1.7.47

1 0

[akhaldi] 69977: [SXS] 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:30:09 2015 New Revision: 69977 URL: http://svn.reactos.org/svn/reactos?rev=69977&view=rev Log: [SXS] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/sxs/sxs_private.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/sxs/sxs_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/sxs_private.… ============================================================================== --- trunk/reactos/dll/win32/sxs/sxs_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sxs/sxs_private.h [iso-8859-1] Sat Nov 21 09:30:09 2015 @@ -46,7 +46,7 @@ NAME_ATTR_ID_VERSION }; -const WCHAR *get_name_attribute( IAssemblyName *, enum name_attr_id ); +const WCHAR *get_name_attribute( IAssemblyName *, enum name_attr_id ) DECLSPEC_HIDDEN; static inline WCHAR *strdupW( const WCHAR *src ) { 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:30:09 2015 @@ -186,7 +186,7 @@ reactos/dll/win32/stdole2.tlb # Synced to WineStaging-1.7.47 reactos/dll/win32/stdole32.tlb # Synced to WineStaging-1.7.47 reactos/dll/win32/sti # Synced to WineStaging-1.7.47 -reactos/dll/win32/sxs # Synced to WineStaging-1.7.47 +reactos/dll/win32/sxs # Synced to WineStaging-1.7.55 reactos/dll/win32/tapi32 # Synced to WineStaging-1.7.47 reactos/dll/win32/traffic # Synced to WineStaging-1.7.47 reactos/dll/win32/twain_32 # Synced to WineStaging-1.7.37

1 0

[akhaldi] 69976: [MCISEQ] 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:27:41 2015 New Revision: 69976 URL: http://svn.reactos.org/svn/reactos?rev=69976&view=rev Log: [MCISEQ] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/mciseq/mcimidi.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mciseq/mcimidi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciseq/mcimidi.c… ============================================================================== --- trunk/reactos/dll/win32/mciseq/mcimidi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciseq/mcimidi.c [iso-8859-1] Sat Nov 21 09:27:41 2015 @@ -778,7 +778,7 @@ if (oldstat == MCI_MODE_PAUSE) dwRet = midiOutReset((HMIDIOUT)wmm->hMidi); - if ((dwFlags & MCI_WAIT) && wmm->hThread) + if (wmm->hThread) WaitForSingleObject(wmm->hThread, INFINITE); } @@ -810,7 +810,10 @@ wmm->hFile = 0; TRACE("hFile closed !\n"); } - if (wmm->hThread) CloseHandle(wmm->hThread); + if (wmm->hThread) { + CloseHandle(wmm->hThread); + wmm->hThread = 0; + } HeapFree(GetProcessHeap(), 0, wmm->tracks); HeapFree(GetProcessHeap(), 0, wmm->lpstrElementName); HeapFree(GetProcessHeap(), 0, wmm->lpstrCopyright); 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:27:41 2015 @@ -96,7 +96,7 @@ reactos/dll/win32/mciavi32 # Synced to WineStaging-1.7.55 reactos/dll/win32/mcicda # Synced to WineStaging-1.7.55 reactos/dll/win32/mciqtz32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/mciseq # Synced to WineStaging-1.7.47 +reactos/dll/win32/mciseq # Synced to WineStaging-1.7.55 reactos/dll/win32/mciwave # Synced to WineStaging-1.7.47 reactos/dll/win32/mgmtapi # Synced to WineStaging-1.7.47 reactos/dll/win32/mlang # Synced to WineStaging-1.7.47

1 0

[akhaldi] 69975: [MCICDA] 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:26:27 2015 New Revision: 69975 URL: http://svn.reactos.org/svn/reactos?rev=69975&view=rev Log: [MCICDA] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/mcicda/mcicda.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mcicda/mcicda.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mcicda/mcicda.c?… ============================================================================== --- trunk/reactos/dll/win32/mcicda/mcicda.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mcicda/mcicda.c [iso-8859-1] Sat Nov 21 09:26:27 2015 @@ -81,6 +81,31 @@ typedef HRESULT(WINAPI*LPDIRECTSOUNDCREATE)(LPCGUID,LPDIRECTSOUND*,LPUNKNOWN); static LPDIRECTSOUNDCREATE pDirectSoundCreate; +static BOOL device_io(HANDLE dev, DWORD code, void *inbuffer, DWORD insize, void *outbuffer, DWORD outsize, DWORD *retsize, OVERLAPPED *overlapped) +{ + const char *str; + BOOL ret = DeviceIoControl(dev, code, inbuffer, insize, outbuffer, outsize, retsize, overlapped); + +#define XX(x) case (x): str = #x; break + switch (code) + { + XX(IOCTL_CDROM_RAW_READ); + XX(IOCTL_CDROM_READ_TOC); + XX(IOCTL_CDROM_READ_Q_CHANNEL); + XX(IOCTL_CDROM_SEEK_AUDIO_MSF); + XX(IOCTL_CDROM_PLAY_AUDIO_MSF); + XX(IOCTL_CDROM_STOP_AUDIO); + XX(IOCTL_CDROM_PAUSE_AUDIO); + XX(IOCTL_CDROM_RESUME_AUDIO); + XX(IOCTL_STORAGE_EJECT_MEDIA); + XX(IOCTL_STORAGE_LOAD_MEDIA); + default: str = wine_dbg_sprintf("UNKNOWN (0x%x)", code); + }; +#undef XX + TRACE("Device %p, Code %s -> Return %d, Bytes %u\n", dev, str, ret, *retsize); + return ret; +} + static DWORD CALLBACK MCICDA_playLoop(void *ptr) { WINE_MCICDAUDIO *wmcda = (WINE_MCICDAUDIO*)ptr; @@ -123,7 +148,7 @@ if (SUCCEEDED(hr)) { if (rdInfo.SectorCount > 0) { - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_RAW_READ, &rdInfo, sizeof(rdInfo), cdData, lockLen, &br, NULL)) + if (!device_io(wmcda->handle, IOCTL_CDROM_RAW_READ, &rdInfo, sizeof(rdInfo), cdData, lockLen, &br, NULL)) WARN("CD read failed at sector %d: 0x%x\n", wmcda->start, GetLastError()); } if (rdInfo.SectorCount*RAW_SECTOR_SIZE < lockLen) { @@ -256,7 +281,7 @@ mode = MCI_MODE_PLAY; } } - else if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), + else if (!device_io(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), &data, sizeof(data), &br, NULL)) { if (GetLastError() == ERROR_NOT_READY) mode = MCI_MODE_OPEN; } else { @@ -319,7 +344,7 @@ case MCI_FORMAT_TMSF: default: /* unknown format ! force TMSF ! ... */ wTrack = MCI_TMSF_TRACK(dwTime); - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, &toc, sizeof(toc), &br, NULL)) return 0; if (wTrack < toc.FirstTrack || wTrack > toc.LastTrack) @@ -370,7 +395,7 @@ break; case MCI_FORMAT_TMSF: default: /* unknown format ! force TMSF ! ... */ - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, &toc, sizeof(toc), &br, NULL)) return 0; if (dwFrame < FRAME_OF_TOC(toc, toc.FirstTrack) || @@ -642,7 +667,7 @@ DWORD br; static const WCHAR wszLu[] = {'%','l','u',0}; - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, &toc, sizeof(toc), &br, NULL)) { return MCICDA_GetError(wmcda); } @@ -657,10 +682,9 @@ if (!ret) { TRACE("=> %s\n", debugstr_w(str)); if (lpParms->dwRetSize) { - WCHAR zero = 0; /* FIXME? Since NT, mciwave, mciseq and mcicda set dwRetSize * to the number of characters written, excluding \0. */ - lstrcpynW(lpParms->lpstrReturn, str ? str : &zero, lpParms->dwRetSize); + lstrcpynW(lpParms->lpstrReturn, str, lpParms->dwRetSize); } else ret = MCIERR_PARAM_OVERFLOW; } if (MMSYSERR_NOERROR==ret && (dwFlags & MCI_NOTIFY)) @@ -690,7 +714,7 @@ switch (lpParms->dwItem) { case MCI_STATUS_CURRENT_TRACK: fmt.Format = IOCTL_CDROM_CURRENT_POSITION; - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), + if (!device_io(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), &data, sizeof(data), &br, NULL)) { return MCICDA_GetError(wmcda); @@ -700,7 +724,7 @@ TRACE("CURRENT_TRACK=%lu\n", lpParms->dwReturn); break; case MCI_STATUS_LENGTH: - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, &toc, sizeof(toc), &br, NULL)) { WARN("error reading TOC !\n"); return MCICDA_GetError(wmcda); @@ -742,7 +766,7 @@ ret = MCI_RESOURCE_RETURNED; break; case MCI_STATUS_NUMBER_OF_TRACKS: - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, &toc, sizeof(toc), &br, NULL)) { WARN("error reading TOC !\n"); return MCICDA_GetError(wmcda); @@ -755,7 +779,7 @@ case MCI_STATUS_POSITION: switch (dwFlags & (MCI_STATUS_START | MCI_TRACK)) { case MCI_STATUS_START: - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, &toc, sizeof(toc), &br, NULL)) { WARN("error reading TOC !\n"); return MCICDA_GetError(wmcda); @@ -764,7 +788,7 @@ TRACE("get MCI_STATUS_START !\n"); break; case MCI_TRACK: - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, &toc, sizeof(toc), &br, NULL)) { WARN("error reading TOC !\n"); return MCICDA_GetError(wmcda); @@ -776,7 +800,7 @@ break; case 0: fmt.Format = IOCTL_CDROM_CURRENT_POSITION; - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), + if (!device_io(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), &data, sizeof(data), &br, NULL)) { return MCICDA_GetError(wmcda); } @@ -813,7 +837,7 @@ if (!(dwFlags & MCI_TRACK)) ret = MCIERR_MISSING_PARAMETER; else { - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, &toc, sizeof(toc), &br, NULL)) { WARN("error reading TOC !\n"); return MCICDA_GetError(wmcda); @@ -845,7 +869,7 @@ int i; DWORD br; CDROM_TOC toc; - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, &toc, sizeof(toc), &br, NULL)) { WARN("error reading TOC !\n"); return MCICDA_GetError(wmcda); @@ -892,7 +916,7 @@ if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, &toc, sizeof(toc), &br, NULL)) { WARN("error reading TOC !\n"); return MCICDA_GetError(wmcda); @@ -905,7 +929,7 @@ TRACE("MCI_FROM=%08X -> %u\n", lpParms->dwFrom, start); } else { fmt.Format = IOCTL_CDROM_CURRENT_POSITION; - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), + if (!device_io(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), &data, sizeof(data), &br, NULL)) { return MCICDA_GetError(wmcda); } @@ -997,7 +1021,7 @@ wmcda->end-wmcda->start); rdInfo.TrackMode = CDDA; - readok = DeviceIoControl(wmcda->handle, IOCTL_CDROM_RAW_READ, + readok = device_io(wmcda->handle, IOCTL_CDROM_RAW_READ, &rdInfo, sizeof(rdInfo), cdData, lockLen, &br, NULL); IDirectSoundBuffer_Unlock(wmcda->dsBuf, cdData, lockLen, NULL, 0); @@ -1047,7 +1071,7 @@ play.EndingM = end / CDFRAMES_PERMIN; play.EndingS = (end / CDFRAMES_PERSEC) % 60; play.EndingF = end % CDFRAMES_PERSEC; - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_PLAY_AUDIO_MSF, &play, sizeof(play), + if (!device_io(wmcda->handle, IOCTL_CDROM_PLAY_AUDIO_MSF, &play, sizeof(play), NULL, 0, &br, NULL)) { wmcda->hCallback = NULL; ret = MCIERR_HARDWARE; @@ -1087,7 +1111,7 @@ IDirectSound_Release(wmcda->dsObj); wmcda->dsObj = NULL; } - else if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_STOP_AUDIO, NULL, 0, NULL, 0, &br, NULL)) + else if (!device_io(wmcda->handle, IOCTL_CDROM_STOP_AUDIO, NULL, 0, NULL, 0, &br, NULL)) return MCIERR_HARDWARE; if ((dwFlags & MCI_NOTIFY) && lpParms) @@ -1117,7 +1141,7 @@ FAILED(IDirectSoundBuffer_Stop(wmcda->dsBuf))) return MCIERR_HARDWARE; } - else if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_PAUSE_AUDIO, NULL, 0, NULL, 0, &br, NULL)) + else if (!device_io(wmcda->handle, IOCTL_CDROM_PAUSE_AUDIO, NULL, 0, NULL, 0, &br, NULL)) return MCIERR_HARDWARE; if ((dwFlags & MCI_NOTIFY) && lpParms) @@ -1143,7 +1167,7 @@ FAILED(IDirectSoundBuffer_Play(wmcda->dsBuf, 0, 0, DSBPLAY_LOOPING))) return MCIERR_HARDWARE; } - else if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_RESUME_AUDIO, NULL, 0, NULL, 0, &br, NULL)) + else if (!device_io(wmcda->handle, IOCTL_CDROM_RESUME_AUDIO, NULL, 0, NULL, 0, &br, NULL)) return MCIERR_HARDWARE; if ((dwFlags & MCI_NOTIFY) && lpParms) @@ -1176,7 +1200,7 @@ * then only checks the position flags, then stops and seeks. */ MCICDA_Stop(wDevID, MCI_WAIT, 0); - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, &toc, sizeof(toc), &br, NULL)) { WARN("error reading TOC !\n"); return MCICDA_GetError(wmcda); @@ -1210,7 +1234,7 @@ seek.M = at / CDFRAMES_PERMIN; seek.S = (at / CDFRAMES_PERSEC) % 60; seek.F = at % CDFRAMES_PERSEC; - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_SEEK_AUDIO_MSF, &seek, sizeof(seek), + if (!device_io(wmcda->handle, IOCTL_CDROM_SEEK_AUDIO_MSF, &seek, sizeof(seek), NULL, 0, &br, NULL)) return MCIERR_HARDWARE; } @@ -1232,7 +1256,7 @@ if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; - if (!DeviceIoControl(wmcda->handle, + if (!device_io(wmcda->handle, (open) ? IOCTL_STORAGE_EJECT_MEDIA : IOCTL_STORAGE_LOAD_MEDIA, NULL, 0, NULL, 0, &br, NULL)) return MCIERR_HARDWARE; 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:26:27 2015 @@ -94,7 +94,7 @@ reactos/dll/win32/lz32 # Synced to WineStaging-1.7.47 reactos/dll/win32/mapi32 # Synced to WineStaging-1.7.47 reactos/dll/win32/mciavi32 # Synced to WineStaging-1.7.55 -reactos/dll/win32/mcicda # Synced to WineStaging-1.7.47 +reactos/dll/win32/mcicda # Synced to WineStaging-1.7.55 reactos/dll/win32/mciqtz32 # Synced to WineStaging-1.7.47 reactos/dll/win32/mciseq # Synced to WineStaging-1.7.47 reactos/dll/win32/mciwave # Synced to WineStaging-1.7.47

1 0

[akhaldi] 69974: [MCIAVI32] 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:25:00 2015 New Revision: 69974 URL: http://svn.reactos.org/svn/reactos?rev=69974&view=rev Log: [MCIAVI32] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/mciavi32/mciavi.c trunk/reactos/dll/win32/mciavi32/mmoutput.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mciavi32/mciavi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/mciavi.… ============================================================================== --- trunk/reactos/dll/win32/mciavi32/mciavi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/mciavi.c [iso-8859-1] Sat Nov 21 09:25:00 2015 @@ -391,8 +391,8 @@ { while(next_frame_us <= tc && wma->dwCurrVideoFrame < wma->dwToVideoFrame){ double dur; + dur = MCIAVI_PaintFrame(wma, hDC); ++wma->dwCurrVideoFrame; - dur = MCIAVI_PaintFrame(wma, hDC); if(!dur) break; next_frame_us += dur; @@ -400,14 +400,19 @@ } ReleaseDC(wma->hWndPaint, hDC); } - if(wma->dwCurrVideoFrame >= wma->dwToVideoFrame) - break; + if (wma->dwCurrVideoFrame >= wma->dwToVideoFrame) + { + if (!(dwFlags & MCI_DGV_PLAY_REPEAT)) + break; + TRACE("repeat media as requested\n"); + wma->dwCurrVideoFrame = wma->dwCurrAudioBlock = 0; + } if (wma->lpWaveFormat) MCIAVI_PlayAudioBlocks(wma, nHdr, waveHdr); tc = currenttime_us(); - if(tc < next_frame_us) + if (tc < next_frame_us) delta = next_frame_us - tc; else delta = 0; @@ -530,7 +535,7 @@ if (dwFlags & MCI_DGV_PLAY_REVERSE) return MCIERR_UNSUPPORTED_FUNCTION; if (dwFlags & MCI_TEST) return 0; - if (dwFlags & (MCI_DGV_PLAY_REPEAT|MCI_MCIAVI_PLAY_WINDOW|MCI_MCIAVI_PLAY_FULLSCREEN|MCI_MCIAVI_PLAY_FULLBY2)) + if (dwFlags & (MCI_MCIAVI_PLAY_WINDOW|MCI_MCIAVI_PLAY_FULLSCREEN|MCI_MCIAVI_PLAY_FULLBY2)) FIXME("Unsupported flag %08x\n", dwFlags); EnterCriticalSection(&wma->cs); Modified: trunk/reactos/dll/win32/mciavi32/mmoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/mmoutpu… ============================================================================== --- trunk/reactos/dll/win32/mciavi32/mmoutput.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/mmoutput.c [iso-8859-1] Sat Nov 21 09:25:00 2015 @@ -187,8 +187,11 @@ */ twocc = TWOCCFromFOURCC(mmck->ckid); if (twocc == TWOCCFromFOURCC(wma->inbih->biCompression)) - twocc = cktypeDIBcompressed; - + twocc = cktypeDIBcompressed; + /* Also detect some chunks that seem to be used by Indeo videos where the chunk is named + * after the codec. */ + else if (twocc == LOWORD(wma->ash_video.fccHandler)) + twocc = cktypeDIBcompressed; switch (twocc) { case cktypeDIBbits: case cktypeDIBcompressed: @@ -395,8 +398,8 @@ mmioAscend(wma->hFile, &mmckInfo, 0); } if (alb.numVideoFrames != wma->dwPlayableVideoFrames) { - WARN("Found %d video frames (/%d), reducing playable frames\n", - alb.numVideoFrames, wma->dwPlayableVideoFrames); + WARN("AVI header says %d frames, we found %d video frames, reducing playable frames\n", + wma->dwPlayableVideoFrames, alb.numVideoFrames); wma->dwPlayableVideoFrames = alb.numVideoFrames; } wma->dwPlayableAudioBlocks = alb.numAudioBlocks; 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:25:00 2015 @@ -93,7 +93,7 @@ reactos/dll/win32/localui # Synced to WineStaging-1.7.47 reactos/dll/win32/lz32 # Synced to WineStaging-1.7.47 reactos/dll/win32/mapi32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/mciavi32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/mciavi32 # Synced to WineStaging-1.7.55 reactos/dll/win32/mcicda # Synced to WineStaging-1.7.47 reactos/dll/win32/mciqtz32 # Synced to WineStaging-1.7.47 reactos/dll/win32/mciseq # Synced to WineStaging-1.7.47

1 0

[akhaldi] 69973: [NTDSAPI_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:22:06 2015 New Revision: 69973 URL: http://svn.reactos.org/svn/reactos?rev=69973&view=rev Log: [NTDSAPI_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/ntdsapi/ntdsapi.c Modified: trunk/rostests/winetests/ntdsapi/ntdsapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdsapi/ntdsapi… ============================================================================== --- trunk/rostests/winetests/ntdsapi/ntdsapi.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdsapi/ntdsapi.c [iso-8859-1] Sat Nov 21 09:22:06 2015 @@ -84,7 +84,38 @@ ok(spn_length == lstrlenW(wszSpn5) + 1, "DsMakeSpnW should have returned spn_length of %d instead of %d\n", lstrlenW(wszSpn5) + 1, spn_length); } +static void test_DsClientMakeSpnForTargetServer(void) +{ + static const WCHAR classW[] = {'c','l','a','s','s',0}; + static const WCHAR hostW[] = {'h','o','s','t','.','d','o','m','a','i','n',0}; + static const WCHAR resultW[] = {'c','l','a','s','s','/','h','o','s','t','.','d','o','m','a','i','n',0}; + DWORD ret, len; + WCHAR buf[256]; + + ret = DsClientMakeSpnForTargetServerW( NULL, NULL, NULL, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + ret = DsClientMakeSpnForTargetServerW( classW, NULL, NULL, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + ret = DsClientMakeSpnForTargetServerW( classW, hostW, NULL, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + len = 0; + ret = DsClientMakeSpnForTargetServerW( classW, hostW, &len, NULL ); + ok( ret == ERROR_BUFFER_OVERFLOW, "got %u\n", ret ); + ok( len == lstrlenW(resultW) + 1, "got %u\n", len ); + + len = sizeof(buf)/sizeof(buf[0]); + buf[0] = 0; + ret = DsClientMakeSpnForTargetServerW( classW, hostW, &len, buf ); + ok( ret == ERROR_SUCCESS, "got %u\n", ret ); + ok( len == lstrlenW(resultW) + 1, "got %u\n", len ); + ok( !lstrcmpW( buf, resultW ), "wrong data\n" ); +} + START_TEST( ntdsapi ) { test_DsMakeSpn(); + test_DsClientMakeSpnForTargetServer(); }

1 0

[akhaldi] 69972: [NTDSAPI] 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:21:43 2015 New Revision: 69972 URL: http://svn.reactos.org/svn/reactos?rev=69972&view=rev Log: [NTDSAPI] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/ntdsapi/ntdsapi.c trunk/reactos/dll/win32/ntdsapi/ntdsapi.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/ntdsapi/ntdsapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntdsapi/ntdsapi.… ============================================================================== --- trunk/reactos/dll/win32/ntdsapi/ntdsapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ntdsapi/ntdsapi.c [iso-8859-1] Sat Nov 21 09:21:43 2015 @@ -205,3 +205,29 @@ debugstr_w(ServiceClass), debugstr_w(UserObjectDN)); return ERROR_CALL_NOT_IMPLEMENTED; } + +DWORD WINAPI DsClientMakeSpnForTargetServerW(LPCWSTR class, LPCWSTR name, DWORD *buflen, LPWSTR buf) +{ + DWORD len; + WCHAR *p; + + TRACE("(%s,%s,%p,%p)\n", debugstr_w(class), debugstr_w(name), buflen, buf); + + if (!class || !name || !buflen) return ERROR_INVALID_PARAMETER; + + len = strlenW(class) + 1 + strlenW(name) + 1; + if (*buflen < len) + { + *buflen = len; + return ERROR_BUFFER_OVERFLOW; + } + *buflen = len; + + memcpy(buf, class, strlenW(class) * sizeof(WCHAR)); + p = buf + strlenW(class); + *p++ = '/'; + memcpy(p, name, strlenW(name) * sizeof(WCHAR)); + buf[len - 1] = 0; + + return ERROR_SUCCESS; +} Modified: trunk/reactos/dll/win32/ntdsapi/ntdsapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntdsapi/ntdsapi.… ============================================================================== --- trunk/reactos/dll/win32/ntdsapi/ntdsapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ntdsapi/ntdsapi.spec [iso-8859-1] Sat Nov 21 09:21:43 2015 @@ -7,7 +7,7 @@ @ stub DsBindWithSpnA @ stub DsBindWithSpnW @ stub DsClientMakeSpnForTargetServerA -@ stub DsClientMakeSpnForTargetServerW +@ stdcall DsClientMakeSpnForTargetServerW(wstr wstr ptr ptr) @ stub DsCrackNamesA @ stub DsCrackNamesW @ stub DsCrackSpn2A 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:21:43 2015 @@ -138,7 +138,7 @@ reactos/dll/win32/nddeapi # Synced to WineStaging-1.7.47 reactos/dll/win32/netapi32 # Forked at Wine-1.3.34 reactos/dll/win32/npptools # Synced to WineStaging-1.7.47 -reactos/dll/win32/ntdsapi # Synced to WineStaging-1.7.47 +reactos/dll/win32/ntdsapi # Synced to WineStaging-1.7.55 reactos/dll/win32/ntprint # Synced to WineStaging-1.7.47 reactos/dll/win32/objsel # Synced to WineStaging-1.7.47 reactos/dll/win32/odbc32 # Synced to WineStaging-1.7.37. Depends on port of Linux ODBC.

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