Ros-diffs February 2017

ros-diffs@reactos.org

13 participants
353 discussions

[akhaldi] 73956: [MAPI32] Sync with Wine Staging 2.2. CORE-12823 d618c0f mapi32: Properly return interface pointer. 6e8553c mapi32: Fix some spec file entries. 454bccd mapi32: Add a stub implementa...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 17:47:40 2017 New Revision: 73956 URL: http://svn.reactos.org/svn/reactos?rev=73956&view=rev Log: [MAPI32] Sync with Wine Staging 2.2. CORE-12823 d618c0f mapi32: Properly return interface pointer. 6e8553c mapi32: Fix some spec file entries. 454bccd mapi32: Add a stub implementation of HrDispatchNotifications. Modified: trunk/reactos/dll/win32/mapi32/mapi32.spec trunk/reactos/dll/win32/mapi32/prop.c trunk/reactos/dll/win32/mapi32/util.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mapi32/mapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32.sp… ============================================================================== --- trunk/reactos/dll/win32/mapi32/mapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/mapi32.spec [iso-8859-1] Sun Feb 26 17:47:40 2017 @@ -87,8 +87,8 @@ 144 stub HrDecomposeEID@28 145 stub HrComposeMsgID@24 146 stub HrDecomposeMsgID@24 -147 stdcall OpenStreamOnFile@24(ptr ptr ptr ptr ptr ptr) OpenStreamOnFile -148 stdcall OpenStreamOnFile(ptr ptr ptr ptr ptr ptr) +147 stdcall OpenStreamOnFile@24(ptr ptr long ptr ptr ptr) OpenStreamOnFile +148 stdcall OpenStreamOnFile(ptr ptr long ptr ptr ptr) 149 stdcall OpenTnefStream@28(ptr ptr ptr long ptr long ptr) OpenTnefStream 150 stdcall OpenTnefStream(ptr ptr ptr long ptr long ptr) 151 stdcall OpenTnefStreamEx@32(ptr ptr ptr long ptr long ptr ptr) OpenTnefStreamEx @@ -145,17 +145,17 @@ 205 stub FDecodeID@12 206 stub CchOfEncoding@4 207 stdcall CbOfEncoded@4(ptr) CbOfEncoded -208 stdcall MAPISendDocuments(ptr str str str long) -209 stdcall MAPILogon(ptr str str long long ptr) -210 stdcall MAPILogoff(ptr ptr long long) -211 stdcall MAPISendMail(ptr ptr ptr long long) -212 stdcall MAPISaveMail(ptr ptr ptr long long str) -213 stdcall MAPIReadMail(ptr ptr str long long ptr) -214 stdcall MAPIFindNext(ptr ptr str str long long ptr) -215 stdcall MAPIDeleteMail(ptr ptr str long long) -217 stdcall MAPIAddress(ptr ptr str long str long ptr long long ptr ptr) -218 stdcall MAPIDetails(ptr ptr ptr long long) -219 stdcall MAPIResolveName(ptr ptr str long long ptr) +208 stdcall MAPISendDocuments(long str str str long) +209 stdcall MAPILogon(long str str long long ptr) +210 stdcall MAPILogoff(ptr long long long) +211 stdcall MAPISendMail(ptr long ptr long long) +212 stdcall MAPISaveMail(ptr long ptr long long str) +213 stdcall MAPIReadMail(ptr long str long long ptr) +214 stdcall MAPIFindNext(ptr long str str long long ptr) +215 stdcall MAPIDeleteMail(ptr long str long long) +217 stdcall MAPIAddress(ptr long str long str long ptr long long ptr ptr) +218 stdcall MAPIDetails(ptr long ptr long long) +219 stdcall MAPIResolveName(ptr long str long long ptr) 220 stub BMAPISendMail 221 stub BMAPISaveMail 222 stub BMAPIReadMail @@ -175,7 +175,7 @@ 236 stub cmc_read 237 stub cmc_send 238 stub cmc_send_documents -239 stub HrDispatchNotifications@4 +239 stdcall HrDispatchNotifications@4(long) HrDispatchNotifications 241 stub HrValidateParameters@8 244 stub ScCreateConversationIndex@16 246 stdcall HrGetOmiProvidersFlags(long long) @@ -188,4 +188,4 @@ 253 stdcall FixMAPI@0() FixMAPI 254 stdcall FGetComponentPath(str str ptr long long) 255 stdcall FGetComponentPath@20(str str ptr long long) FGetComponentPath -256 stdcall MAPISendMailW(ptr ptr ptr long long) +256 stdcall MAPISendMailW(ptr long ptr long long) Modified: trunk/reactos/dll/win32/mapi32/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/prop.c?re… ============================================================================== --- trunk/reactos/dll/win32/mapi32/prop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/prop.c [iso-8859-1] Sun Feb 26 17:47:40 2017 @@ -1501,7 +1501,7 @@ IsEqualIID(riid, &IID_IMAPIProp) || IsEqualIID(riid, &IID_IMAPIPropData)) { - *ppvObj = This; + *ppvObj = &This->IPropData_iface; IPropData_AddRef(iface); TRACE("returning %p\n", *ppvObj); return S_OK; Modified: trunk/reactos/dll/win32/mapi32/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/util.c?re… ============================================================================== --- trunk/reactos/dll/win32/mapi32/util.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/util.c [iso-8859-1] Sun Feb 26 17:47:40 2017 @@ -221,6 +221,15 @@ { /* Native does not implement this function */ return MAPI_E_NO_SUPPORT; +} + +/************************************************************************* + * HrDispatchNotifications@4 (MAPI32.239) + */ +HRESULT WINAPI HrDispatchNotifications(ULONG flags) +{ + FIXME("(%08x)\n", flags); + return S_OK; } /************************************************************************* 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] Sun Feb 26 17:47:40 2017 @@ -89,7 +89,7 @@ reactos/dll/win32/jsproxy # Synced to WineStaging-2.2 reactos/dll/win32/loadperf # Synced to WineStaging-2.2 reactos/dll/win32/lz32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/mapi32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/mapi32 # Synced to WineStaging-2.2 reactos/dll/win32/mciavi32 # Synced to WineStaging-1.9.16 reactos/dll/win32/mcicda # Synced to WineStaging-1.9.16 reactos/dll/win32/mciqtz32 # Synced to WineStaging-1.9.16

7 years, 6 months

[akhaldi] 73955: [LOADPERF] Sync with Wine Staging 2.2. CORE-12823 d6e1600 loadperf: Fix some spec file entries.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 17:43:19 2017 New Revision: 73955 URL: http://svn.reactos.org/svn/reactos?rev=73955&view=rev Log: [LOADPERF] Sync with Wine Staging 2.2. CORE-12823 d6e1600 loadperf: Fix some spec file entries. Modified: trunk/reactos/dll/win32/loadperf/loadperf.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/loadperf/loadperf.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/loadperf/loadper… ============================================================================== --- trunk/reactos/dll/win32/loadperf/loadperf.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/loadperf/loadperf.spec [iso-8859-1] Sun Feb 26 17:43:19 2017 @@ -1,6 +1,6 @@ @ stdcall BackupPerfRegistryToFileW(long long) -@ stdcall InstallPerfDllA(str str ptr) -@ stdcall InstallPerfDllW(wstr wstr ptr) +@ stdcall InstallPerfDllA(str str long) +@ stdcall InstallPerfDllW(wstr wstr long) @ stdcall LoadMofFromInstalledServiceA(ptr ptr ptr) @ stdcall LoadMofFromInstalledServiceW(ptr ptr ptr) @ stdcall LoadPerfCounterTextStringsA(str long) 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] Sun Feb 26 17:43:19 2017 @@ -87,7 +87,7 @@ reactos/dll/win32/itss # Synced to WineStaging-2.2 reactos/dll/win32/jscript # Synced to WineStaging-2.2 reactos/dll/win32/jsproxy # Synced to WineStaging-2.2 -reactos/dll/win32/loadperf # Synced to WineStaging-1.9.11 +reactos/dll/win32/loadperf # Synced to WineStaging-2.2 reactos/dll/win32/lz32 # Synced to WineStaging-1.9.11 reactos/dll/win32/mapi32 # Synced to WineStaging-1.9.11 reactos/dll/win32/mciavi32 # Synced to WineStaging-1.9.16

7 years, 6 months

[akhaldi] 73954: [JSPROXY] Sync with Wine Staging 2.2. CORE-12823 2b094f9 jsproxy: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). aee5267 jsproxy: Use debugstr_a on URL.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 17:41:19 2017 New Revision: 73954 URL: http://svn.reactos.org/svn/reactos?rev=73954&view=rev Log: [JSPROXY] Sync with Wine Staging 2.2. CORE-12823 2b094f9 jsproxy: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). aee5267 jsproxy: Use debugstr_a on URL. Modified: trunk/reactos/dll/win32/jsproxy/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/jsproxy/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jsproxy/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/jsproxy/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jsproxy/main.c [iso-8859-1] Sun Feb 26 17:41:19 2017 @@ -89,14 +89,14 @@ return TRUE; } -static inline void *heap_alloc( SIZE_T size ) -{ - return HeapAlloc( GetProcessHeap(), 0, size ); -} - -static inline BOOL heap_free( LPVOID mem ) -{ - return HeapFree( GetProcessHeap(), 0, mem ); +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); } static inline WCHAR *strdupAW( const char *src, int len ) @@ -637,7 +637,7 @@ WCHAR *urlW = NULL, *hostnameW = NULL; BOOL ret = FALSE; - TRACE( "%s, %u, %s, %u, %p, %p\n", url, len_url, hostname, len_hostname, proxy, len_proxy ); + TRACE( "%s, %u, %s, %u, %p, %p\n", debugstr_a(url), len_url, hostname, len_hostname, proxy, len_proxy ); EnterCriticalSection( &cs_jsproxy ); 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] Sun Feb 26 17:41:19 2017 @@ -86,7 +86,7 @@ reactos/dll/win32/itircl # Synced to WineStaging-1.9.11 reactos/dll/win32/itss # Synced to WineStaging-2.2 reactos/dll/win32/jscript # Synced to WineStaging-2.2 -reactos/dll/win32/jsproxy # Synced to WineStaging-1.9.11 +reactos/dll/win32/jsproxy # Synced to WineStaging-2.2 reactos/dll/win32/loadperf # Synced to WineStaging-1.9.11 reactos/dll/win32/lz32 # Synced to WineStaging-1.9.11 reactos/dll/win32/mapi32 # Synced to WineStaging-1.9.11

7 years, 6 months

[akhaldi] 73953: [JSCRIPT] Sync with Wine Staging 2.2. CORE-12823 493659e jscript: Make scope_push() static.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 17:39:01 2017 New Revision: 73953 URL: http://svn.reactos.org/svn/reactos?rev=73953&view=rev Log: [JSCRIPT] Sync with Wine Staging 2.2. CORE-12823 493659e jscript: Make scope_push() static. Modified: trunk/reactos/dll/win32/jscript/engine.c trunk/reactos/dll/win32/jscript/engine.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/jscript/engine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/engine.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/engine.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/engine.c [iso-8859-1] Sun Feb 26 17:39:01 2017 @@ -384,7 +384,7 @@ jsval_release(steal_ret(frame)); } -HRESULT scope_push(scope_chain_t *scope, jsdisp_t *jsobj, IDispatch *obj, scope_chain_t **ret) +static HRESULT scope_push(scope_chain_t *scope, jsdisp_t *jsobj, IDispatch *obj, scope_chain_t **ret) { scope_chain_t *new_scope; Modified: trunk/reactos/dll/win32/jscript/engine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/engine.h… ============================================================================== --- trunk/reactos/dll/win32/jscript/engine.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/engine.h [iso-8859-1] Sun Feb 26 17:39:01 2017 @@ -199,7 +199,6 @@ struct _scope_chain_t *next; } scope_chain_t; -HRESULT scope_push(scope_chain_t*,jsdisp_t*,IDispatch*,scope_chain_t**) DECLSPEC_HIDDEN; void scope_release(scope_chain_t*) DECLSPEC_HIDDEN; static inline scope_chain_t *scope_addref(scope_chain_t *scope) 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] Sun Feb 26 17:39:01 2017 @@ -85,7 +85,7 @@ reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/itircl # Synced to WineStaging-1.9.11 reactos/dll/win32/itss # Synced to WineStaging-2.2 -reactos/dll/win32/jscript # Synced to WineStaging-1.9.23 +reactos/dll/win32/jscript # Synced to WineStaging-2.2 reactos/dll/win32/jsproxy # Synced to WineStaging-1.9.11 reactos/dll/win32/loadperf # Synced to WineStaging-1.9.11 reactos/dll/win32/lz32 # Synced to WineStaging-1.9.11

7 years, 6 months

[akhaldi] 73952: [ITSS] Sync with Wine Staging 2.2. CORE-12823 4fdcc03 itss: Properly return interface pointers.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 17:36:06 2017 New Revision: 73952 URL: http://svn.reactos.org/svn/reactos?rev=73952&view=rev Log: [ITSS] Sync with Wine Staging 2.2. CORE-12823 4fdcc03 itss: Properly return interface pointers. Modified: trunk/reactos/dll/win32/itss/itss.c trunk/reactos/dll/win32/itss/storage.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/itss/itss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/itss.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/itss/itss.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/itss.c [iso-8859-1] Sun Feb 26 17:36:06 2017 @@ -63,7 +63,7 @@ IsEqualGUID(riid, &IID_IClassFactory)) { IClassFactory_AddRef(iface); - *ppobj = This; + *ppobj = &This->IClassFactory_iface; return S_OK; } Modified: trunk/reactos/dll/win32/itss/storage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/storage.c?r… ============================================================================== --- trunk/reactos/dll/win32/itss/storage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/storage.c [iso-8859-1] Sun Feb 26 17:36:06 2017 @@ -87,7 +87,7 @@ || IsEqualGUID(riid, &IID_IEnumSTATSTG)) { IEnumSTATSTG_AddRef(iface); - *ppvObject = This; + *ppvObject = &This->IEnumSTATSTG_iface; return S_OK; } @@ -264,7 +264,7 @@ || IsEqualGUID(riid, &IID_IStorage)) { IStorage_AddRef(iface); - *ppvObject = This; + *ppvObject = &This->IStorage_iface; return S_OK; } @@ -647,7 +647,7 @@ || IsEqualGUID(riid, &IID_IStream)) { IStream_AddRef(iface); - *ppvObject = This; + *ppvObject = &This->IStream_iface; return S_OK; } 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] Sun Feb 26 17:36:06 2017 @@ -84,7 +84,7 @@ reactos/dll/win32/inseng # Synced to WineStaging-2.2 reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/itircl # Synced to WineStaging-1.9.11 -reactos/dll/win32/itss # Synced to WineStaging-1.9.11 +reactos/dll/win32/itss # Synced to WineStaging-2.2 reactos/dll/win32/jscript # Synced to WineStaging-1.9.23 reactos/dll/win32/jsproxy # Synced to WineStaging-1.9.11 reactos/dll/win32/loadperf # Synced to WineStaging-1.9.11

7 years, 6 months

[akhaldi] 73951: [INSENG] Sync with Wine Staging 2.2. CORE-12823 dabb589 inseng: Add a __WINE_ALLOC_SIZE attribute to heap_alloc().

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 17:34:21 2017 New Revision: 73951 URL: http://svn.reactos.org/svn/reactos?rev=73951&view=rev Log: [INSENG] Sync with Wine Staging 2.2. CORE-12823 dabb589 inseng: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). Modified: trunk/reactos/dll/win32/inseng/inseng_private.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/inseng/inseng_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inseng/inseng_pr… ============================================================================== --- trunk/reactos/dll/win32/inseng/inseng_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inseng/inseng_private.h [iso-8859-1] Sun Feb 26 17:34:21 2017 @@ -39,9 +39,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(inseng); -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } static inline void *heap_zero_alloc(size_t len) 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] Sun Feb 26 17:34:21 2017 @@ -81,7 +81,7 @@ reactos/dll/win32/inetcomm # Synced to WineStaging-1.9.23 reactos/dll/win32/inetmib1 # Synced to WineStaging-1.9.11 reactos/dll/win32/initpki # Synced to WineStaging-1.9.11 -reactos/dll/win32/inseng # Synced to WineStaging-1.9.23 +reactos/dll/win32/inseng # Synced to WineStaging-2.2 reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/itircl # Synced to WineStaging-1.9.11 reactos/dll/win32/itss # Synced to WineStaging-1.9.11

7 years, 6 months

[akhaldi] 73950: [IMAADP32.ACM] Sync with Wine Staging 2.2. CORE-12823 1a6d3c1 imaadpcm32: Fix source offsets when converting stereo PCM to IMAADPCM.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 17:32:01 2017 New Revision: 73950 URL: http://svn.reactos.org/svn/reactos?rev=73950&view=rev Log: [IMAADP32.ACM] Sync with Wine Staging 2.2. CORE-12823 1a6d3c1 imaadpcm32: Fix source offsets when converting stereo PCM to IMAADPCM. Modified: trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imaadp32.acm/ima… ============================================================================== --- trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c [iso-8859-1] Sun Feb 26 17:32:01 2017 @@ -433,29 +433,27 @@ /* generate header */ sampleL = R16(src); src += 2; W16(dst, sampleL); dst += 2; - *dst = (unsigned char)(unsigned)stepIndexL; - dst += 2; + W16(dst, stepIndexL); dst += 2; sampleR = R16(src); src += 2; W16(dst, sampleR); dst += 2; - *dst = (unsigned char)(unsigned)stepIndexR; - dst += 2; + W16(dst, stepIndexR); dst += 2; for (nsamp = nsamp_blk; nsamp > 0; nsamp -= 8) { for (i = 0; i < 4; i++) { - code1 = generate_nibble(R16(src + (2 * i + 0) * 2 + 0), + code1 = generate_nibble(R16(src + (4 * i + 0) * 2), &stepIndexL, &sampleL); - code2 = generate_nibble(R16(src + (2 * i + 1) * 2 + 0), + code2 = generate_nibble(R16(src + (4 * i + 2) * 2), &stepIndexL, &sampleL); *dst++ = (code1 << 4) | code2; } for (i = 0; i < 4; i++) { - code1 = generate_nibble(R16(src + (2 * i + 0) * 2 + 1), + code1 = generate_nibble(R16(src + (4 * i + 1) * 2), &stepIndexR, &sampleR); - code2 = generate_nibble(R16(src + (2 * i + 1) * 2 + 1), + code2 = generate_nibble(R16(src + (4 * i + 3) * 2), &stepIndexR, &sampleR); *dst++ = (code1 << 4) | code2; } 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] Sun Feb 26 17:32:01 2017 @@ -75,7 +75,7 @@ reactos/dll/win32/httpapi # Synced to WineStaging-1.9.11 reactos/dll/win32/iccvid # Synced to WineStaging-2.2 reactos/dll/win32/ieframe # Synced to WineStaging-2.2 -reactos/dll/win32/imaadp32.acm # Synced to WineStaging-1.9.11 +reactos/dll/win32/imaadp32.acm # Synced to WineStaging-2.2 reactos/dll/win32/imagehlp # Synced to WineStaging-1.9.11 reactos/dll/win32/imm32 # Synced to Wine-1.7.27 reactos/dll/win32/inetcomm # Synced to WineStaging-1.9.23

7 years, 6 months

[akhaldi] 73949: [IEFRAME] Sync with Wine Staging 2.2. CORE-12823 477e7fd ieframe: Fix moniker leak on error path.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 17:28:46 2017 New Revision: 73949 URL: http://svn.reactos.org/svn/reactos?rev=73949&view=rev Log: [IEFRAME] Sync with Wine Staging 2.2. CORE-12823 477e7fd ieframe: Fix moniker leak on error path. Modified: trunk/reactos/dll/win32/ieframe/navigate.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/ieframe/navigate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/navigate… ============================================================================== --- trunk/reactos/dll/win32/ieframe/navigate.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/navigate.c [iso-8859-1] Sun Feb 26 17:28:46 2017 @@ -690,13 +690,16 @@ hres = IMoniker_GetDisplayName(mon, 0, NULL, &display_name); if(FAILED(hres)) { FIXME("GetDisplayName failed: %08x\n", hres); + IMoniker_Release(mon); return hres; } hres = set_dochost_url(This, display_name); CoTaskMemFree(display_name); - if(FAILED(hres)) + if(FAILED(hres)) { + IMoniker_Release(mon); return hres; + } IBindCtx_RegisterObjectParam(bindctx, (LPOLESTR)SZ_HTML_CLIENTSITE_OBJECTPARAM, (IUnknown*)&This->IOleClientSite_iface); 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] Sun Feb 26 17:28:46 2017 @@ -74,7 +74,7 @@ reactos/dll/win32/hnetcfg # Synced to WineStaging-1.9.16 reactos/dll/win32/httpapi # Synced to WineStaging-1.9.11 reactos/dll/win32/iccvid # Synced to WineStaging-2.2 -reactos/dll/win32/ieframe # Synced to WineStaging-1.9.16 +reactos/dll/win32/ieframe # Synced to WineStaging-2.2 reactos/dll/win32/imaadp32.acm # Synced to WineStaging-1.9.11 reactos/dll/win32/imagehlp # Synced to WineStaging-1.9.11 reactos/dll/win32/imm32 # Synced to Wine-1.7.27

7 years, 6 months

[akhaldi] 73948: [ICCVID] Sync with Wine Staging 2.2. CORE-12823 4dcdbf3 iccvid: Add a __WINE_ALLOC_SIZE attribute to heap_alloc().

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 17:25:49 2017 New Revision: 73948 URL: http://svn.reactos.org/svn/reactos?rev=73948&view=rev Log: [ICCVID] Sync with Wine Staging 2.2. CORE-12823 4dcdbf3 iccvid: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). Modified: trunk/reactos/dll/win32/iccvid/iccvid.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/iccvid/iccvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid.c?… ============================================================================== --- trunk/reactos/dll/win32/iccvid/iccvid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iccvid/iccvid.c [iso-8859-1] Sun Feb 26 17:25:49 2017 @@ -85,14 +85,14 @@ cinepak_info *cvinfo; } ICCVID_Info; -static inline LPVOID heap_alloc( size_t size ) -{ - return HeapAlloc( GetProcessHeap(), 0, size ); -} - -static inline BOOL heap_free( LPVOID ptr ) -{ - return HeapFree( GetProcessHeap(), 0, ptr ); +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); } static inline int get_stride(int width, int depth) 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] Sun Feb 26 17:25:49 2017 @@ -73,7 +73,7 @@ reactos/dll/win32/hlink # Synced to WineStaging-2.2 reactos/dll/win32/hnetcfg # Synced to WineStaging-1.9.16 reactos/dll/win32/httpapi # Synced to WineStaging-1.9.11 -reactos/dll/win32/iccvid # Synced to WineStaging-1.9.11 +reactos/dll/win32/iccvid # Synced to WineStaging-2.2 reactos/dll/win32/ieframe # Synced to WineStaging-1.9.16 reactos/dll/win32/imaadp32.acm # Synced to WineStaging-1.9.11 reactos/dll/win32/imagehlp # Synced to WineStaging-1.9.11

7 years, 6 months

[akhaldi] 73947: [HLINK_WINETEST] Sync with Wine Staging 2.2. CORE-12823

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 17:21:30 2017 New Revision: 73947 URL: http://svn.reactos.org/svn/reactos?rev=73947&view=rev Log: [HLINK_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/hlink/hlink.c Modified: trunk/rostests/winetests/hlink/hlink.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/hlink/hlink.c?r… ============================================================================== --- trunk/rostests/winetests/hlink/hlink.c [iso-8859-1] (original) +++ trunk/rostests/winetests/hlink/hlink.c [iso-8859-1] Sun Feb 26 17:21:30 2017 @@ -400,6 +400,14 @@ same = TRUE; for (i = 0; i < min(data_size, expected_data_alt_size); i++) { + if ((expected_data_alt == expected_hlink_data_ie7 && i == 89) /* Win10 */ || + (expected_data_alt == expected_hlink_data2_ie7 && i == 109) /* Win10 */ || + (expected_data_alt == expected_hlink_data3_ie7 && i == 109) /* Win10 */ || + (expected_data_alt == expected_hlink_data5_ie7 && i == 107) /* Win10 */) + { + ok(data[i] == 0 || broken(data[i] == 1), "Expected 0 or 1, got %d\n", data[i]); + continue; + } if ((expected_data_alt[i] != data[i]) && (((expected_data_alt != expected_hlink_data2) && (expected_data_alt != expected_hlink_data3)) ||

7 years, 6 months

← Newer
1
2
3
4
5
6
7
8
9
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2017