Ros-diffs April 2014

ros-diffs@reactos.org

15 participants
492 discussions

[akhaldi] 62928: [WBEMDISP] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 23 15:06:09 2014 New Revision: 62928 URL: http://svn.reactos.org/svn/reactos?rev=62928&view=rev Log: [WBEMDISP] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/wbemdisp/locator.c trunk/reactos/dll/win32/wbemdisp/main.c trunk/reactos/dll/win32/wbemdisp/wbemdisp_classes.idl trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h trunk/reactos/dll/win32/wbemdisp/wbemdisp_tlb.idl trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wbemdisp/locator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/locator… ============================================================================== --- trunk/reactos/dll/win32/wbemdisp/locator.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemdisp/locator.c [iso-8859-1] Wed Apr 23 15:06:09 2014 @@ -239,11 +239,11 @@ locator_get_Security_ }; -HRESULT SWbemLocator_create( IUnknown *unk, void **obj ) +HRESULT SWbemLocator_create( void **obj ) { struct locator *locator; - TRACE( "%p, %p\n", unk, obj ); + TRACE( "%p\n", obj ); if (!(locator = heap_alloc( sizeof(*locator) ))) return E_OUTOFMEMORY; locator->ISWbemLocator_iface.lpVtbl = &locator_vtbl; Modified: trunk/reactos/dll/win32/wbemdisp/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/main.c?… ============================================================================== --- trunk/reactos/dll/win32/wbemdisp/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemdisp/main.c [iso-8859-1] Wed Apr 23 15:06:09 2014 @@ -67,7 +67,7 @@ static IParseDisplayName winmgmts = { &WinMGMTSVtbl }; -static HRESULT WinMGMTS_create(IUnknown *outer, void **ppv) +static HRESULT WinMGMTS_create(void **ppv) { *ppv = &winmgmts; return S_OK; @@ -76,7 +76,7 @@ struct factory { IClassFactory IClassFactory_iface; - HRESULT (*fnCreateInstance)( IUnknown *, LPVOID * ); + HRESULT (*fnCreateInstance)( LPVOID * ); }; static inline struct factory *impl_from_IClassFactory( IClassFactory *iface ) @@ -118,14 +118,11 @@ *obj = NULL; if (outer) return CLASS_E_NOAGGREGATION; - hr = factory->fnCreateInstance( outer, (LPVOID *)&unk ); + hr = factory->fnCreateInstance( (LPVOID *)&unk ); if (FAILED( hr )) return hr; hr = IUnknown_QueryInterface( unk, riid, obj ); - if (FAILED( hr )) - return hr; - IUnknown_Release( unk ); return hr; } Modified: trunk/reactos/dll/win32/wbemdisp/wbemdisp_classes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/wbemdis… ============================================================================== --- trunk/reactos/dll/win32/wbemdisp/wbemdisp_classes.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemdisp/wbemdisp_classes.idl [iso-8859-1] Wed Apr 23 15:06:09 2014 @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep register + [ threading(apartment), uuid(172bddf8-ceea-11d1-8b05-00600806d9b6), Modified: trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/wbemdis… ============================================================================== --- trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h [iso-8859-1] Wed Apr 23 15:06:09 2014 @@ -37,7 +37,7 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp); -HRESULT SWbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT SWbemLocator_create(LPVOID *) DECLSPEC_HIDDEN; static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1); static inline void *heap_alloc( size_t len ) Modified: trunk/reactos/dll/win32/wbemdisp/wbemdisp_tlb.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/wbemdis… ============================================================================== --- trunk/reactos/dll/win32/wbemdisp/wbemdisp_tlb.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemdisp/wbemdisp_tlb.idl [iso-8859-1] Wed Apr 23 15:06:09 2014 @@ -18,4 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep regtypelib + #include "wbemdisp.idl" 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 15:06:09 2014 @@ -200,7 +200,7 @@ 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/wbemdisp # Synced to Wine-1.7.17 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

10 years, 4 months

[akhaldi] 62927: [USP10_WINETEST] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 23 15:03:45 2014 New Revision: 62927 URL: http://svn.reactos.org/svn/reactos?rev=62927&view=rev Log: [USP10_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/usp10/testlist.c trunk/rostests/winetests/usp10/usp10.c Modified: trunk/rostests/winetests/usp10/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/usp10/testlist.… ============================================================================== --- trunk/rostests/winetests/usp10/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/usp10/testlist.c [iso-8859-1] Wed Apr 23 15:03:45 2014 @@ -1,7 +1,4 @@ -/* Automatically generated by make depend; DO NOT EDIT!! */ - -#define WIN32_LEAN_AND_MEAN -#include <windows.h> +/* Automatically generated; DO NOT EDIT!! */ #define STANDALONE #include <wine/test.h> Modified: trunk/rostests/winetests/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/usp10/usp10.c?r… ============================================================================== --- trunk/rostests/winetests/usp10/usp10.c [iso-8859-1] (original) +++ trunk/rostests/winetests/usp10/usp10.c [iso-8859-1] Wed Apr 23 15:03:45 2014 @@ -840,7 +840,7 @@ return 1; i = rp->range; - while (i > sizeof(DWORD)*8) + while (i >= sizeof(DWORD)*8) { idx++; i -= (sizeof(DWORD)*8);

10 years, 4 months

[akhaldi] 62926: [USP10] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 23 15:03:26 2014 New Revision: 62926 URL: http://svn.reactos.org/svn/reactos?rev=62926&view=rev Log: [USP10] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/usp10/mirror.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/usp10/mirror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/mirror.c?r… ============================================================================== --- trunk/reactos/dll/win32/usp10/mirror.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/mirror.c [iso-8859-1] Wed Apr 23 15:03:26 2014 @@ -1,5 +1,5 @@ /* Unicode BiDi mirroring */ -/* generated from http://www.unicode.org/Public/6.2.0/ucd/BidiMirroring.txt */ +/* generated from http://www.unicode.org/Public/6.3.0/ucd/BidiMirroring.txt */ /* DO NOT EDIT!! */ #include <windef.h> 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 15:03:26 2014 @@ -196,7 +196,7 @@ reactos/dll/win32/updspapi # Synced to Wine-1.7.1 reactos/dll/win32/url # Synced to Wine-1.7.17 reactos/dll/win32/urlmon # Synced to Wine-1.7.1 -reactos/dll/win32/usp10 # Synced to Wine-1.7.14 +reactos/dll/win32/usp10 # Synced to Wine-1.7.17 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

10 years, 4 months

[akhaldi] 62925: [URL] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 23 15:00:16 2014 New Revision: 62925 URL: http://svn.reactos.org/svn/reactos?rev=62925&view=rev Log: [URL] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/url/url_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/url/url_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/url/url_main.c?r… ============================================================================== --- trunk/reactos/dll/win32/url/url_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/url/url_main.c [iso-8859-1] Wed Apr 23 15:00:16 2014 @@ -92,8 +92,7 @@ * int nShowCmd - How to display the operation. */ -HRESULT WINAPI FileProtocolHandlerA(HWND hWnd, HINSTANCE hInst, LPCSTR pszUrl, - int nShowCmd) +void WINAPI FileProtocolHandlerA(HWND hWnd, HINSTANCE hInst, LPCSTR pszUrl, int nShowCmd) { CHAR pszPath[MAX_PATH]; DWORD size = MAX_PATH; @@ -101,12 +100,7 @@ TRACE("(%p, %s, %d)\n",hWnd,debugstr_a(pszUrl),nShowCmd); - if(createpath != S_OK) - return E_FAIL; - - ShellExecuteA(hWnd,NULL,pszPath,NULL,NULL,nShowCmd); - - return S_OK; + ShellExecuteA(hWnd, NULL, createpath==S_OK ? pszPath : pszUrl, NULL, NULL, nShowCmd); } /*********************************************************************** 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 15:00:16 2014 @@ -194,7 +194,7 @@ reactos/dll/win32/twain_32 # Synced to Wine-1.7.17 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/url # Synced to Wine-1.7.17 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

10 years, 4 months

[akhaldi] 62924: [TWAIN_32_WINETEST] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 23 14:59:06 2014 New Revision: 62924 URL: http://svn.reactos.org/svn/reactos?rev=62924&view=rev Log: [TWAIN_32_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/twain_32/dsm.c Modified: trunk/rostests/winetests/twain_32/dsm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/twain_32/dsm.c?… ============================================================================== --- trunk/rostests/winetests/twain_32/dsm.c [iso-8859-1] (original) +++ trunk/rostests/winetests/twain_32/dsm.c [iso-8859-1] Wed Apr 23 14:59:06 2014 @@ -36,12 +36,12 @@ BOOL rc; cls.style = 0; - cls.lpfnWndProc = DefWindowProc; + cls.lpfnWndProc = DefWindowProcA; cls.cbClsExtra = 0; cls.cbWndExtra = 0; cls.hInstance = GetModuleHandleA(0); cls.hIcon = 0; - cls.hCursor = LoadCursorA(0, IDC_ARROW); + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "TWAIN_dsm_class"; @@ -861,9 +861,8 @@ appid.ProtocolMinor = TWON_PROTOCOLMINOR; appid.SupportedGroups = DG_CONTROL | DG_IMAGE; - hwnd = CreateWindow("TWAIN_dsm_class", "Twain Test", 0, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - NULL, NULL, GetModuleHandleA(0), NULL); + hwnd = CreateWindowA("TWAIN_dsm_class", "Twain Test", 0, CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, GetModuleHandleA(NULL), NULL); rc = pDSM_Entry(&appid, NULL, DG_CONTROL, DAT_PARENT, MSG_OPENDSM, (TW_MEMREF) &hwnd); ok(rc == TWRC_SUCCESS, "MSG_OPENDSM returned %d\n", rc);

10 years, 4 months

[akhaldi] 62923: [TWAIN_32] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 23 14:58:49 2014 New Revision: 62923 URL: http://svn.reactos.org/svn/reactos?rev=62923&view=rev Log: [TWAIN_32] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/twain_32/dsm_ctrl.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/twain_32/dsm_ctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/dsm_ctr… ============================================================================== --- trunk/reactos/dll/win32/twain_32/dsm_ctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/twain_32/dsm_ctrl.c [iso-8859-1] Wed Apr 23 14:58:49 2014 @@ -61,7 +61,7 @@ ret = dsEntry (&fakeOrigin, DG_CONTROL, DAT_IDENTITY, MSG_GET, &sourceId); if (ret != TWRC_SUCCESS) { ERR("Source->(DG_CONTROL,DAT_IDENTITY,MSG_GET) failed!\n"); - return; + break; } TRACE("Manufacturer: %s\n", debugstr_a(sourceId.Manufacturer)); TRACE("ProductFamily: %s\n", debugstr_a(sourceId.ProductFamily)); @@ -86,12 +86,12 @@ FreeLibrary (hmod); } -static int detectionrun = 0; +static BOOL detectionrun = FALSE; static void twain_autodetect(void) { if (detectionrun) return; - detectionrun = 1; + detectionrun = TRUE; twain_add_onedriver("sane.ds"); twain_add_onedriver("gphoto2.ds"); 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:58:49 2014 @@ -191,7 +191,7 @@ reactos/dll/win32/sxs # Synced to Wine-1.7.1 reactos/dll/win32/tapi32 # Synced to Wine-1.7.17 reactos/dll/win32/traffic # Synced to Wine-1.7.1 -reactos/dll/win32/twain_32 # Synced to Wine-1.7.1 +reactos/dll/win32/twain_32 # Synced to Wine-1.7.17 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

10 years, 4 months

[akhaldi] 62922: [TAPI32] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 23 14:56:11 2014 New Revision: 62922 URL: http://svn.reactos.org/svn/reactos?rev=62922&view=rev Log: [TAPI32] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/tapi32/line.c trunk/reactos/dll/win32/tapi32/tapi32.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/tapi32/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/line.c?re… ============================================================================== --- trunk/reactos/dll/win32/tapi32/line.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapi32/line.c [iso-8859-1] Wed Apr 23 14:56:11 2014 @@ -1253,6 +1253,15 @@ } /*********************************************************************** + * lineOpenW (TAPI32.@) + */ +DWORD WINAPI lineOpenW(HLINEAPP hLineApp, DWORD dwDeviceID, LPHLINE lphLine, DWORD dwAPIVersion, DWORD dwExtVersion, DWORD dwCallbackInstance, DWORD dwPrivileges, DWORD dwMediaModes, LPLINECALLPARAMS lpCallParams) +{ + FIXME("stub.\n"); + return 0; +} + +/*********************************************************************** * lineOpen (TAPI32.@) */ DWORD WINAPI lineOpenA(HLINEAPP hLineApp, DWORD dwDeviceID, LPHLINE lphLine, DWORD dwAPIVersion, DWORD dwExtVersion, DWORD dwCallbackInstance, DWORD dwPrivileges, DWORD dwMediaModes, LPLINECALLPARAMS lpCallParams) Modified: trunk/reactos/dll/win32/tapi32/tapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/tapi32.sp… ============================================================================== --- trunk/reactos/dll/win32/tapi32/tapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapi32/tapi32.spec [iso-8859-1] Wed Apr 23 14:56:11 2014 @@ -150,7 +150,7 @@ @ stdcall lineNegotiateExtVersion(long long long long long ptr) @ stdcall lineOpen(long long ptr long long long long long ptr) lineOpenA @ stdcall lineOpenA(long long ptr long long long long long ptr) -@ stub lineOpenW +@ stdcall lineOpenW(long long ptr long long long long long ptr) @ stdcall linePark(long long str ptr) lineParkA @ stdcall lineParkA(long long str ptr) @ stub lineParkW 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:56:11 2014 @@ -189,7 +189,7 @@ 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/tapi32 # Synced to Wine-1.7.17 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?!)

10 years, 4 months

[akhaldi] 62921: [ODBC32] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 23 14:53:41 2014 New Revision: 62921 URL: http://svn.reactos.org/svn/reactos?rev=62921&view=rev Log: [ODBC32] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/odbc32/proxyodbc.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/odbc32/proxyodbc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbc32/proxyodbc… ============================================================================== --- trunk/reactos/dll/win32/odbc32/proxyodbc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/odbc32/proxyodbc.c [iso-8859-1] Wed Apr 23 14:53:41 2014 @@ -199,9 +199,9 @@ { HKEY hODBCInst; LONG reg_ret; - int success; - - success = 0; + BOOL success; + + success = FALSE; TRACE ("Driver settings are not currently replicated to the registry\n"); if ((reg_ret = RegCreateKeyExA (HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBCINST.INI", 0, NULL, @@ -220,7 +220,7 @@ CHAR desc [256]; SQLSMALLINT sizedesc; - success = 1; + success = TRUE; dirn = SQL_FETCH_FIRST; while ((sql_ret = SQLDrivers (hEnv, dirn, (SQLCHAR*)desc, sizeof(desc), &sizedesc, NULL, 0, NULL)) == SQL_SUCCESS || @@ -239,14 +239,14 @@ { TRACE ("Error %d replicating driver %s\n", reg_ret, desc); - success = 0; + success = FALSE; } } else if (reg_ret != ERROR_SUCCESS) { TRACE ("Error %d checking for %s in drivers\n", reg_ret, desc); - success = 0; + success = FALSE; } if ((reg_ret = RegCreateKeyExA (hODBCInst, desc, 0, NULL, REG_OPTION_NON_VOLATILE, @@ -268,20 +268,20 @@ { TRACE ("Error %d ensuring driver key %s\n", reg_ret, desc); - success = 0; + success = FALSE; } } else { WARN ("Unusually long driver name %s not replicated\n", desc); - success = 0; + success = FALSE; } } if (sql_ret != SQL_NO_DATA) { TRACE ("Error %d enumerating drivers\n", (int)sql_ret); - success = 0; + success = FALSE; } if ((reg_ret = RegCloseKey (hDrivers)) != ERROR_SUCCESS) { @@ -327,7 +327,7 @@ * that this will add a requirement that this function be called after * ODBC_ReplicateODBCInstToRegistry) */ -static void ODBC_ReplicateODBCToRegistry (int is_user, SQLHENV hEnv) +static void ODBC_ReplicateODBCToRegistry (BOOL is_user, SQLHENV hEnv) { HKEY hODBC; LONG reg_ret; @@ -337,17 +337,17 @@ SQLSMALLINT sizedsn; CHAR desc [256]; SQLSMALLINT sizedesc; - int success; + BOOL success; const char *which = is_user ? "user" : "system"; - success = 0; + success = FALSE; if ((reg_ret = RegCreateKeyExA ( is_user ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBC.INI", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS /* a couple more than we need */, NULL, &hODBC, NULL)) == ERROR_SUCCESS) { - success = 1; + success = TRUE; dirn = is_user ? SQL_FETCH_FIRST_USER : SQL_FETCH_FIRST_SYSTEM; while ((sql_ret = SQLDataSources (hEnv, dirn, (SQLCHAR*)dsn, sizeof(dsn), &sizedsn, @@ -374,14 +374,14 @@ { TRACE ("Error %d replicating description of " "%s(%s)\n", reg_ret, dsn, desc); - success = 0; + success = FALSE; } } else if (reg_ret != ERROR_SUCCESS) { TRACE ("Error %d checking for description of %s\n", reg_ret, dsn); - success = 0; + success = FALSE; } if ((reg_ret = RegCloseKey (hDSN)) != ERROR_SUCCESS) { @@ -393,21 +393,21 @@ { TRACE ("Error %d opening %s DSN key %s\n", reg_ret, which, dsn); - success = 0; + success = FALSE; } } else { WARN ("Unusually long %s data source name %s (%s) not " "replicated\n", which, dsn, desc); - success = 0; + success = FALSE; } } if (sql_ret != SQL_NO_DATA) { TRACE ("Error %d enumerating %s datasources\n", (int)sql_ret, which); - success = 0; + success = FALSE; } if ((reg_ret = RegCloseKey (hODBC)) != ERROR_SUCCESS) { @@ -452,8 +452,8 @@ if ((sql_ret = SQLAllocEnv (&hEnv)) == SQL_SUCCESS) { ODBC_ReplicateODBCInstToRegistry (hEnv); - ODBC_ReplicateODBCToRegistry (0 /* system dsns */, hEnv); - ODBC_ReplicateODBCToRegistry (1 /* user dsns */, hEnv); + ODBC_ReplicateODBCToRegistry (FALSE /* system dsns */, hEnv); + ODBC_ReplicateODBCToRegistry (TRUE /* user dsns */, hEnv); if ((sql_ret = SQLFreeEnv (hEnv)) != SQL_SUCCESS) { @@ -1986,7 +1986,7 @@ return pSQLSetScrollOptions(statement_handle, f_concurrency, crow_keyset, crow_rowset); } -static int SQLColAttributes_KnownStringAttribute(SQLUSMALLINT fDescType) +static BOOL SQLColAttributes_KnownStringAttribute(SQLUSMALLINT fDescType) { static const SQLUSMALLINT attrList[] = { @@ -2011,9 +2011,9 @@ unsigned int i; for (i = 0; i < sizeof(attrList) / sizeof(SQLUSMALLINT); i++) { - if (attrList[i] == fDescType) return 1; + if (attrList[i] == fDescType) return TRUE; } - return 0; + return FALSE; } /************************************************************************* Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Apr 23 14:53:41 2014 @@ -143,7 +143,7 @@ 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/odbc32 # Synced to Wine-1.7.17. 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

10 years, 4 months

[akhaldi] 62920: [MSVIDC32] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 23 14:51:47 2014 New Revision: 62920 URL: http://svn.reactos.org/svn/reactos?rev=62920&view=rev Log: [MSVIDC32] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/msvidc32/msvideo1.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msvidc32/msvideo1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvideo… ============================================================================== --- trunk/reactos/dll/win32/msvidc32/msvideo1.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvidc32/msvideo1.c [iso-8859-1] Wed Apr 23 14:51:47 2014 @@ -71,7 +71,7 @@ typedef struct Msvideo1Context { DWORD dwMagic; - int mode_8bit; /* if it's not 8-bit, it's 16-bit */ + BOOL mode_8bit; /* if it's not 8-bit, it's 16-bit */ } Msvideo1Context; static void @@ -374,12 +374,12 @@ TRACE("bitmap is %d bpp\n", in->bmiHeader.biBitCount); if( in->bmiHeader.biBitCount == 8 ) - info->mode_8bit = 1; + info->mode_8bit = TRUE; else if( in->bmiHeader.biBitCount == 16 ) - info->mode_8bit = 0; + info->mode_8bit = FALSE; else { - info->mode_8bit = 0; + info->mode_8bit = FALSE; FIXME("Unsupported output format %i\n", in->bmiHeader.biBitCount); } 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:51:47 2014 @@ -132,7 +132,7 @@ 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/msvidc32 # Synced to Wine-1.7.17 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

10 years, 4 months

[akhaldi] 62919: [MSI_WINETEST] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 23 14:49:34 2014 New Revision: 62919 URL: http://svn.reactos.org/svn/reactos?rev=62919&view=rev Log: [MSI_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/msi/CMakeLists.txt trunk/rostests/winetests/msi/action.c trunk/rostests/winetests/msi/automation.c trunk/rostests/winetests/msi/db.c trunk/rostests/winetests/msi/format.c trunk/rostests/winetests/msi/install.c trunk/rostests/winetests/msi/msi.c trunk/rostests/winetests/msi/package.c trunk/rostests/winetests/msi/patch.c trunk/rostests/winetests/msi/record.c trunk/rostests/winetests/msi/source.c trunk/rostests/winetests/msi/suminfo.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/CMakeLists.… Modified: trunk/rostests/winetests/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/action.c?re… Modified: trunk/rostests/winetests/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/automation.… Modified: trunk/rostests/winetests/msi/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/db.c?rev=62… Modified: trunk/rostests/winetests/msi/format.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/format.c?re… Modified: trunk/rostests/winetests/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/install.c?r… Modified: trunk/rostests/winetests/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.c?rev=6… Modified: trunk/rostests/winetests/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/package.c?r… Modified: trunk/rostests/winetests/msi/patch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/patch.c?rev… Modified: trunk/rostests/winetests/msi/record.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/record.c?re… Modified: trunk/rostests/winetests/msi/source.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/source.c?re… Modified: trunk/rostests/winetests/msi/suminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/suminfo.c?r…

10 years, 4 months

← Newer
1
...
14
15
16
17
18
19
20
...
50
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 April 2014