Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[janderwald] 38912: - Fix IPortWaveCyclic interface

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Jan 18 14:55:57 2009 New Revision: 38912 URL: http://svn.reactos.org/svn/reactos?rev=38912&view=rev Log: - Fix IPortWaveCyclic interface Modified: trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Sun Jan 18 14:55:57 2009 @@ -1117,40 +1117,21 @@ DECLARE_INTERFACE_(IPortWaveCyclic, IPort) { - STDMETHOD_(NTSTATUS, QueryInterface)(THIS_ - REFIID InterfaceId, - PVOID* Interface - ) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - - - STDMETHOD_(NTSTATUS,Init)(THIS_ - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PUNKNOWN UnknownMiniport, - IN PUNKNOWN UnknownAdapter OPTIONAL, - IN PRESOURCELIST ResourceList - ) PURE; - STDMETHOD_(NTSTATUS,GetDeviceProperty)(THIS_ - IN DEVICE_REGISTRY_PROPERTY DeviceProperty, - IN ULONG BufferLength, - OUT PVOID PropertyBuffer, - OUT PULONG ResultLength - ) PURE; - STDMETHOD_(NTSTATUS,NewRegistryKey)(THIS_ - OUT PREGISTRYKEY * OutRegistryKey, - IN PUNKNOWN OuterUnknown, - IN ULONG RegistryKeyType, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN ULONG CreateOptions OPTIONAL, - OUT PULONG Disposition OPTIONAL - ) PURE; + DEFINE_ABSTRACT_UNKNOWN() + + DEFINE_ABSTRACT_PORT() STDMETHOD_(VOID, Notify)(THIS_ IN PSERVICEGROUP ServiceGroup) PURE; + STDMETHOD_(NTSTATUS, NewSlaveDmaChannel)(THIS_ + OUT PDMACHANNELSLAVE* DmaChannel, + IN PUNKNOWN OuterUnknown, + IN PRESOURCELIST ResourceList OPTIONAL, + IN ULONG DmaIndex, + IN ULONG MaximumLength, + IN BOOL DemandMode, + IN DMA_SPEED DmaSpeed) PURE; STDMETHOD_(NTSTATUS, NewMasterDmaChannel)(THIS_ OUT PDMACHANNEL* DmaChannel, @@ -1161,16 +1142,6 @@ IN BOOL Dma64BitAddresses, IN DMA_WIDTH DmaWidth, IN DMA_SPEED DmaSpeed) PURE; - - STDMETHOD_(NTSTATUS, NewSlaveDmaChannel)(THIS_ - OUT PDMACHANNELSLAVE* DmaChannel, - IN PUNKNOWN OuterUnknown, - IN PRESOURCELIST ResourceList OPTIONAL, - IN ULONG DmaIndex, - IN ULONG MaximumLength, - IN BOOL DemandMode, - IN DMA_SPEED DmaSpeed) PURE; - };

15 years, 8 months

[sginsberg] 38911: - Fix WMC and mkhive warnings - Fix the unitialized variable warning in freetype (done the same way in freetype trunk) - Make CRT compile warning-free again, and re-remove allowwarnings=true - Make libxml compile warning-free too

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sun Jan 18 14:42:13 2009 New Revision: 38911 URL: http://svn.reactos.org/svn/reactos?rev=38911&view=rev Log: - Fix WMC and mkhive warnings - Fix the unitialized variable warning in freetype (done the same way in freetype trunk) - Make CRT compile warning-free again, and re-remove allowwarnings=true - Make libxml compile warning-free too Modified: trunk/reactos/dll/3rdparty/freetype/freetype.rbuild trunk/reactos/dll/3rdparty/freetype/src/autofit/aflatin.c trunk/reactos/lib/3rdparty/libxml2/catalog.c trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild trunk/reactos/lib/3rdparty/libxml2/nanoftp.c trunk/reactos/lib/3rdparty/libxml2/nanohttp.c trunk/reactos/lib/3rdparty/libxml2/threads.c trunk/reactos/lib/3rdparty/libxml2/trionan.c trunk/reactos/lib/3rdparty/libxml2/uri.c trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/except/cppexcept.c trunk/reactos/tools/mkhive/cmi.c trunk/reactos/tools/mkhive/mkhive.rbuild trunk/reactos/tools/mkhive/rtl.c trunk/reactos/tools/wmc/wmc.rbuild trunk/reactos/tools/wmc/wmctypes.h Modified: trunk/reactos/dll/3rdparty/freetype/freetype.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/freetype/free… ============================================================================== --- trunk/reactos/dll/3rdparty/freetype/freetype.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/freetype/freetype.rbuild [iso-8859-1] Sun Jan 18 14:42:13 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="freetype" type="kernelmodedll" entrypoint="0" baseaddress="${BASEADDRESS_FREETYPE}" installbase="system32" installname="freetype.dll" allowwarnings="true" crt="libcntpr"> +<module name="freetype" type="kernelmodedll" entrypoint="0" baseaddress="${BASEADDRESS_FREETYPE}" installbase="system32" installname="freetype.dll" crt="libcntpr"> <importlibrary definition="freetype.def" /> <include base="freetype">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/3rdparty/freetype/src/autofit/aflatin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/freetype/src/… ============================================================================== --- trunk/reactos/dll/3rdparty/freetype/src/autofit/aflatin.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/freetype/src/autofit/aflatin.c [iso-8859-1] Sun Jan 18 14:42:13 2009 @@ -197,7 +197,7 @@ FT_UInt glyph_index; FT_Int best_point, best_y, best_first, best_last; FT_Vector* points; - FT_Bool round; + FT_Bool round = 0; AF_LOG(( "'%c'", *p )); Modified: trunk/reactos/lib/3rdparty/libxml2/catalog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/catal… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/catalog.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/catalog.c [iso-8859-1] Sun Jan 18 14:42:13 2009 @@ -3250,7 +3250,7 @@ cur++; path = xmlStrndup((const xmlChar *)paths, cur - paths); #ifdef _WIN32 - iLen = strlen(path); + iLen = strlen((const char *)path); for(i = 0; i < iLen; i++) { if(path[i] == '\\') { path[i] = '/'; Modified: trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/libxm… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild [iso-8859-1] Sun Jan 18 14:42:13 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="libxml2" type="staticlibrary" allowwarnings="true" crt="dll"> +<module name="libxml2" type="staticlibrary" crt="dll"> <define name="HAVE_CONFIG_H" /> <define name="WIN32" /> <define name="_WINDOWS" /> Modified: trunk/reactos/lib/3rdparty/libxml2/nanoftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/nanof… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/nanoftp.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/nanoftp.c [iso-8859-1] Sun Jan 18 14:42:13 2009 @@ -78,11 +78,13 @@ #if defined(__MINGW32__) || defined(_WIN32_WCE) +#ifndef _WINSOCKAPI_ #define _WINSOCKAPI_ +#endif #include <wsockcompat.h> #include <winsock2.h> #undef XML_SOCKLEN_T -#define XML_SOCKLEN_T unsigned int +#define XML_SOCKLEN_T int #endif /** Modified: trunk/reactos/lib/3rdparty/libxml2/nanohttp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/nanoh… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/nanohttp.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/nanohttp.c [iso-8859-1] Sun Jan 18 14:42:13 2009 @@ -75,11 +75,13 @@ #endif #if defined(__MINGW32__) || defined(_WIN32_WCE) +#ifndef _WINSOCKAPI_ #define _WINSOCKAPI_ +#endif #include <wsockcompat.h> #include <winsock2.h> #undef XML_SOCKLEN_T -#define XML_SOCKLEN_T unsigned int +#define XML_SOCKLEN_T int #endif Modified: trunk/reactos/lib/3rdparty/libxml2/threads.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/threa… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/threads.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/threads.c [iso-8859-1] Sun Jan 18 14:42:13 2009 @@ -453,7 +453,7 @@ /* Swap it into the global_init_lock */ #ifdef InterlockedCompareExchangePointer - InterlockedCompareExchangePointer(&global_init_lock, cs, NULL); + (void)InterlockedCompareExchangePointer(&global_init_lock, cs, NULL); #else /* Use older void* version */ InterlockedCompareExchange((void **) &global_init_lock, (void *) cs, NULL); @@ -936,7 +936,7 @@ #if defined(HAVE_WIN32_THREADS) if (!run_once.done) { - if (InterlockedIncrement(&run_once.control) == 1) { + if (InterlockedIncrement((PLONG)&run_once.control) == 1) { #if !defined(HAVE_COMPILER_TLS) globalkey = TlsAlloc(); #endif Modified: trunk/reactos/lib/3rdparty/libxml2/trionan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/trion… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/trionan.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/trionan.c [iso-8859-1] Sun Jan 18 14:42:13 2009 @@ -58,6 +58,7 @@ # endif #endif /* Small ReactOS hack */ +#undef fpclassify #define fpclassify _fpclass #include <assert.h> @@ -213,6 +214,7 @@ return is_special_quantity; } +#if 0 /* * trio_is_negative */ @@ -230,6 +232,7 @@ } return is_negative; } +#endif #endif /* USE_IEEE_754 */ Modified: trunk/reactos/lib/3rdparty/libxml2/uri.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/uri.c… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/uri.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/uri.c [iso-8859-1] Sun Jan 18 14:42:13 2009 @@ -2453,7 +2453,6 @@ */ #if defined(_WIN32) && !defined(__CYGWIN__) int len = 0; - int i = 0; xmlChar *p = NULL; #endif xmlURIPtr uri; @@ -2522,7 +2521,7 @@ len = xmlStrlen(path); if ((len > 2) && IS_WINDOWS_PATH(path)) { /* make the scheme 'file' */ - uri->scheme = xmlStrdup(BAD_CAST "file"); + uri->scheme = (char*)xmlStrdup(BAD_CAST "file"); /* allocate space for leading '/' + path + string terminator */ uri->path = xmlMallocAtomic(len + 2); if (uri->path == NULL) { @@ -2531,15 +2530,15 @@ } /* Put in leading '/' plus path */ uri->path[0] = '/'; - p = uri->path + 1; - strncpy(p, path, len + 1); + p = (xmlChar *)uri->path + 1; + strncpy((char *)p, (const char *)path, len + 1); } else { - uri->path = xmlStrdup(path); + uri->path = (char*)xmlStrdup(path); if (uri->path == NULL) { xmlFreeURI(uri); return(NULL); } - p = uri->path; + p = (xmlChar *)uri->path; } /* Now change all occurences of '\' to '/' */ while (*p != '\0') { Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Sun Jan 18 14:42:13 2009 @@ -15,7 +15,7 @@ </directory> </module> -<module name="crt" type="staticlibrary" allowwarnings="true"> +<module name="crt" type="staticlibrary"> <library>chkstk</library> <include base="crt">.</include> <include base="crt">include</include> Modified: trunk/reactos/lib/sdk/crt/except/cppexcept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/cppexce… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/cppexcept.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/cppexcept.c [iso-8859-1] Sun Jan 18 14:42:13 2009 @@ -105,6 +105,7 @@ static void dump_function_descr( const cxx_function_descr *descr ) { +#ifndef WINE_NO_TRACE_MSGS UINT i; int j; @@ -122,6 +123,7 @@ descr->tryblock[i].start_level, descr->tryblock[i].end_level, descr->tryblock[i].catch_level, descr->tryblock[i].catchblock, descr->tryblock[i].catchblock_count ); + for (j = 0; j < descr->tryblock[i].catchblock_count; j++) { const catchblock_info *ptr = &descr->tryblock[i].catchblock[j]; @@ -130,6 +132,7 @@ ptr->type_info, dbgstr_type_info( ptr->type_info ) ); } } +#endif } /* check if the exception type is caught by a given catch block, and return the type that matched */ Modified: trunk/reactos/tools/mkhive/cmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/cmi.c?rev=389… ============================================================================== --- trunk/reactos/tools/mkhive/cmi.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/cmi.c [iso-8859-1] Sun Jan 18 14:42:13 2009 @@ -241,8 +241,6 @@ HSTORAGE_TYPE Storage; ULONG i; - DPRINT("CmiAddSubKey(%p '%wZ')\n", RegistryHive, SubKeyName); - VERIFY_KEY_CELL(ParentKeyCell); /* Skip leading backslash */ @@ -523,8 +521,6 @@ VERIFY_KEY_CELL(KeyCell); - DPRINT("CmiScanForSubKey('%wZ')\n", SubKeyName); - ASSERT(RegistryHive); *pSubKeyCell = NULL; Modified: trunk/reactos/tools/mkhive/mkhive.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.rbuild… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/mkhive.rbuild [iso-8859-1] Sun Jan 18 14:42:13 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> -<module name="mkhive" type="buildtool" allowwarnings="true"> +<module name="mkhive" type="buildtool"> <include base="inflibhost">.</include> <include base="cmlibhost">.</include> <include base="zlibhost">.</include> Modified: trunk/reactos/tools/mkhive/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/rtl.c?rev=389… ============================================================================== --- trunk/reactos/tools/mkhive/rtl.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/rtl.c [iso-8859-1] Sun Jan 18 14:42:13 2009 @@ -6,6 +6,12 @@ #include <stdlib.h> #include <stdarg.h> + +/* gcc defaults to cdecl */ +#if defined(__GNUC__) +#undef __cdecl +#define __cdecl +#endif #include "mkhive.h" #include <bitmap.c> Modified: trunk/reactos/tools/wmc/wmc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmc.rbuild?rev=3… ============================================================================== --- trunk/reactos/tools/wmc/wmc.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/wmc/wmc.rbuild [iso-8859-1] Sun Jan 18 14:42:13 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> -<module name="wmc" type="buildtool" allowwarnings="true"> +<module name="wmc" type="buildtool"> <define name="WINE_UNICODE_API">" "</define> <include base="unicode">.</include> <library>unicode</library> Modified: trunk/reactos/tools/wmc/wmctypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmctypes.h?rev=3… ============================================================================== --- trunk/reactos/tools/wmc/wmctypes.h [iso-8859-1] (original) +++ trunk/reactos/tools/wmc/wmctypes.h [iso-8859-1] Sun Jan 18 14:42:13 2009 @@ -22,6 +22,7 @@ #define __WMC_WMCTYPES_H #include <stdarg.h> +#include <string.h> #include <host/typedefs.h> /* Byteordering defines */

15 years, 8 months

[jmorlan] 38910: cmd_move: - Only check for options at the beginning of the command line (subsequent code already assumed the filenames were at the end). - Give an error message if too many parameters are given. - If no destination is given, default to current directory. - Replace excessively complicated code to get source directory with single GetFullPathName call; hopefully that is sufficient. Check for pszFile == NULL to prevent crash that occurred when source was "/..". - To determine whethe

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Sun Jan 18 14:21:03 2009 New Revision: 38910 URL: http://svn.reactos.org/svn/reactos?rev=38910&view=rev Log: cmd_move: - Only check for options at the beginning of the command line (subsequent code already assumed the filenames were at the end). - Give an error message if too many parameters are given. - If no destination is given, default to current directory. - Replace excessively complicated code to get source directory with single GetFullPathName call; hopefully that is sufficient. Check for pszFile == NULL to prevent crash that occurred when source was "/..". - To determine whether source wildcard matches are files or directories, just use WIN32_FIND_DATA's dwFileAttributes; it's easier than constructing paths to pass to IsExistingFile/IsExistingDirectory. - Fix memory leaks: some returns were missing freep(arg). Modified: trunk/reactos/base/shell/cmd/move.c Modified: trunk/reactos/base/shell/cmd/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/move.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/move.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/move.c [iso-8859-1] Sun Jan 18 14:21:03 2009 @@ -87,6 +87,7 @@ { LPTSTR *arg; INT argc, i, nFiles; + LPTSTR pszDest; TCHAR szDestPath[MAX_PATH]; TCHAR szFullDestPath[MAX_PATH]; TCHAR szSrcDirPath[MAX_PATH]; @@ -138,73 +139,68 @@ nErrorLevel = 0; arg = splitspace(param, &argc); - nFiles = argc; /* read options */ for (i = 0; i < argc; i++) { - if (*arg[i] == _T('/')) - { - if (_tcslen(arg[i]) >= 2) - { - switch (_totupper(arg[i][1])) - { - case _T('N'): - dwFlags |= MOVE_NOTHING; - break; - - case _T('Y'): - dwFlags |= MOVE_OVER_YES; - break; - - case _T('-'): - dwFlags |= MOVE_OVER_NO; - break; - } - } - nFiles--; - } - } - - if (nFiles < 2) - { - /* there must be at least two pathspecs */ - error_req_param_missing (); - return 1; - } - + if (!_tcsicmp(arg[i], _T("/N"))) + dwFlags |= MOVE_NOTHING; + else if (!_tcsicmp(arg[i], _T("/Y"))) + dwFlags |= MOVE_OVER_YES; + else if (!_tcsicmp(arg[i], _T("/-Y"))) + dwFlags |= MOVE_OVER_NO; + else + break; + } + nFiles = argc - i; + + if (nFiles < 1) + { + /* there must be at least one pathspec */ + error_req_param_missing(); + freep(arg); + return 1; + } + + if (nFiles > 2) + { + /* there are more than two pathspecs */ + error_too_many_parameters(param); + freep(arg); + return 1; + } + + /* If no destination is given, default to current directory */ + pszDest = (nFiles == 1) ? _T(".") : arg[i + 1]; + /* check for wildcards in source and destination */ - if (_tcschr (arg[argc - 1], _T('*')) != NULL || _tcschr (arg[argc - 1], _T('?')) != NULL) + if (_tcschr(pszDest, _T('*')) != NULL || _tcschr(pszDest, _T('?')) != NULL) { /* '*'/'?' in dest, this doesnt happen. give folder name instead*/ - error_invalid_parameter_format(arg[argc - 1]); - return 1; - } - if (_tcschr (arg[argc - 2], _T('*')) != NULL || _tcschr (arg[argc - 2], _T('?')) != NULL) + error_invalid_parameter_format(pszDest); + freep(arg); + return 1; + } + if (_tcschr(arg[i], _T('*')) != NULL || _tcschr(arg[i], _T('?')) != NULL) { dwMoveStatusFlags |= MOVE_SOURCE_HAS_WILD; } /* get destination */ - GetFullPathName (arg[argc - 1], MAX_PATH, szDestPath, NULL); + GetFullPathName (pszDest, MAX_PATH, szDestPath, NULL); TRACE ("Destination: %s\n", debugstr_aw(szDestPath)); /* get source folder */ - GetDirectory(arg[argc - 2], szSrcDirPath, 1); - GetFullPathName(szSrcDirPath, MAX_PATH, szSrcPath, &pszFile); - _tcscpy(szSrcDirPath,szSrcPath); - /* we need following check to see if source happens to be directly given directory - and if it is then rip off last directory part so that there won't be any clashes with codes after this point */ - GetFullPathName(arg[argc - 2], MAX_PATH, szSrcPath, &pszFile); - if (_tcscmp(szSrcDirPath,szSrcPath) == 0) - szSrcDirPath[pszFile - szSrcPath] = _T('\0'); + GetFullPathName(arg[i], MAX_PATH, szSrcDirPath, &pszFile); + if (pszFile != NULL) + *pszFile = _T('\0'); TRACE ("Source Folder: %s\n", debugstr_aw(szSrcDirPath)); - hFile = FindFirstFile (arg[argc - 2], &findBuffer); + hFile = FindFirstFile (arg[i], &findBuffer); if (hFile == INVALID_HANDLE_VALUE) { - ErrorMessage (GetLastError (), arg[argc - 2]); + ErrorMessage (GetLastError (), arg[i]); freep (arg); return 1; @@ -227,22 +223,14 @@ } OnlyOneFile = TRUE; - _tcscpy(szSrcPath,szSrcDirPath); - /*check to see if there is an ending slash, if not add one*/ - if(szSrcPath[_tcslen(szSrcPath) - 1] != _T('\\')) - _tcscat (szSrcPath, _T("\\")); - _tcscat(szSrcPath,findBuffer.cFileName); - TRACE ("Source Path: %s\n", debugstr_aw(szSrcPath)); /* check if there can be found files as files have first priority */ - if (IsExistingFile(szSrcPath)) dwMoveStatusFlags |= MOVE_SOURCE_IS_FILE; - else dwMoveStatusFlags |= MOVE_SOURCE_IS_DIR; + if (findBuffer.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + dwMoveStatusFlags |= MOVE_SOURCE_IS_DIR; + else + dwMoveStatusFlags |= MOVE_SOURCE_IS_FILE; while(OnlyOneFile && FindNextFile(hFile,&findBuffer)) { - _tcscpy(szSrcPath,szSrcDirPath); - if(szSrcPath[_tcslen(szSrcPath) - 1] != _T('\\')) - _tcscat (szSrcPath, _T("\\")); - _tcscat(szSrcPath,findBuffer.cFileName); - if (IsExistingFile(szSrcPath)) + if (!(findBuffer.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { ConOutPrintf(_T("")); if (dwMoveStatusFlags & MOVE_SOURCE_IS_FILE) OnlyOneFile = FALSE; @@ -258,10 +246,10 @@ TRACE ("Do we have only one file: %s\n", OnlyOneFile ? "TRUE" : "FALSE"); /* we have to start again to be sure we don't miss any files or folders*/ - hFile = FindFirstFile (arg[argc - 2], &findBuffer); + hFile = FindFirstFile (arg[i], &findBuffer); if (hFile == INVALID_HANDLE_VALUE) { - ErrorMessage (GetLastError (), arg[argc - 2]); + ErrorMessage (GetLastError (), arg[i]); freep (arg); return 1; @@ -284,7 +272,7 @@ } /* check if source and destination paths are on different volumes */ - if (szSrcPath[0] != szDestPath[0]) + if (szSrcDirPath[0] != szDestPath[0]) dwMoveStatusFlags |= MOVE_PATHS_ON_DIF_VOL; /* move it */ @@ -378,7 +366,7 @@ !OnlyOneFile) { /*source has many files but there is only one destination file*/ - error_invalid_parameter_format(arg[argc - 1]); + error_invalid_parameter_format(pszDest); FindClose(hFile); freep (arg); return 1;

15 years, 8 months

[mkupfer] 38909: - Replace static message text by resource strings. - Add German translation for those strings.

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Sun Jan 18 14:02:41 2009 New Revision: 38909 URL: http://svn.reactos.org/svn/reactos?rev=38909&view=rev Log: - Replace static message text by resource strings. - Add German translation for those strings. Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc trunk/reactos/dll/cpl/desk/lang/en-US.rc trunk/reactos/dll/cpl/desk/resource.h trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/de-DE.rc [iso-8859-1] Sun Jan 18 14:02:41 2009 @@ -219,3 +219,10 @@ IDS_ELEMENT_21 "Quickinfo" IDS_ELEMENT_22 "Symbol" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DISPLAY_SETTINGS "Anzeigeeinstellungen" + IDS_APPLY_FAILED "Beim Anwenden Ihrer Änderungen ist ein Fehler aufgetreten..." + IDS_APPLY_NEEDS_RESTART "Sie müssen Ihren Computer neu starten, damit die Änderungen wirksam werden." +END Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] Sun Jan 18 14:02:41 2009 @@ -221,3 +221,10 @@ IDS_ELEMENT_21 "Quickinfo" IDS_ELEMENT_22 "Symbol" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DISPLAY_SETTINGS "Display settings" + IDS_APPLY_FAILED "Failed to apply new settings..." + IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply changes." +END Modified: trunk/reactos/dll/cpl/desk/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/resource.h [iso-8859-1] Sun Jan 18 14:02:41 2009 @@ -157,6 +157,11 @@ #define IDS_UNKNOWNMONITOR 3301 #define IDS_ADVANCEDTITLEFMT 3302 +#define IDS_DISPLAY_SETTINGS 3400 + +#define IDS_APPLY_FAILED 3500 +#define IDS_APPLY_NEEDS_RESTART 3501 + /* Advanced General Dialog */ #define IDC_FONTSIZE_COMBO 5000 #define IDC_FONTSIZE_COSTOM 5001 Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] Sun Jan 18 14:02:41 2009 @@ -627,6 +627,8 @@ PGLOBAL_DATA pGlobalData; pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + + TCHAR Message[1024], Title[256]; switch(uMsg) { @@ -710,14 +712,16 @@ pGlobalData->CurrentDisplayDevice->InitialSettings.dmPelsHeight = pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight; pGlobalData->CurrentDisplayDevice->InitialSettings.dmBitsPerPel = pGlobalData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel; break; + case DISP_CHANGE_RESTART: + LoadString(hApplet, IDS_DISPLAY_SETTINGS, Title, sizeof(Title) / sizeof(TCHAR)); + LoadString(hApplet, IDS_APPLY_NEEDS_RESTART, Message, sizeof(Message) / sizeof (TCHAR)); + MessageBox(hwndDlg, Message, Title, MB_OK | MB_ICONINFORMATION); + break; case DISP_CHANGE_FAILED: - MessageBox(NULL, TEXT("Failed to apply new settings..."), TEXT("Display settings"), MB_OK | MB_ICONSTOP); - break; - case DISP_CHANGE_RESTART: - MessageBox(NULL, TEXT("You need to restart your computer to apply changes."), TEXT("Display settings"), MB_OK | MB_ICONINFORMATION); - break; default: - MessageBox(NULL, TEXT("Unknown error when applying new settings..."), TEXT("Display settings"), MB_OK | MB_ICONSTOP); + LoadString(hApplet, IDS_DISPLAY_SETTINGS, Title, sizeof(Title) / sizeof(TCHAR)); + LoadString(hApplet, IDS_APPLY_FAILED, Message, sizeof(Message) / sizeof (TCHAR)); + MessageBox(hwndDlg, Message, Title, MB_OK | MB_ICONSTOP); break; } }

15 years, 8 months

[cwittich] 38908: sync ole32 and oleaut32 to wine 1.1.13

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jan 18 13:23:59 2009 New Revision: 38908 URL: http://svn.reactos.org/svn/reactos?rev=38908&view=rev Log: sync ole32 and oleaut32 to wine 1.1.13 Modified: trunk/reactos/dll/win32/ole32/clipboard.c trunk/reactos/dll/win32/ole32/compobj.c trunk/reactos/dll/win32/ole32/defaulthandler.c trunk/reactos/dll/win32/ole32/ifs.h trunk/reactos/dll/win32/ole32/moniker.c trunk/reactos/dll/win32/ole32/ole16.c trunk/reactos/dll/win32/ole32/ole32.spec trunk/reactos/dll/win32/ole32/rpc.c trunk/reactos/dll/win32/ole32/storage32.c trunk/reactos/dll/win32/ole32/usrmarshal.c trunk/reactos/dll/win32/oleaut32/olepicture.c trunk/reactos/dll/win32/oleaut32/typelib.c trunk/reactos/dll/win32/oleaut32/usrmarshal.c Modified: trunk/reactos/dll/win32/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/clipboard.… ============================================================================== --- trunk/reactos/dll/win32/ole32/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/clipboard.c [iso-8859-1] Sun Jan 18 13:23:59 2009 @@ -80,9 +80,10 @@ #include "compobj_private.h" +WINE_DEFAULT_DEBUG_CHANNEL(ole); + #define HANDLE_ERROR(err) do { hr = err; TRACE("(HRESULT=%x)\n", (HRESULT)err); goto CLEANUP; } while (0) -WINE_DEFAULT_DEBUG_CHANNEL(ole); /**************************************************************************** * OLEClipbrd Modified: trunk/reactos/dll/win32/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj.c?… ============================================================================== --- trunk/reactos/dll/win32/ole32/compobj.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/compobj.c [iso-8859-1] Sun Jan 18 13:23:59 2009 @@ -55,6 +55,7 @@ #include "objbase.h" #include "ole2.h" #include "ole2ver.h" +#include "ctxtcall.h" #include "compobj_private.h" @@ -3703,19 +3704,37 @@ typedef struct Context { const IComThreadingInfoVtbl *lpVtbl; + const IContextCallbackVtbl *lpCallbackVtbl; LONG refs; APTTYPE apttype; } Context; -static HRESULT WINAPI Context_QueryInterface(IComThreadingInfo *iface, REFIID riid, LPVOID *ppv) +static inline Context *impl_from_IComThreadingInfo( IComThreadingInfo *iface ) +{ + return (Context *)((char*)iface - FIELD_OFFSET(Context, lpVtbl)); +} + +static inline Context *impl_from_IContextCallback( IContextCallback *iface ) +{ + return (Context *)((char*)iface - FIELD_OFFSET(Context, lpCallbackVtbl)); +} + +static HRESULT Context_QueryInterface(Context *iface, REFIID riid, LPVOID *ppv) { *ppv = NULL; if (IsEqualIID(riid, &IID_IComThreadingInfo) || IsEqualIID(riid, &IID_IUnknown)) { - *ppv = iface; - IUnknown_AddRef(iface); + *ppv = &iface->lpVtbl; + } else if (IsEqualIID(riid, &IID_IContextCallback)) + { + *ppv = &iface->lpCallbackVtbl; + } + + if (*ppv) + { + IUnknown_AddRef((IUnknown*)*ppv); return S_OK; } @@ -3723,24 +3742,40 @@ return E_NOINTERFACE; } -static ULONG WINAPI Context_AddRef(IComThreadingInfo *iface) -{ - Context *This = (Context *)iface; +static ULONG Context_AddRef(Context *This) +{ return InterlockedIncrement(&This->refs); } -static ULONG WINAPI Context_Release(IComThreadingInfo *iface) -{ - Context *This = (Context *)iface; +static ULONG Context_Release(Context *This) +{ ULONG refs = InterlockedDecrement(&This->refs); if (!refs) HeapFree(GetProcessHeap(), 0, This); return refs; } -static HRESULT WINAPI Context_GetCurrentApartmentType(IComThreadingInfo *iface, APTTYPE *apttype) -{ - Context *This = (Context *)iface; +static HRESULT WINAPI Context_CTI_QueryInterface(IComThreadingInfo *iface, REFIID riid, LPVOID *ppv) +{ + Context *This = impl_from_IComThreadingInfo(iface); + return Context_QueryInterface(This, riid, ppv); +} + +static ULONG WINAPI Context_CTI_AddRef(IComThreadingInfo *iface) +{ + Context *This = impl_from_IComThreadingInfo(iface); + return Context_AddRef(This); +} + +static ULONG WINAPI Context_CTI_Release(IComThreadingInfo *iface) +{ + Context *This = impl_from_IComThreadingInfo(iface); + return Context_Release(This); +} + +static HRESULT WINAPI Context_CTI_GetCurrentApartmentType(IComThreadingInfo *iface, APTTYPE *apttype) +{ + Context *This = impl_from_IComThreadingInfo(iface); TRACE("(%p)\n", apttype); @@ -3748,9 +3783,9 @@ return S_OK; } -static HRESULT WINAPI Context_GetCurrentThreadType(IComThreadingInfo *iface, THDTYPE *thdtype) -{ - Context *This = (Context *)iface; +static HRESULT WINAPI Context_CTI_GetCurrentThreadType(IComThreadingInfo *iface, THDTYPE *thdtype) +{ + Context *This = impl_from_IComThreadingInfo(iface); TRACE("(%p)\n", thdtype); @@ -3767,13 +3802,13 @@ return S_OK; } -static HRESULT WINAPI Context_GetCurrentLogicalThreadId(IComThreadingInfo *iface, GUID *logical_thread_id) +static HRESULT WINAPI Context_CTI_GetCurrentLogicalThreadId(IComThreadingInfo *iface, GUID *logical_thread_id) { FIXME("(%p): stub\n", logical_thread_id); return E_NOTIMPL; } -static HRESULT WINAPI Context_SetCurrentLogicalThreadId(IComThreadingInfo *iface, REFGUID logical_thread_id) +static HRESULT WINAPI Context_CTI_SetCurrentLogicalThreadId(IComThreadingInfo *iface, REFGUID logical_thread_id) { FIXME("(%s): stub\n", debugstr_guid(logical_thread_id)); return E_NOTIMPL; @@ -3781,14 +3816,50 @@ static const IComThreadingInfoVtbl Context_Threading_Vtbl = { - Context_QueryInterface, - Context_AddRef, - Context_Release, - Context_GetCurrentApartmentType, - Context_GetCurrentThreadType, - Context_GetCurrentLogicalThreadId, - Context_SetCurrentLogicalThreadId + Context_CTI_QueryInterface, + Context_CTI_AddRef, + Context_CTI_Release, + Context_CTI_GetCurrentApartmentType, + Context_CTI_GetCurrentThreadType, + Context_CTI_GetCurrentLogicalThreadId, + Context_CTI_SetCurrentLogicalThreadId }; + +static HRESULT WINAPI Context_CC_QueryInterface(IContextCallback *iface, REFIID riid, LPVOID *ppv) +{ + Context *This = impl_from_IContextCallback(iface); + return Context_QueryInterface(This, riid, ppv); +} + +static ULONG WINAPI Context_CC_AddRef(IContextCallback *iface) +{ + Context *This = impl_from_IContextCallback(iface); + return Context_AddRef(This); +} + +static ULONG WINAPI Context_CC_Release(IContextCallback *iface) +{ + Context *This = impl_from_IContextCallback(iface); + return Context_Release(This); +} + +static HRESULT WINAPI Context_CC_ContextCallback(IContextCallback *iface, PFNCONTEXTCALL pCallback, + ComCallData *param, REFIID riid, int method, IUnknown *punk) +{ + Context *This = impl_from_IContextCallback(iface); + + FIXME("(%p/%p)->(%p, %p, %s, %d, %p)\n", This, iface, pCallback, param, debugstr_guid(riid), method, punk); + return E_NOTIMPL; +} + +static const IContextCallbackVtbl Context_Callback_Vtbl = +{ + Context_CC_QueryInterface, + Context_CC_AddRef, + Context_CC_Release, + Context_CC_ContextCallback +}; + /*********************************************************************** * CoGetObjectContext [OLE32.@] @@ -3823,6 +3894,7 @@ return E_OUTOFMEMORY; context->lpVtbl = &Context_Threading_Vtbl; + context->lpCallbackVtbl = &Context_Callback_Vtbl; context->refs = 1; if (apt->multi_threaded) context->apttype = APTTYPE_MTA; Modified: trunk/reactos/dll/win32/ole32/defaulthandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/defaulthan… ============================================================================== --- trunk/reactos/dll/win32/ole32/defaulthandler.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/defaulthandler.c [iso-8859-1] Sun Jan 18 13:23:59 2009 @@ -909,7 +909,7 @@ if (FAILED(hres)) *pdwStatus = 0; - return S_OK; + return hres; } /************************************************************************ Modified: trunk/reactos/dll/win32/ole32/ifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ifs.h?rev=… ============================================================================== --- trunk/reactos/dll/win32/ole32/ifs.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ifs.h [iso-8859-1] Sun Jan 18 13:23:59 2009 @@ -56,10 +56,6 @@ STDMETHOD16_(LPVOID,HeapMinimize)(THIS) PURE; }; #undef INTERFACE - -/**********************************************************************/ - -extern LPMALLOC16 IMalloc16_Constructor(void); /**********************************************************************/ Modified: trunk/reactos/dll/win32/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/moniker.c?… ============================================================================== --- trunk/reactos/dll/win32/ole32/moniker.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/moniker.c [iso-8859-1] Sun Jan 18 13:23:59 2009 @@ -1344,7 +1344,7 @@ return ref; } /*********************************************************************** - * EnmumMoniker_Next + * EnumMoniker_Next */ static HRESULT WINAPI EnumMonikerImpl_Next(IEnumMoniker* iface, ULONG celt, IMoniker** rgelt, ULONG * pceltFetched) { @@ -1379,7 +1379,7 @@ } /*********************************************************************** - * EnmumMoniker_Skip + * EnumMoniker_Skip */ static HRESULT WINAPI EnumMonikerImpl_Skip(IEnumMoniker* iface, ULONG celt) { @@ -1396,7 +1396,7 @@ } /*********************************************************************** - * EnmumMoniker_Reset + * EnumMoniker_Reset */ static HRESULT WINAPI EnumMonikerImpl_Reset(IEnumMoniker* iface) { @@ -1410,7 +1410,7 @@ } /*********************************************************************** - * EnmumMoniker_Clone + * EnumMoniker_Clone */ static HRESULT WINAPI EnumMonikerImpl_Clone(IEnumMoniker* iface, IEnumMoniker ** ppenum) { Modified: trunk/reactos/dll/win32/ole32/ole16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole16.c?re… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole16.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole16.c [iso-8859-1] Sun Jan 18 13:23:59 2009 @@ -171,7 +171,7 @@ /****************************************************************************** * IMalloc16_Constructor [VTABLE] */ -LPMALLOC16 +static LPMALLOC16 IMalloc16_Constructor(void) { static IMalloc16Vtbl vt16; Modified: trunk/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] Sun Jan 18 13:23:59 2009 @@ -138,6 +138,10 @@ @ stdcall HGLOBAL_UserMarshal(ptr ptr ptr) @ stdcall HGLOBAL_UserSize(ptr long ptr) @ stdcall HGLOBAL_UserUnmarshal(ptr ptr ptr) +@ stdcall HICON_UserFree(ptr ptr) +@ stdcall HICON_UserMarshal(ptr ptr ptr) +@ stdcall HICON_UserSize(ptr long ptr) +@ stdcall HICON_UserUnmarshal(ptr ptr ptr) @ stdcall HMENU_UserFree(ptr ptr) @ stdcall HMENU_UserMarshal(ptr ptr ptr) @ stdcall HMENU_UserSize(ptr long ptr) Modified: trunk/reactos/dll/win32/ole32/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/rpc.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/ole32/rpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/rpc.c [iso-8859-1] Sun Jan 18 13:23:59 2009 @@ -568,7 +568,7 @@ /* save away the message state again */ msg->Handle = message_state; - TRACE("-- %ld\n", status); + TRACE("-- %d\n", status); return HRESULT_FROM_WIN32(status); } @@ -751,7 +751,7 @@ HeapFree(GetProcessHeap(), 0, channel_hook_data); - TRACE("-- %ld\n", status); + TRACE("-- %d\n", status); return HRESULT_FROM_WIN32(status); } @@ -771,7 +771,7 @@ * RPC functions do */ data->status = I_RpcSendReceive((RPC_MESSAGE *)data->msg); - TRACE("completed with status 0x%lx\n", data->status); + TRACE("completed with status 0x%x\n", data->status); SetEvent(data->handle); @@ -893,7 +893,7 @@ orpcthat.flags = ORPCF_NULL; orpcthat.extensions = NULL; - TRACE("RPC call status: 0x%lx\n", status); + TRACE("RPC call status: 0x%x\n", status); if (status != RPC_S_OK) hr = HRESULT_FROM_WIN32(status); @@ -967,7 +967,7 @@ msg->Handle = message_state; - TRACE("-- %ld\n", status); + TRACE("-- %d\n", status); return HRESULT_FROM_WIN32(status); } @@ -1003,7 +1003,7 @@ IRpcChannelBuffer_Release(message_state->params.chan); HeapFree(GetProcessHeap(), 0, message_state); - TRACE("-- %ld\n", status); + TRACE("-- %d\n", status); return HRESULT_FROM_WIN32(status); } @@ -1104,7 +1104,7 @@ if (status != RPC_S_OK) { - ERR("Couldn't get binding for endpoint %s, status = %ld\n", debugstr_w(endpoint), status); + ERR("Couldn't get binding for endpoint %s, status = %d\n", debugstr_w(endpoint), status); return HRESULT_FROM_WIN32(status); } @@ -1536,7 +1536,7 @@ list_add_tail(&registered_interfaces, &rif->entry); else { - ERR("RpcServerRegisterIfEx failed with error %ld\n", status); + ERR("RpcServerRegisterIfEx failed with error %d\n", status); HeapFree(GetProcessHeap(), 0, rif); hr = HRESULT_FROM_WIN32(status); } Modified: trunk/reactos/dll/win32/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… ============================================================================== --- trunk/reactos/dll/win32/ole32/storage32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/storage32.c [iso-8859-1] Sun Jan 18 13:23:59 2009 @@ -6280,6 +6280,9 @@ if(!pStg) return E_INVALIDARG; + + if(!rclsid) + return STG_E_INVALIDPOINTER; hRes = IStorage_SetClass(pStg, rclsid); Modified: trunk/reactos/dll/win32/ole32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/usrmarshal… ============================================================================== --- trunk/reactos/dll/win32/ole32/usrmarshal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/usrmarshal.c [iso-8859-1] Sun Jan 18 13:23:59 2009 @@ -642,6 +642,105 @@ * This function is only intended to be called by the RPC runtime. */ void __RPC_USER HBITMAP_UserFree(ULONG *pFlags, HBITMAP *phBmp) +{ + FIXME(":stub\n"); +} + +/****************************************************************************** + * HICON_UserSize [OLE32.@] + * + * Calculates the buffer size required to marshal an icon. + * + * PARAMS + * pFlags [I] Flags. See notes. + * StartingSize [I] Starting size of the buffer. This value is added on to + * the buffer size required for the icon. + * phIcon [I] Icon to size. + * + * RETURNS + * The buffer size required to marshal an icon plus the starting size. + * + * NOTES + * Even though the function is documented to take a pointer to a ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is a ULONG. + * This function is only intended to be called by the RPC runtime. + */ +ULONG __RPC_USER HICON_UserSize(ULONG *pFlags, ULONG StartingSize, HICON *phIcon) +{ + FIXME(":stub\n"); + return StartingSize; +} + +/****************************************************************************** +* HICON_UserMarshal [OLE32.@] +* +* Marshals an icon into a buffer. +* +* PARAMS +* pFlags [I] Flags. See notes. +* pBuffer [I] Buffer to marshal the icon into. +* phIcon [I] Icon to marshal. +* +* RETURNS +* The end of the marshaled data in the buffer. +* +* NOTES +* Even though the function is documented to take a pointer to a ULONG in +* pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which +* the first parameter is a ULONG. +* This function is only intended to be called by the RPC runtime. +*/ +unsigned char * __RPC_USER HICON_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HICON *phIcon) +{ + FIXME(":stub\n"); + return pBuffer; +} + +/****************************************************************************** + * HICON_UserUnmarshal [OLE32.@] + * + * Unmarshals an icon from a buffer. + * + * PARAMS + * pFlags [I] Flags. See notes. + * pBuffer [I] Buffer to marshal the icon from. + * phIcon [O] Address that receive the unmarshaled icon. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to an ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is an ULONG. + * This function is only intended to be called by the RPC runtime. + */ +unsigned char * __RPC_USER HICON_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HICON *phIcon) +{ + FIXME(":stub\n"); + return pBuffer; +} + +/****************************************************************************** + * HICON_UserFree [OLE32.@] + * + * Frees an unmarshaled icon. + * + * PARAMS + * pFlags [I] Flags. See notes. + * phIcon [I] Icon to free. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to a ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of + * which the first parameter is a ULONG. + * This function is only intended to be called by the RPC runtime. + */ +void __RPC_USER HICON_UserFree(ULONG *pFlags, HICON *phIcon) { FIXME(":stub\n"); } Modified: trunk/reactos/dll/win32/oleaut32/olepicture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/olepict… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/olepicture.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/olepicture.c [iso-8859-1] Sun Jan 18 13:23:59 2009 @@ -519,22 +519,26 @@ { OLEPictureImpl *This = (OLEPictureImpl *)iface; TRACE("(%p)->(%p)\n", This, phandle); + + if(!phandle) + return E_POINTER; + switch(This->desc.picType) { case PICTYPE_NONE: case PICTYPE_UNINITIALIZED: *phandle = 0; break; case PICTYPE_BITMAP: - *phandle = (OLE_HANDLE)This->desc.u.bmp.hbitmap; + *phandle = HandleToUlong(This->desc.u.bmp.hbitmap); break; case PICTYPE_METAFILE: - *phandle = (OLE_HANDLE)This->desc.u.wmf.hmeta; + *phandle = HandleToUlong(This->desc.u.wmf.hmeta); break; case PICTYPE_ICON: - *phandle = (OLE_HANDLE)This->desc.u.icon.hicon; + *phandle = HandleToUlong(This->desc.u.icon.hicon); break; case PICTYPE_ENHMETAFILE: - *phandle = (OLE_HANDLE)This->desc.u.emf.hemf; + *phandle = HandleToUlong(This->desc.u.emf.hemf); break; default: FIXME("Unimplemented type %d\n", This->desc.picType); @@ -564,7 +568,7 @@ hres = S_FALSE; break; case PICTYPE_BITMAP: - *phandle = (OLE_HANDLE)This->desc.u.bmp.hpal; + *phandle = HandleToUlong(This->desc.u.bmp.hpal); hres = S_OK; break; case PICTYPE_METAFILE: @@ -591,6 +595,10 @@ { OLEPictureImpl *This = (OLEPictureImpl *)iface; TRACE("(%p)->(%p): type is %d\n", This, ptype, This->desc.picType); + + if(!ptype) + return E_POINTER; + *ptype = This->desc.picType; return S_OK; } @@ -774,7 +782,7 @@ *phdcOut = This->hDCCur; This->hDCCur = hdcIn; if (phbmpOut) - *phbmpOut = (OLE_HANDLE)This->desc.u.bmp.hbitmap; + *phbmpOut = HandleToUlong(This->desc.u.bmp.hbitmap); return S_OK; } else { FIXME("Don't know how to select picture type %d\n",This->desc.picType); @@ -842,8 +850,14 @@ { OLEPictureImpl *This = (OLEPictureImpl *)iface; TRACE("(%p)->(%p).\n", This, pdwAttr); + + if(!pdwAttr) + return E_POINTER; + *pdwAttr = 0; switch (This->desc.picType) { + case PICTYPE_UNINITIALIZED: + case PICTYPE_NONE: break; case PICTYPE_BITMAP: if (This->hbmMask) *pdwAttr = PICTURE_TRANSPARENT; break; /* not 'truly' scalable, see MSDN. */ case PICTYPE_ICON: *pdwAttr = PICTURE_TRANSPARENT;break; case PICTYPE_ENHMETAFILE: /* fall through */ Modified: trunk/reactos/dll/win32/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/typelib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/typelib.c [iso-8859-1] Sun Jan 18 13:23:59 2009 @@ -2214,6 +2214,8 @@ debugstr_w(ptiRet->Name), debugstr_guid(&ptiRet->TypeAttr.guid), typekind_desc[ptiRet->TypeAttr.typekind]); + if (TRACE_ON(typelib)) + dump_TypeInfo(ptiRet); return ptiRet; } Modified: trunk/reactos/dll/win32/oleaut32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/usrmars… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/usrmarshal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/usrmarshal.c [iso-8859-1] Sun Jan 18 13:23:59 2009 @@ -2017,8 +2017,35 @@ VARIANT *pVar, IErrorLog *pErrorLog) { - FIXME("not implemented\n"); - return E_FAIL; + IUnknown *pUnk = NULL; + TRACE("(%p, %s, %p, %p)\n", This, debugstr_w(pszPropName), pVar, pErrorLog); + + if(!pVar) + return E_POINTER; + + if(V_VT(pVar) & (VT_BYREF | VT_ARRAY | VT_VECTOR)) + { + FIXME("Variant type %x is byref, array or vector. Not implemented.\n", V_VT(pVar)); + return E_NOTIMPL; + } + + switch(V_VT(pVar)) + { + case VT_DISPATCH: + pUnk = (IUnknown*)V_DISPATCH(pVar); + break; + case VT_UNKNOWN: + pUnk = V_UNKNOWN(pVar); + break; + case VT_SAFEARRAY: + FIXME("Safearray support not yet implemented.\n"); + return E_NOTIMPL; + default: + break; + } + + return IPropertyBag_RemoteRead_Proxy(This, pszPropName, pVar, pErrorLog, + V_VT(pVar), pUnk); } HRESULT __RPC_STUB IPropertyBag_Read_Stub( @@ -2029,8 +2056,45 @@ DWORD varType, IUnknown *pUnkObj) { - FIXME("not implemented\n"); - return E_FAIL; + static const WCHAR emptyWstr[1] = {0}; + IDispatch *disp; + HRESULT hr; + TRACE("(%p, %s, %p, %p, %x, %p)\n", This, debugstr_w(pszPropName), pVar, + pErrorLog, varType, pUnkObj); + + if(varType & (VT_BYREF | VT_ARRAY | VT_VECTOR)) + { + FIXME("Variant type %x is byref, array or vector. Not implemented.\n", V_VT(pVar)); + return E_NOTIMPL; + } + + V_VT(pVar) = varType; + switch(varType) + { + case VT_DISPATCH: + hr = IUnknown_QueryInterface(pUnkObj, &IID_IDispatch, (LPVOID*)&disp); + if(FAILED(hr)) + return hr; + IUnknown_Release(pUnkObj); + V_DISPATCH(pVar) = disp; + break; + case VT_UNKNOWN: + V_UNKNOWN(pVar) = pUnkObj; + break; + case VT_BSTR: + V_BSTR(pVar) = SysAllocString(emptyWstr); + break; + case VT_SAFEARRAY: + FIXME("Safearray support not yet implemented.\n"); + return E_NOTIMPL; + default: + break; + } + hr = IPropertyBag_Read(This, pszPropName, pVar, pErrorLog); + if(FAILED(hr)) + VariantClear(pVar); + + return hr; } /* call_as/local stubs for ocidl.idl */

15 years, 8 months

[cwittich] 38907: sync ole32 winetest to wine 1.1.13

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jan 18 13:23:06 2009 New Revision: 38907 URL: http://svn.reactos.org/svn/reactos?rev=38907&view=rev Log: sync ole32 winetest to wine 1.1.13 Modified: trunk/rostests/winetests/ole32/compobj.c trunk/rostests/winetests/ole32/marshal.c trunk/rostests/winetests/ole32/moniker.c trunk/rostests/winetests/ole32/ole2.c trunk/rostests/winetests/ole32/storage32.c trunk/rostests/winetests/ole32/usrmarshal.c Modified: trunk/rostests/winetests/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/compobj.c… ============================================================================== --- trunk/rostests/winetests/ole32/compobj.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/compobj.c [iso-8859-1] Sun Jan 18 13:23:06 2009 @@ -29,6 +29,9 @@ #include "shlguid.h" #include "urlmon.h" /* for CLSID_FileProtocol */ +#include "initguid.h" +#include "ctxtcall.h" + #include "wine/test.h" /* functions that are not present on all versions of Windows */ @@ -887,7 +890,7 @@ ok(hr == S_OK, "CoGetClassObject on local server object registered in same " "thread should return S_OK instead of 0x%08x\n", hr); - thread = CreateThread(NULL, 0, revoke_class_object_thread, (LPVOID)cookie, 0, &tid); + thread = CreateThread(NULL, 0, revoke_class_object_thread, (LPVOID)(DWORD_PTR)cookie, 0, &tid); ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); WaitForSingleObject(thread, INFINITE); GetExitCodeThread(thread, &exitcode); @@ -931,7 +934,7 @@ ok(!is_module_loaded("urlmon.dll"), "urlmon.dll shouldn't be loaded\n"); - hr = CoCreateInstance(&CLSID_FileProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); + hr = CoCreateInstance(&CLSID_FileProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void **)&pUnk); if (hr == REGDB_E_CLASSNOTREG) { trace("IE not installed so can't run CoFreeUnusedLibraries test\n"); @@ -967,6 +970,7 @@ HRESULT hr; ULONG refs; IComThreadingInfo *pComThreadingInfo; + IContextCallback *pContextCallback; APTTYPE apttype; THDTYPE thdtype; @@ -996,6 +1000,15 @@ refs = IComThreadingInfo_Release(pComThreadingInfo); ok(refs == 0, "pComThreadingInfo should have 0 refs instead of %d refs\n", refs); + hr = pCoGetObjectContext(&IID_IContextCallback, (void **)&pContextCallback); + ok_ole_success(hr, "CoGetObjectContext(ContextCallback)"); + + if (hr == S_OK) + { + refs = IContextCallback_Release(pContextCallback); + ok(refs == 0, "pContextCallback should have 0 refs instead of %d refs\n", refs); + } + CoUninitialize(); pCoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -1014,14 +1027,41 @@ refs = IComThreadingInfo_Release(pComThreadingInfo); ok(refs == 0, "pComThreadingInfo should have 0 refs instead of %d refs\n", refs); - CoUninitialize(); + hr = pCoGetObjectContext(&IID_IContextCallback, (void **)&pContextCallback); + ok_ole_success(hr, "CoGetObjectContext(ContextCallback)"); + + if (hr == S_OK) + { + refs = IContextCallback_Release(pContextCallback); + ok(refs == 0, "pContextCallback should have 0 refs instead of %d refs\n", refs); + } + + CoUninitialize(); +} + +static void test_CoInitializeEx(void) +{ + HRESULT hr; + + hr = pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + ok(hr == S_OK, "CoInitializeEx failed with error 0x%08x\n", hr); + + /* Calling OleInitialize for the first time should yield S_OK even with + * apartment already initialized by previous CoInitialize(Ex) calls. */ + hr = OleInitialize(NULL); + todo_wine ok(hr == S_OK, "OleInitialize failed with error 0x%08x\n", hr); + + /* Subsequent calls to OleInitialize should return S_FALSE */ + hr = OleInitialize(NULL); + ok(hr == S_FALSE, "Expected S_FALSE, hr = 0x%08x\n", hr); + + /* Cleanup */ + CoUninitialize(); + OleUninitialize(); } START_TEST(compobj) { - skip("ROS-HACK: Skipping compobj tests\n"); - return; - HMODULE hOle32 = GetModuleHandle("ole32"); pCoGetObjectContext = (void*)GetProcAddress(hOle32, "CoGetObjectContext"); if (!(pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"))) @@ -1048,4 +1088,5 @@ test_registered_object_thread_affinity(); test_CoFreeUnusedLibraries(); test_CoGetObjectContext(); -} + test_CoInitializeEx(); +} Modified: trunk/rostests/winetests/ole32/marshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/marshal.c… ============================================================================== --- trunk/rostests/winetests/ole32/marshal.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/marshal.c [iso-8859-1] Sun Jan 18 13:23:06 2009 @@ -2056,15 +2056,18 @@ if (mshctx == MSHCTX_INPROC) { - DWORD expected_size = sizeof(DWORD) + sizeof(void *) + sizeof(DWORD) + sizeof(GUID); + DWORD expected_size = 3*sizeof(DWORD) + sizeof(GUID); ok(size == expected_size, "size should have been %d instead of %d\n", expected_size, size); ok(*(DWORD *)marshal_data == mshlflags, "expected 0x%x, but got 0x%x for mshctx\n", mshlflags, *(DWORD *)marshal_data); marshal_data += sizeof(DWORD); ok(*(void **)marshal_data == ptr, "expected %p, but got %p for mshctx\n", ptr, *(void **)marshal_data); marshal_data += sizeof(void *); - ok(*(DWORD *)marshal_data == 0, "expected 0x0, but got 0x%x\n", *(DWORD *)marshal_data); - marshal_data += sizeof(DWORD); + if (sizeof(void*) == 4) + { + ok(*(DWORD *)marshal_data == 0, "expected 0x0, but got 0x%x\n", *(DWORD *)marshal_data); + marshal_data += sizeof(DWORD); + } trace("got guid data: {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", ((GUID *)marshal_data)->Data1, ((GUID *)marshal_data)->Data2, ((GUID *)marshal_data)->Data3, ((GUID *)marshal_data)->Data4[0], ((GUID *)marshal_data)->Data4[1], ((GUID *)marshal_data)->Data4[2], ((GUID *)marshal_data)->Data4[3], Modified: trunk/rostests/winetests/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/moniker.c… ============================================================================== --- trunk/rostests/winetests/ole32/moniker.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/moniker.c [iso-8859-1] Sun Jan 18 13:23:06 2009 @@ -1332,6 +1332,9 @@ ok_ole_success(hr, CreateBindCtx); /* IsRunning test */ + hr = IMoniker_IsRunning(moniker, NULL, NULL, NULL); + ok(hr == E_NOTIMPL, "IMoniker_IsRunning should return E_NOTIMPL, not 0x%08x\n", hr); + hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); ok(hr == E_NOTIMPL, "IMoniker_IsRunning should return E_NOTIMPL, not 0x%08x\n", hr); @@ -1461,6 +1464,10 @@ ok_ole_success(hr, CreateBindCtx); /* IsRunning test */ + hr = IMoniker_IsRunning(moniker, NULL, NULL, NULL); + todo_wine + ok(hr == E_INVALIDARG, "IMoniker_IsRunning should return E_INVALIDARG, not 0x%08x\n", hr); + hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); ok(hr == S_FALSE, "IMoniker_IsRunning should return S_FALSE, not 0x%08x\n", hr); @@ -1593,6 +1600,10 @@ ok_ole_success(hr, CreateBindCtx); /* IsRunning test */ + hr = IMoniker_IsRunning(moniker, NULL, NULL, NULL); + todo_wine + ok(hr == E_INVALIDARG, "IMoniker_IsRunning should return E_INVALIDARG, not 0x%08x\n", hr); + hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); todo_wine ok(hr == S_FALSE, "IMoniker_IsRunning should return S_FALSE, not 0x%08x\n", hr); @@ -1750,7 +1761,7 @@ hr = IBindCtx_GetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); ok_ole_success(hr, "IBindCtx_GetBindOptions"); ok(bind_opts.cbStruct == sizeof(bind_opts) || - bind_opts.cbStruct == 36, /* Vista */ + bind_opts.cbStruct == sizeof(bind_opts) + sizeof(void*), /* Vista */ "bind_opts.cbStruct was %d\n", bind_opts.cbStruct); bind_opts.cbStruct = sizeof(BIND_OPTS); Modified: trunk/rostests/winetests/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/ole2.c?re… ============================================================================== --- trunk/rostests/winetests/ole32/ole2.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/ole2.c [iso-8859-1] Sun Jan 18 13:23:06 2009 @@ -1384,7 +1384,6 @@ hr); hr = IOleObject_GetMiscStatus(pObject, DVASPECT_CONTENT, &dwStatus); - todo_wine ok(hr == REGDB_E_CLASSNOTREG, "IOleObject_GetMiscStatus should have returned REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr); hr = IOleObject_GetUserClassID(pObject, &clsid); Modified: trunk/rostests/winetests/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/storage32… ============================================================================== --- trunk/rostests/winetests/ole32/storage32.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/storage32.c [iso-8859-1] Sun Jan 18 13:23:06 2009 @@ -803,6 +803,56 @@ DeleteFileW(filename); } +static void test_writeclassstg(void) +{ + static const WCHAR szPrefix[] = { 's','t','g',0 }; + static const WCHAR szDot[] = { '.',0 }; + WCHAR filename[MAX_PATH]; + IStorage *stg = NULL; + HRESULT r; + CLSID temp_cls; + + if(!GetTempFileNameW(szDot, szPrefix, 0, filename)) + return; + + DeleteFileW(filename); + + /* create the file */ + r = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | + STGM_READWRITE, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed\n"); + + r = ReadClassStg( NULL, NULL ); + ok(r == E_INVALIDARG, "ReadClassStg should return E_INVALIDARG instead of 0x%08X\n", r); + + r = ReadClassStg( stg, NULL ); + ok(r == E_INVALIDARG, "ReadClassStg should return E_INVALIDARG instead of 0x%08X\n", r); + + temp_cls.Data1 = 0xdeadbeef; + r = ReadClassStg( stg, &temp_cls ); + ok(r == S_OK, "ReadClassStg failed with 0x%08X\n", r); + + ok(IsEqualCLSID(&temp_cls, &CLSID_NULL), "ReadClassStg returned wrong clsid\n"); + + r = WriteClassStg( NULL, NULL ); + ok(r == E_INVALIDARG, "WriteClassStg should return E_INVALIDARG instead of 0x%08X\n", r); + + r = WriteClassStg( stg, NULL ); + ok(r == STG_E_INVALIDPOINTER, "WriteClassStg should return STG_E_INVALIDPOINTER instead of 0x%08X\n", r); + + r = WriteClassStg( stg, &test_stg_cls ); + ok( r == S_OK, "WriteClassStg failed with 0x%08X\n", r); + + r = ReadClassStg( stg, &temp_cls ); + ok( r == S_OK, "ReadClassStg failed with 0x%08X\n", r); + ok(IsEqualCLSID(&temp_cls, &test_stg_cls), "ReadClassStg returned wrong clsid\n"); + + r = IStorage_Release( stg ); + ok (r == 0, "storage not released\n"); + + DeleteFileW(filename); +} + static void test_streamenum(void) { static const WCHAR szPrefix[] = { 's','t','g',0 }; @@ -1229,4 +1279,5 @@ test_transact(); test_ReadClassStm(); test_access(); -} + test_writeclassstg(); +} Modified: trunk/rostests/winetests/ole32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/usrmarsha… ============================================================================== --- trunk/rostests/winetests/ole32/usrmarshal.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/usrmarshal.c [iso-8859-1] Sun Jan 18 13:23:06 2009 @@ -33,6 +33,17 @@ unsigned char * __RPC_USER HMETAFILE_UserMarshal(ULONG *, unsigned char *, HMETAFILE *); unsigned char * __RPC_USER HMETAFILE_UserUnmarshal(ULONG *, unsigned char *, HMETAFILE *); void __RPC_USER HMETAFILE_UserFree(ULONG *, HMETAFILE *); + +ULONG __RPC_USER HENHMETAFILE_UserSize(ULONG *, ULONG, HENHMETAFILE *); +unsigned char * __RPC_USER HENHMETAFILE_UserMarshal (ULONG *, unsigned char *, HENHMETAFILE *); +unsigned char * __RPC_USER HENHMETAFILE_UserUnmarshal(ULONG *, unsigned char *, HENHMETAFILE *); +void __RPC_USER HENHMETAFILE_UserFree(ULONG *, HENHMETAFILE *); + +ULONG __RPC_USER HMETAFILEPICT_UserSize(ULONG *, ULONG, HMETAFILEPICT *); +unsigned char * __RPC_USER HMETAFILEPICT_UserMarshal (ULONG *, unsigned char *, HMETAFILEPICT *); +unsigned char * __RPC_USER HMETAFILEPICT_UserUnmarshal(ULONG *, unsigned char *, HMETAFILEPICT *); +void __RPC_USER HMETAFILEPICT_UserFree(ULONG *, HMETAFILEPICT *); + static const char cf_marshaled[] = {

15 years, 8 months

[sginsberg] 38906: - Fix regexpl build

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sun Jan 18 12:40:02 2009 New Revision: 38906 URL: http://svn.reactos.org/svn/reactos?rev=38906&view=rev Log: - Fix regexpl build Modified: trunk/rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp trunk/rosapps/applications/sysutils/regexpl/ShellCommandOwner.cpp trunk/rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp Modified: trunk/rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp [iso-8859-1] Sun Jan 18 12:40:02 2009 @@ -139,7 +139,7 @@ rConsole.Write(_T("\\")); rConsole.Write(Key.GetKeyName()); rConsole.Write(_T("\n")); - PSECURITY_DESCRIPTOR pSecurityDescriptor = NULL; + PISECURITY_DESCRIPTOR pSecurityDescriptor = NULL; TCHAR *pchName = NULL, *pchDomainName = NULL; try { @@ -147,7 +147,7 @@ if (nError != ERROR_SUCCESS) throw nError; - pSecurityDescriptor = (PSECURITY_DESCRIPTOR) new unsigned char [dwSecurityDescriptorLength]; + pSecurityDescriptor = (PISECURITY_DESCRIPTOR) new unsigned char [dwSecurityDescriptorLength]; DWORD dwSecurityDescriptorLength1 = dwSecurityDescriptorLength; nError = Key.GetSecurityDescriptor((SECURITY_INFORMATION)DACL_SECURITY_INFORMATION,pSecurityDescriptor,&dwSecurityDescriptorLength1); if (nError != ERROR_SUCCESS) Modified: trunk/rosapps/applications/sysutils/regexpl/ShellCommandOwner.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/ShellCommandOwner.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/ShellCommandOwner.cpp [iso-8859-1] Sun Jan 18 12:40:02 2009 @@ -132,7 +132,7 @@ return 0; } - PSECURITY_DESCRIPTOR pSecurityDescriptor = NULL; + PISECURITY_DESCRIPTOR pSecurityDescriptor = NULL; TCHAR *pchName = NULL, *pchDomainName = NULL; try { @@ -144,7 +144,7 @@ dwError = Key.GetSecurityDescriptorLength(&dwSecurityDescriptorLength); if (dwError != ERROR_SUCCESS) throw dwError; - pSecurityDescriptor = (PSECURITY_DESCRIPTOR) new unsigned char [dwSecurityDescriptorLength]; + pSecurityDescriptor = (PISECURITY_DESCRIPTOR) new unsigned char [dwSecurityDescriptorLength]; DWORD dwSecurityDescriptorLength1 = dwSecurityDescriptorLength; dwError = Key.GetSecurityDescriptor((SECURITY_INFORMATION)OWNER_SECURITY_INFORMATION,pSecurityDescriptor,&dwSecurityDescriptorLength1); if (dwError != ERROR_SUCCESS) throw dwError; Modified: trunk/rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp [iso-8859-1] Sun Jan 18 12:40:02 2009 @@ -75,7 +75,7 @@ const TCHAR *pszParameter; const TCHAR *pszCommandItself = rArguments.GetNextArgument(); DWORD dwError; - PSECURITY_DESCRIPTOR pSecurityDescriptor = NULL; + PISECURITY_DESCRIPTOR pSecurityDescriptor = NULL; CSecurityDescriptor sd; HANDLE hThreadToken = INVALID_HANDLE_VALUE; @@ -220,7 +220,7 @@ goto Error; } - pSecurityDescriptor = (PSECURITY_DESCRIPTOR) new unsigned char [dwSecurityDescriptorLength]; + pSecurityDescriptor = (PISECURITY_DESCRIPTOR) new unsigned char [dwSecurityDescriptorLength]; if (!pSecurityDescriptor) { _tcsncpy(pszError_msg,_T("\nOut of memory.\n"),ERROR_MSG_BUFFER_SIZE-1);

15 years, 8 months

[sginsberg] 38905: - Sorry, forgot this file

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sun Jan 18 12:15:32 2009 New Revision: 38905 URL: http://svn.reactos.org/svn/reactos?rev=38905&view=rev Log: - Sorry, forgot this file Modified: trunk/reactos/dll/win32/winmm/winmm.c Modified: trunk/reactos/dll/win32/winmm/winmm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm.c?re… ============================================================================== --- trunk/reactos/dll/win32/winmm/winmm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winmm.c [iso-8859-1] Sun Jan 18 12:15:32 2009 @@ -1525,7 +1525,7 @@ * 3b 4c 00 99 23 5e 04 89 3b 00 00 89 23 00 7c 99 ;L..#^..;...#.|. */ lpMidiHdr = (LPMIDIHDR)msg->lParam; - lpData = lpMidiHdr->lpData; + lpData = (LPBYTE)lpMidiHdr->lpData; TRACE("Adding %s lpMidiHdr=%p [lpData=0x%08lx dwBufferLength=%lu/%lu dwFlags=0x%08lx size=%u]\n", (lpMidiHdr->dwFlags & MHDR_ISSTRM) ? "stream" : "regular", lpMidiHdr, (DWORD)lpMidiHdr, lpMidiHdr->dwBufferLength, lpMidiHdr->dwBytesRecorded, @@ -1632,7 +1632,7 @@ } if (!lpData) - lpData = lpMidiHdr->lpData; + lpData = (LPBYTE)lpMidiHdr->lpData; me = (LPMIDIEVENT)(lpData + lpMidiHdr->dwOffset);

15 years, 8 months

[sginsberg] 38904: - Correct the ulAssemblyRosterIndex member of ACTCTX_SECTION_KEYED_DATA -- it is ULONG (MSDN is wrong here) - Fix Lsa IDL's LUID/PLUID definition - Silence winmm/midimap/wavemap warnings (these modules haven't been touched for a long time and are way out of sync) - Silence a ole32 warning -- should be sent to Wine too

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sun Jan 18 11:58:35 2009 New Revision: 38904 URL: http://svn.reactos.org/svn/reactos?rev=38904&view=rev Log: - Correct the ulAssemblyRosterIndex member of ACTCTX_SECTION_KEYED_DATA -- it is ULONG (MSDN is wrong here) - Fix Lsa IDL's LUID/PLUID definition - Silence winmm/midimap/wavemap warnings (these modules haven't been touched for a long time and are way out of sync) - Silence a ole32 warning -- should be sent to Wine too Added: trunk/reactos/dll/win32/ole32/warningfix.diff Modified: trunk/reactos/dll/win32/ole32/marshal.c trunk/reactos/dll/win32/winmm/driver.c trunk/reactos/dll/win32/winmm/mci.c trunk/reactos/dll/win32/winmm/midimap/midimap.rbuild trunk/reactos/dll/win32/winmm/playsound.c trunk/reactos/dll/win32/winmm/registry.c trunk/reactos/dll/win32/winmm/wavemap/wavemap.c trunk/reactos/dll/win32/winmm/wavemap/wavemap.rbuild trunk/reactos/dll/win32/winmm/winmm.rbuild trunk/reactos/include/psdk/winbase.h trunk/reactos/include/reactos/idl/lsa.idl Modified: trunk/reactos/dll/win32/ole32/marshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/marshal.c?… ============================================================================== --- trunk/reactos/dll/win32/ole32/marshal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/marshal.c [iso-8859-1] Sun Jan 18 11:58:35 2009 @@ -824,7 +824,7 @@ } while (new_dest_context != old_dest_context); if (dest_context_data) - InterlockedExchangePointer(&This->dest_context_data, dest_context_data); + (void)InterlockedExchangePointer(&This->dest_context_data, dest_context_data); } static HRESULT proxy_manager_query_local_interface(struct proxy_manager * This, REFIID riid, void ** ppv) Added: trunk/reactos/dll/win32/ole32/warningfix.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/warningfix… ============================================================================== --- trunk/reactos/dll/win32/ole32/warningfix.diff (added) +++ trunk/reactos/dll/win32/ole32/warningfix.diff [iso-8859-1] Sun Jan 18 11:58:35 2009 @@ -1,0 +1,13 @@ +Index: marshal.c +=================================================================== +--- marshal.c (revision 38899) ++++ marshal.c (working copy) +@@ -824,7 +824,7 @@ + } while (new_dest_context != old_dest_context); + + if (dest_context_data) +- InterlockedExchangePointer(&This->dest_context_data, dest_context_data); ++ (void)InterlockedExchangePointer(&This->dest_context_data, dest_context_data); + } + + static HRESULT proxy_manager_query_local_interface(struct proxy_manager * This, REFIID riid, void ** ppv) Modified: trunk/reactos/dll/win32/winmm/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/driver.c?r… ============================================================================== --- trunk/reactos/dll/win32/winmm/driver.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/driver.c [iso-8859-1] Sun Jan 18 11:58:35 2009 @@ -586,7 +586,7 @@ TRACE("mmThread (%04x, %p) !\n", LOWORD(dwCallBack), lpMMThd); /* same as mmThreadSignal16 */ - InterlockedIncrement(&lpMMThd->dwSignalCount); + InterlockedIncrement((PLONG)&lpMMThd->dwSignalCount); SetEvent(lpMMThd->hEvent); /* some other stuff on lpMMThd->hVxD */ } Modified: trunk/reactos/dll/win32/winmm/mci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/mci.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/winmm/mci.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/mci.c [iso-8859-1] Sun Jan 18 11:58:35 2009 @@ -833,7 +833,7 @@ } else if (WINMM_CheckForMMSystem() && pFnMciMapMsg32WTo16) { WINMM_MapType res; - switch (res = pFnMciMapMsg32WTo16(0, DRV_OPEN, 0, &lp)) { + switch (res = pFnMciMapMsg32WTo16(0, DRV_OPEN, 0, (DWORD*)&lp)) { case WINMM_MAP_MSGERROR: TRACE("Not handled yet (DRV_OPEN)\n"); break; Modified: trunk/reactos/dll/win32/winmm/midimap/midimap.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/midimap/mi… ============================================================================== --- trunk/reactos/dll/win32/winmm/midimap/midimap.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/midimap/midimap.rbuild [iso-8859-1] Sun Jan 18 11:58:35 2009 @@ -1,4 +1,4 @@ -<module name="midimap" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MIDIMAP}" installbase="system32" installname="midimap.dll" allowwarnings="true" unicode="yes"> +<module name="midimap" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MIDIMAP}" installbase="system32" installname="midimap.dll" unicode="yes"> <importlibrary definition="midimap.spec" /> <include base="midimap">.</include> <include base="ReactOS">include/wine</include> Modified: trunk/reactos/dll/win32/winmm/playsound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/playsound.… ============================================================================== --- trunk/reactos/dll/win32/winmm/playsound.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/playsound.c [iso-8859-1] Sun Jan 18 11:58:35 2009 @@ -154,7 +154,7 @@ case WOM_CLOSE: break; case WOM_DONE: - InterlockedIncrement(&s->dwEventCount); + InterlockedIncrement((PLONG)&s->dwEventCount); TRACE("Returning waveHdr=%lx\n", dwParam1); SetEvent(s->hEvent); break; @@ -167,8 +167,8 @@ { for (;;) { ResetEvent(s->hEvent); - if (InterlockedDecrement(&s->dwEventCount) >= 0) break; - InterlockedIncrement(&s->dwEventCount); + if (InterlockedDecrement((PLONG)&s->dwEventCount) >= 0) break; + InterlockedIncrement((PLONG)&s->dwEventCount); WaitForSingleObject(s->hEvent, INFINITE); } Modified: trunk/reactos/dll/win32/winmm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/registry.c… ============================================================================== --- trunk/reactos/dll/win32/winmm/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/registry.c [iso-8859-1] Sun Jan 18 11:58:35 2009 @@ -27,7 +27,6 @@ INT driver_count = 0; INT driver_index = 0; HKEY drivers_key; - BOOL ret; DWORD value_name_length = 256; char value_name[value_name_length]; @@ -49,7 +48,7 @@ &value_name_length, NULL, &value_type, - value_data, + (LPBYTE)value_data, &value_data_length) == ERROR_SUCCESS ) { BOOL valid_driver = FALSE; @@ -74,25 +73,25 @@ is_mapper = TRUE; driver_count ++; } - else if ( ! strnicmp("wave", value_name, 4) ) + else if ( ! _strnicmp("wave", value_name, 4) ) { TRACE("Found a Wave driver: %s\n", value_data); valid_driver = TRUE; driver_count ++; } - else if ( ! strnicmp("midi", value_name, 4) ) + else if ( ! _strnicmp("midi", value_name, 4) ) { TRACE("Found a MIDI driver: %s\n", value_data); valid_driver = TRUE; driver_count ++; } - else if ( ! strnicmp("mixer", value_name, 5) ) + else if ( ! _strnicmp("mixer", value_name, 5) ) { TRACE("Found a mixer driver: %s\n", value_data); valid_driver = TRUE; driver_count ++; } - else if ( ! strnicmp("aux", value_name, 4) ) + else if ( ! _strnicmp("aux", value_name, 4) ) { TRACE("Found an aux driver: %s\n", value_data); valid_driver = TRUE; Modified: trunk/reactos/dll/win32/winmm/wavemap/wavemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/wavemap/wa… ============================================================================== --- trunk/reactos/dll/win32/winmm/wavemap/wavemap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/wavemap/wavemap.c [iso-8859-1] Sun Jan 18 11:58:35 2009 @@ -358,11 +358,11 @@ ash->cbStruct = sizeof(*ash); ash->fdwStatus = 0L; ash->dwUser = (DWORD)lpWaveHdrSrc; - ash->pbSrc = lpWaveHdrSrc->lpData; + ash->pbSrc = (LPBYTE)lpWaveHdrSrc->lpData; ash->cbSrcLength = lpWaveHdrSrc->dwBufferLength; /* ash->cbSrcLengthUsed */ ash->dwSrcUser = lpWaveHdrSrc->dwUser; /* FIXME ? */ - ash->pbDst = (LPSTR)ash + sizeof(ACMSTREAMHEADER) + sizeof(WAVEHDR); + ash->pbDst = (LPBYTE)(LPSTR)ash + sizeof(ACMSTREAMHEADER) + sizeof(WAVEHDR); ash->cbDstLength = size; /* ash->cbDstLengthUsed */ ash->dwDstUser = 0; /* FIXME ? */ @@ -373,7 +373,7 @@ } lpWaveHdrDst = (LPWAVEHDR)((LPSTR)ash + sizeof(ACMSTREAMHEADER)); - lpWaveHdrDst->lpData = ash->pbDst; + lpWaveHdrDst->lpData = (LPSTR)ash->pbDst; lpWaveHdrDst->dwBufferLength = size; /* conversion is not done yet */ lpWaveHdrDst->dwFlags = 0; lpWaveHdrDst->dwLoops = 0; @@ -912,11 +912,11 @@ ash->cbStruct = sizeof(*ash); ash->fdwStatus = 0L; ash->dwUser = (DWORD)lpWaveHdrDst; - ash->pbSrc = (LPSTR)ash + sizeof(ACMSTREAMHEADER) + sizeof(WAVEHDR); + ash->pbSrc = (LPBYTE)(LPSTR)ash + sizeof(ACMSTREAMHEADER) + sizeof(WAVEHDR); ash->cbSrcLength = size; /* ash->cbSrcLengthUsed */ ash->dwSrcUser = 0L; /* FIXME ? */ - ash->pbDst = lpWaveHdrDst->lpData; + ash->pbDst = (LPBYTE)lpWaveHdrDst->lpData; ash->cbDstLength = lpWaveHdrDst->dwBufferLength; /* ash->cbDstLengthUsed */ ash->dwDstUser = lpWaveHdrDst->dwUser; /* FIXME ? */ @@ -927,7 +927,7 @@ } lpWaveHdrSrc = (LPWAVEHDR)((LPSTR)ash + sizeof(ACMSTREAMHEADER)); - lpWaveHdrSrc->lpData = ash->pbSrc; + lpWaveHdrSrc->lpData = (LPSTR)ash->pbSrc; lpWaveHdrSrc->dwBufferLength = size; /* conversion is not done yet */ lpWaveHdrSrc->dwFlags = 0; lpWaveHdrSrc->dwLoops = 0; Modified: trunk/reactos/dll/win32/winmm/wavemap/wavemap.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/wavemap/wa… ============================================================================== --- trunk/reactos/dll/win32/winmm/wavemap/wavemap.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/wavemap/wavemap.rbuild [iso-8859-1] Sun Jan 18 11:58:35 2009 @@ -1,4 +1,4 @@ -<module name="wavemap" type="win32dll" entrypoint="0" extension=".drv" baseaddress="${BASEADDRESS_WAVEMAP}" installbase="system32" installname="msacm32.drv" allowwarnings="true" unicode="yes"> +<module name="wavemap" type="win32dll" entrypoint="0" extension=".drv" baseaddress="${BASEADDRESS_WAVEMAP}" installbase="system32" installname="msacm32.drv" unicode="yes"> <importlibrary definition="msacm.spec" /> <include base="wavemap">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/win32/winmm/winmm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm.rbui… ============================================================================== --- trunk/reactos/dll/win32/winmm/winmm.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winmm.rbuild [iso-8859-1] Sun Jan 18 11:58:35 2009 @@ -7,7 +7,7 @@ <directory name="wavemap"> <xi:include href="wavemap/wavemap.rbuild" /> </directory> -<module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}" installbase="system32" installname="winmm.dll" allowwarnings="true" crt="msvcrt"> +<module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}" installbase="system32" installname="winmm.dll" crt="msvcrt"> <importlibrary definition="winmm.spec" /> <include base="winmm">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Sun Jan 18 11:58:35 2009 @@ -1043,7 +1043,7 @@ PVOID lpSectionBase; ULONG ulSectionTotalLength; HANDLE hActCtx; - HANDLE ulAssemblyRosterIndex; + ULONG ulAssemblyRosterIndex; } ACTCTX_SECTION_KEYED_DATA,*PACTCTX_SECTION_KEYED_DATA; typedef const ACTCTX_SECTION_KEYED_DATA *PCACTCTX_SECTION_KEYED_DATA; typedef struct _ACTIVATION_CONTEXT_BASIC_INFORMATION { Modified: trunk/reactos/include/reactos/idl/lsa.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/lsa.id… ============================================================================== --- trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] Sun Jan 18 11:58:35 2009 @@ -10,7 +10,10 @@ typedef LSAPR_HANDLE *PLSAPR_HANDLE; cpp_quote("#ifndef _WINNT_H") -typedef LARGE_INTEGER LUID, *PLUID; +typedef struct _LUID { + ULONG LowPart; + LONG HighPart; +} LUID, *PLUID; cpp_quote("#endif") cpp_quote("#ifndef _NTDEF_")

15 years, 8 months

[janderwald] 38903: - Fix debug prints - Fix initialization of IPortWavePci object - Fix IPortWavePci interface

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Jan 18 11:44:17 2009 New Revision: 38903 URL: http://svn.reactos.org/svn/reactos?rev=38903&view=rev Log: - Fix debug prints - Fix initialization of IPortWavePci object - Fix IPortWavePci interface Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] Sun Jan 18 11:44:17 2009 @@ -34,7 +34,7 @@ { IPortWavePciImpl * This = (IPortWavePciImpl*)CONTAINING_RECORD(iface, IPortWavePciImpl, lpVtblPortEvents); - DPRINT1("IServiceSink_fnQueryInterface entered\n"); + DPRINT1("IPortEvents_fnQueryInterface entered\n"); if (IsEqualGUIDAligned(refiid, &IID_IPortEvents) || IsEqualGUIDAligned(refiid, &IID_IUnknown)) @@ -53,7 +53,7 @@ IPortEvents* iface) { IPortWavePciImpl * This = (IPortWavePciImpl*)CONTAINING_RECORD(iface, IPortWavePciImpl, lpVtblPortEvents); - DPRINT1("IServiceSink_fnAddRef entered\n"); + DPRINT1("IPortEvents_fnAddRef entered\n"); return InterlockedIncrement(&This->ref); } @@ -64,7 +64,7 @@ IPortEvents* iface) { IPortWavePciImpl * This = (IPortWavePciImpl*)CONTAINING_RECORD(iface, IPortWavePciImpl, lpVtblPortEvents); - DPRINT1("IServiceSink_fnRelease entered\n"); + DPRINT1("IPortEvents_fnRelease entered\n"); InterlockedDecrement(&This->ref); if (This->ref == 0) @@ -215,7 +215,7 @@ } else if (IsEqualGUIDAligned(refiid, &IID_IServiceSink)) { - *Output = &This->lpVtbl; + *Output = &This->lpVtblServiceSink; InterlockedIncrement(&This->ref); return STATUS_SUCCESS; } @@ -305,39 +305,30 @@ NTSTATUS Status; IPortWavePciImpl * This = (IPortWavePciImpl*)iface; - DPRINT1("IPortWavePci::Init entered with This %p, DeviceObject %p Irp %p UnknownMiniport %p, UnknownAdapter %p ResourceList %p\n", + DPRINT1("IPortWavePci_fnInit entered with This %p, DeviceObject %p Irp %p UnknownMiniport %p, UnknownAdapter %p ResourceList %p\n", This, DeviceObject, Irp, UnknownMiniport, UnknownAdapter, ResourceList); if (This->bInitialized) { - DPRINT("IPortWaveCyclic_Init called again\n"); + DPRINT("IPortWavePci_fnInit called again\n"); return STATUS_SUCCESS; } Status = UnknownMiniport->lpVtbl->QueryInterface(UnknownMiniport, &IID_IMiniportWavePci, (PVOID*)&Miniport); if (!NT_SUCCESS(Status)) { - DPRINT("IPortWaveCyclic_Init called with invalid IMiniport adapter\n"); + DPRINT("IPortWavePci_fnInit called with invalid IMiniport adapter\n"); return STATUS_INVALID_PARAMETER; } /* initialize the dpc */ KeInitializeDpc(&This->Dpc, ServiceNotifyRoutine, (PVOID)This); - - Status = Miniport->lpVtbl->Init(Miniport, UnknownAdapter, ResourceList, iface, &ServiceGroup); - if (!NT_SUCCESS(Status)) - { - DPRINT("IMiniportWaveCyclic_Init failed with %x\n", Status); - return Status; - } - DPRINT1("IPortWaveCyclic_Init Miniport adapter initialized\n"); /* Initialize port object */ This->Miniport = Miniport; This->pDeviceObject = DeviceObject; This->bInitialized = TRUE; This->pResourceList = ResourceList; - This->ServiceGroup = ServiceGroup; /* increment reference on miniport adapter */ @@ -345,11 +336,27 @@ /* increment reference on resource list */ ResourceList->lpVtbl->AddRef(ResourceList); + Status = Miniport->lpVtbl->Init(Miniport, UnknownAdapter, ResourceList, iface, &ServiceGroup); + if (!NT_SUCCESS(Status)) + { + DPRINT("IPortWavePci_fnInit failed with %x\n", Status); + This->bInitialized = FALSE; + /* release reference on miniport adapter */ + Miniport->lpVtbl->Release(Miniport); + /* increment reference on resource list */ + ResourceList->lpVtbl->Release(ResourceList); + return Status; + } + + /* store service group */ + This->ServiceGroup = ServiceGroup; + /* add ourselves to service group which is called when miniport receives an isr */ ServiceGroup->lpVtbl->AddMember(ServiceGroup, (PSERVICESINK)&This->lpVtblServiceSink); /* increment reference on service group */ ServiceGroup->lpVtbl->AddRef(ServiceGroup); + DPRINT("IPortWaveCyclic_Init sucessfully initialized\n"); return STATUS_SUCCESS; @@ -431,7 +438,7 @@ DEVICE_DESCRIPTION DeviceDescription; IPortWavePciImpl * This = (IPortWavePciImpl*)iface; - DPRINT1("IPortWavePci_fnNewMasterDmaChannel entered\n"); + DPRINT1("IPortWavePci_fnNewMasterDmaChannel This %p entered\n", This); Status = PcDmaMasterDescription(ResourceList, ScatterGather, Dma32BitAddresses, IgnoreCount, Dma64BitAddresses, DmaWidth, DmaSpeed, MaximumLength, DmaPort, &DeviceDescription); if (NT_SUCCESS(Status)) @@ -451,12 +458,12 @@ IPortWavePciImpl * This = (IPortWavePciImpl*)iface; - DPRINT1("IPortWavePci_fnNotify entered %p, ServiceGroup %p\n", This, This->ServiceGroup); - - if (This->ServiceGroup) - { - This->ServiceGroup->lpVtbl->RequestService (This->ServiceGroup); - } + DPRINT1("IPortWavePci_fnNotify entered %p, ServiceGroup %p\n", This, ServiceGroup); + + //if (This->ServiceGroup) + //{ + // ServiceGroup->lpVtbl->RequestService (ServiceGroup); + //} // KeInsertQueueDpc(&This->Dpc, NULL, NULL); } @@ -472,8 +479,8 @@ IPortWavePci_fnGetDeviceProperty, IPortWavePci_fnNewRegistryKey, /* IPortWavePci methods */ + IPortWavePci_fnNotify, IPortWavePci_fnNewMasterDmaChannel, - IPortWavePci_fnNotify };

15 years, 8 months

← Newer
1
...
32
33
34
35
36
37
38
...
76
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 January 2009