Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

by gvg＠svn.reactos.com

Update status Modified: trunk/reactos/doc/README.WINE _____ Modified: trunk/reactos/doc/README.WINE --- trunk/reactos/doc/README.WINE 2005-05-06 19:37:42 UTC (rev 15058) +++ trunk/reactos/doc/README.WINE 2005-05-06 19:42:39 UTC (rev 15059) @@ -25,56 +25,56 @@ This will allow you to use the WINE tools and librarys with very little work to import a new dll. -The following build tools are derived from Wine. -reactos/tools/unicode # Synced to Wine-20050310 -reactos/tools/wpp # Synced to Wine-20050310 +The following build tools are shared with Wine. +reactos/tools/unicode # Synced to Wine-20050419 +reactos/tools/wpp # Synced to Wine-20050419 reactos/tools/bin2res # Resource to binary converter -reactos/tools/winebuild # Synced to Wine-20050310 +reactos/tools/winebuild # Synced to Wine-20050419 reactos/tools/wmc # Wine Message Compiler -reactos/tools/wrc # Synced to Wine-20050310 -reactos/tools/widl # Synced to Wine-20050310 +reactos/tools/wrc # Synced to Wine-20050419 +reactos/tools/widl # Synced to Wine-20050419 (merge back to winehq in progress) -The following shared libraries are a 100% port from Winehq sources. +The following libraries are shared with Wine. -reactos/lib/cabinet # Synced to Wine-20050310 -reactos/lib/comctl32 # Synced to Wine-20050310 -reactos/lib/comdlg32 # Synced to Wine-20050310 +reactos/lib/cabinet # Synced to Wine-20050419 +reactos/lib/comctl32 # Synced to Wine-20050419 +reactos/lib/comdlg32 # Synced to Wine-20050419 reactos/lib/dinput # Synced to Wine-20050310 -reactos/lib/dinput8 # Synced to Wine-20050310 -reactos/lib/icmp # Synced to Wine-20050310 +reactos/lib/dinput8 # Synced to Wine-20050419 +reactos/lib/icmp # Synced to Wine-20050419 reactos/lib/iphlpapi # Out of sync reactos/lib/imagehlp # Patches for BindImage need review and submission to winehq. reactos/lib/msvcrt20 # Out of sync -reactos/lib/mpr # Synced to Wine-20050310 +reactos/lib/mpr # Synced to Wine-20050419 reactos/lib/msacm # Out of sync -reactos/lib/msimg32 # Synced to Wine-20050310 -reactos/lib/msi # Synced to Wine-20050310 +reactos/lib/msimg32 # Synced to Wine-20050419 +reactos/lib/msi # Synced to Wine-20050419 reactos/lib/msvideo # Out of sync reactos/lib/netapi32 # Out of sync reactos/lib/odbc32 # In sync. Depends on port of Linux ODBC. -reactos/lib/ole32 # Synced to Wine-20050310 -reactos/lib/oleaut32 # Synced to Wine-20050310 -reactos/lib/oledlg # Synced to Wine-20050310 -reactos/lib/olepro32 # Synced to Wine-20050310 -reactos/lib/riched20 # Synced to Wine-20050310 -reactos/lib/richedit # Synced to Wine-20050310 -reactos/lib/rpcrt4 # Synced to Wine-20050310 -reactos/lib/setupapi # Synced to Wine-20050310 -reactos/lib/shell32 # Synced to Wine-20050310 -reactos/lib/shdocvw # Synced to Wine-20050310 -reactos/lib/shlwapi # Synced to Wine-20050310 +reactos/lib/ole32 # Synced to Wine-20050419 +reactos/lib/oleaut32 # Synced to Wine-20050419 +reactos/lib/oledlg # Synced to Wine-20050419 +reactos/lib/olepro32 # Synced to Wine-20050419 +reactos/lib/riched20 # Synced to Wine-20050419 +reactos/lib/richedit # Synced to Wine-20050419 +reactos/lib/rpcrt4 # Synced to Wine-20050419 +reactos/lib/setupapi # Synced to Wine-20050419 +reactos/lib/shell32 # Synced to Wine-20050419 +reactos/lib/shdocvw # Synced to Wine-20050419 +reactos/lib/shlwapi # Synced to Wine-20050419 reactos/lib/twain # Out of sync -reactos/lib/urlmon # Synced to Wine-20050310 +reactos/lib/urlmon # Synced to Wine-20050419 reactos/lib/version # Out of sync reactos/lib/wininet # Out of sync -reactos/lib/winmm # Synced to Wine-20050310 -reactos/lib/winmm/midimap # Synced to Wine-20050310 -reactos/lib/winmm/wavemap # Synced to Wine-20050310 +reactos/lib/winmm # Synced to Wine-20050419 +reactos/lib/winmm/midimap # Synced to Wine-20050419 +reactos/lib/winmm/wavemap # Synced to Wine-20050419 ReactOS shares the following programs with Winehq. reactos/subsys/system/regedit # Out of sync reactos/subsys/system/expand # Out of sync -reactos/subsys/system/msiexec # Synced to Wine-20050311 +reactos/subsys/system/msiexec # Synced to Wine-20050419 In addition the following libs, dlls and source files are mostly based on code ported from Winehq CVS. If you are looking to update something in these files

19 years, 4 months

[gvg] 15058: Tag new vendor drop, remove old tag

by gvg＠svn.reactos.com

Tag new vendor drop, remove old tag Deleted: vendor/wine/dlls/cabinet/Wine-20050310/ Added: vendor/wine/dlls/cabinet/Wine-20050419/ Deleted: vendor/wine/dlls/comctl32/Wine-20050310/ Added: vendor/wine/dlls/comctl32/Wine-20050419/ Deleted: vendor/wine/dlls/commdlg/Wine-20050310/ Added: vendor/wine/dlls/commdlg/Wine-20050419/ Added: vendor/wine/dlls/dinput/Wine-20050419/ Deleted: vendor/wine/dlls/dinput8/Wine-20050310/ Added: vendor/wine/dlls/dinput8/Wine-20050419/ Deleted: vendor/wine/dlls/dsound/Wine-20050310/ Added: vendor/wine/dlls/dsound/Wine-20050419/ Deleted: vendor/wine/dlls/icmp/Wine-20050310/ Added: vendor/wine/dlls/icmp/Wine-20050419/ Deleted: vendor/wine/dlls/mpr/Wine-20050310/ Added: vendor/wine/dlls/mpr/Wine-20050419/ Deleted: vendor/wine/dlls/msi/Wine-20050310/ Added: vendor/wine/dlls/msi/Wine-20050419/ Deleted: vendor/wine/dlls/msimg32/Wine-20050310/ Added: vendor/wine/dlls/msimg32/Wine-20050419/ Deleted: vendor/wine/dlls/ole32/Wine-20050310/ Added: vendor/wine/dlls/ole32/Wine-20050419/ Deleted: vendor/wine/dlls/oleaut32/Wine-20050310/ Added: vendor/wine/dlls/oleaut32/Wine-20050419/ Deleted: vendor/wine/dlls/oledlg/Wine-20050310/ Added: vendor/wine/dlls/oledlg/Wine-20050419/ Deleted: vendor/wine/dlls/olepro32/Wine-20050310/ Added: vendor/wine/dlls/olepro32/Wine-20050419/ Deleted: vendor/wine/dlls/riched20/Wine-20050310/ Added: vendor/wine/dlls/riched20/Wine-20050419/ Deleted: vendor/wine/dlls/richedit/Wine-20050310/ Added: vendor/wine/dlls/richedit/Wine-20050419/ Deleted: vendor/wine/dlls/rpcrt4/Wine-20050310/ Added: vendor/wine/dlls/rpcrt4/Wine-20050419/ Deleted: vendor/wine/dlls/setupapi/Wine-20050310/ Added: vendor/wine/dlls/setupapi/Wine-20050419/ Deleted: vendor/wine/dlls/shdocvw/Wine-20050310/ Added: vendor/wine/dlls/shdocvw/Wine-20050419/ Deleted: vendor/wine/dlls/shell32/Wine-20050310/ Added: vendor/wine/dlls/shell32/Wine-20050419/ Deleted: vendor/wine/dlls/shlwapi/Wine-20050310/ Added: vendor/wine/dlls/shlwapi/Wine-20050419/ Deleted: vendor/wine/dlls/urlmon/Wine-20050310/ Added: vendor/wine/dlls/urlmon/Wine-20050419/ Deleted: vendor/wine/dlls/winmm/Wine-20050310/ Added: vendor/wine/dlls/winmm/Wine-20050419/ Deleted: vendor/wine/libs/unicode/Wine-20050310/ Added: vendor/wine/libs/unicode/Wine-20050419/ Deleted: vendor/wine/libs/wpp/Wine-20050310/ Added: vendor/wine/libs/wpp/Wine-20050419/ Deleted: vendor/wine/programs/msiexec/Wine-20050310/ Added: vendor/wine/programs/msiexec/Wine-20050419/ Deleted: vendor/wine/tools/widl/Wine-20050310/ Added: vendor/wine/tools/widl/Wine-20050419/ Deleted: vendor/wine/tools/winebuild/Wine-20050310/ Added: vendor/wine/tools/winebuild/Wine-20050419/ Deleted: vendor/wine/tools/wrc/Wine-20050310/ Added: vendor/wine/tools/wrc/Wine-20050419/ _____ Copied: vendor/wine/dlls/cabinet/Wine-20050419 (from rev 15057, vendor/wine/dlls/cabinet/current) _____ Copied: vendor/wine/dlls/comctl32/Wine-20050419 (from rev 15057, vendor/wine/dlls/comctl32/current) _____ Copied: vendor/wine/dlls/commdlg/Wine-20050419 (from rev 15057, vendor/wine/dlls/commdlg/current) _____ Copied: vendor/wine/dlls/dinput/Wine-20050419 (from rev 15057, vendor/wine/dlls/dinput/current) _____ Copied: vendor/wine/dlls/dinput8/Wine-20050419 (from rev 15057, vendor/wine/dlls/dinput8/current) _____ Copied: vendor/wine/dlls/dsound/Wine-20050419 (from rev 15057, vendor/wine/dlls/dsound/current) _____ Copied: vendor/wine/dlls/icmp/Wine-20050419 (from rev 15057, vendor/wine/dlls/icmp/current) _____ Copied: vendor/wine/dlls/mpr/Wine-20050419 (from rev 15057, vendor/wine/dlls/mpr/current) _____ Copied: vendor/wine/dlls/msi/Wine-20050419 (from rev 15057, vendor/wine/dlls/msi/current) _____ Copied: vendor/wine/dlls/msimg32/Wine-20050419 (from rev 15057, vendor/wine/dlls/msimg32/current) _____ Copied: vendor/wine/dlls/ole32/Wine-20050419 (from rev 15057, vendor/wine/dlls/ole32/current) _____ Copied: vendor/wine/dlls/oleaut32/Wine-20050419 (from rev 15057, vendor/wine/dlls/oleaut32/current) _____ Copied: vendor/wine/dlls/oledlg/Wine-20050419 (from rev 15057, vendor/wine/dlls/oledlg/current) _____ Copied: vendor/wine/dlls/olepro32/Wine-20050419 (from rev 15057, vendor/wine/dlls/olepro32/current) _____ Copied: vendor/wine/dlls/riched20/Wine-20050419 (from rev 15057, vendor/wine/dlls/riched20/current) _____ Copied: vendor/wine/dlls/richedit/Wine-20050419 (from rev 15057, vendor/wine/dlls/richedit/current) _____ Copied: vendor/wine/dlls/rpcrt4/Wine-20050419 (from rev 15057, vendor/wine/dlls/rpcrt4/current) _____ Copied: vendor/wine/dlls/setupapi/Wine-20050419 (from rev 15057, vendor/wine/dlls/setupapi/current) _____ Copied: vendor/wine/dlls/shdocvw/Wine-20050419 (from rev 15057, vendor/wine/dlls/shdocvw/current) _____ Copied: vendor/wine/dlls/shell32/Wine-20050419 (from rev 15057, vendor/wine/dlls/shell32/current) _____ Copied: vendor/wine/dlls/shlwapi/Wine-20050419 (from rev 15057, vendor/wine/dlls/shlwapi/current) _____ Copied: vendor/wine/dlls/urlmon/Wine-20050419 (from rev 15057, vendor/wine/dlls/urlmon/current) _____ Copied: vendor/wine/dlls/winmm/Wine-20050419 (from rev 15057, vendor/wine/dlls/winmm/current) _____ Copied: vendor/wine/libs/unicode/Wine-20050419 (from rev 15057, vendor/wine/libs/unicode/current) _____ Copied: vendor/wine/libs/wpp/Wine-20050419 (from rev 15057, vendor/wine/libs/wpp/current) _____ Copied: vendor/wine/programs/msiexec/Wine-20050419 (from rev 15057, vendor/wine/programs/msiexec/current) _____ Copied: vendor/wine/tools/widl/Wine-20050419 (from rev 15057, vendor/wine/tools/widl/current) _____ Copied: vendor/wine/tools/winebuild/Wine-20050419 (from rev 15057, vendor/wine/tools/winebuild/current) _____ Copied: vendor/wine/tools/wrc/Wine-20050419 (from rev 15057, vendor/wine/tools/wrc/current)

19 years, 4 months

[gvg] 15057: Sync to Wine-20050419:

by gvg＠svn.reactos.com

Sync to Wine-20050419: Peter Berg Larsen <pebl(a)math.ku.dk> - Janitorial: Get rid of strncpy/strncpyW. Modified: trunk/reactos/subsys/system/msiexec/msiexec.c _____ Modified: trunk/reactos/subsys/system/msiexec/msiexec.c --- trunk/reactos/subsys/system/msiexec/msiexec.c 2005-05-06 19:16:10 UTC (rev 15056) +++ trunk/reactos/subsys/system/msiexec/msiexec.c 2005-05-06 19:18:46 UTC (rev 15057) @@ -145,7 +145,7 @@ continue; len = value - list->str; *p++ = ' '; - strncpyW(p, list->str, len); + memcpy(p, list->str, len * sizeof(WCHAR)); p += len; *p++ = '='; @@ -155,7 +155,7 @@ if(needs_quote) *p++ = '"'; len = lstrlenW(value); - strncpyW(p, value, len); + memcpy(p, value, len * sizeof(WCHAR)); p += len; if(needs_quote) *p++ = '"';

19 years, 4 months

[gvg] 15056: Sync to Wine-20050419:

by gvg＠svn.reactos.com

Sync to Wine-20050419: Robert Reif <reif(a)earthlink.net> - Stub out DRVM_MAPPER_RECONFIGURE support. - Correctly handle where waveOutGetPosition changes timepos.wType because the requested type is not supported. - Added Jeremy White's waveOutGetPosition fix to waveInGetPosition. - Fix memory leak in error path. - Provide default implementation of waveInPrepareHeader and waveInUnprepareHeader if driver doesn't support them. Jose Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> - Spanish translations updated. Peter Berg Larsen <pebl(a)math.ku.dk> - Assorted memleak fixes. Found on Michael Stefaniuc smatch list. Jeremy White <jwhite(a)codeweavers.com> - Do not fallback to defaults if a driver, mapper, or midi is specified in the registry; consolidate MMDRV_Init() into a single function. Robert Reif <reif(a)earthlink.net> - Fix memory leak when there are too many drivers. Vincent Beron <vberon(a)mecano.gme.usherb.ca> - Correct and complete some api documentation. Filip Navara <xnavara(a)volny.cz> - Specify correct buffer size in GetPrivateProfileStringW calls. Jakob Eriksson <jakov(a)vmlinux.org> - Get rid of HeapAlloc casts. Jason Edmeades <us(a)the-edmeades.demon.co.uk> - Avoid trap in mixerGetLineControlsA when cControls is uninitialized and MIXER_GETLINECONTROLSSF_ONEBYTYPE requested. Modified: trunk/reactos/lib/winmm/driver.c Modified: trunk/reactos/lib/winmm/lolvldrv.c Modified: trunk/reactos/lib/winmm/mci.c Modified: trunk/reactos/lib/winmm/mmio.c Modified: trunk/reactos/lib/winmm/mmsystem.c Modified: trunk/reactos/lib/winmm/time.c Modified: trunk/reactos/lib/winmm/wavemap/wavemap.c Modified: trunk/reactos/lib/winmm/winemm.h Modified: trunk/reactos/lib/winmm/winmm.c Modified: trunk/reactos/lib/winmm/winmm_Es.rc _____ Modified: trunk/reactos/lib/winmm/driver.c --- trunk/reactos/lib/winmm/driver.c 2005-05-06 19:11:20 UTC (rev 15055) +++ trunk/reactos/lib/winmm/driver.c 2005-05-06 19:16:10 UTC (rev 15056) @@ -308,13 +308,13 @@ INT len; LPWSTR dn = NULL; LPWSTR sn = NULL; - HDRVR ret; + HDRVR ret = 0; if (lpDriverName) { len = MultiByteToWideChar( CP_ACP, 0, lpDriverName, -1, NULL, 0 ); dn = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - if (!dn) return 0; + if (!dn) goto done; MultiByteToWideChar( CP_ACP, 0, lpDriverName, -1, dn, len ); } @@ -322,14 +322,15 @@ { len = MultiByteToWideChar( CP_ACP, 0, lpSectionName, -1, NULL, 0 ); sn = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - if (!sn) return 0; + if (!sn) goto done; MultiByteToWideChar( CP_ACP, 0, lpSectionName, -1, sn, len ); } ret = OpenDriver(dn, sn, lParam); - if (dn) HeapFree(GetProcessHeap(), 0, dn); - if (sn) HeapFree(GetProcessHeap(), 0, sn); +done: + HeapFree(GetProcessHeap(), 0, dn); + HeapFree(GetProcessHeap(), 0, sn); return ret; } _____ Modified: trunk/reactos/lib/winmm/lolvldrv.c --- trunk/reactos/lib/winmm/lolvldrv.c 2005-05-06 19:11:20 UTC (rev 15055) +++ trunk/reactos/lib/winmm/lolvldrv.c 2005-05-06 19:16:10 UTC (rev 15056) @@ -309,6 +309,7 @@ if (i == MAX_MM_MLDRVS) { /* the MM_MLDrvs table could be made growable in the future if needed */ ERR("Too many open drivers\n"); + HeapFree(GetProcessHeap(), 0, mld); return NULL; } MM_MLDrvs[i] = mld; @@ -714,80 +715,62 @@ } /*********************************************************************** *** - * MMDRV_InitFromRegistry [internal] + * MMDRV_Init */ -static BOOL MMDRV_InitFromRegistry(void) +BOOL MMDRV_Init(void) { HKEY hKey; - char buffer[256]; + char driver_buffer[256]; + char mapper_buffer[256]; + char midi_buffer[256]; char* p1; char* p2; DWORD type, size; BOOL ret = FALSE; TRACE("()\n"); - if (RegCreateKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\WinMM", &hKey)) { - TRACE("Cannot open WinMM config key\n"); - return FALSE; - } + strcpy(driver_buffer, WINE_DEFAULT_WINMM_DRIVER); + strcpy(mapper_buffer, WINE_DEFAULT_WINMM_MAPPER); + strcpy(midi_buffer, WINE_DEFAULT_WINMM_MIDI); - size = sizeof(buffer); - if (!RegQueryValueExA(hKey, "Drivers", 0, &type, (LPVOID)buffer, &size)) { - p1 = buffer; - while (p1) { - p2 = strchr(p1, ';'); - if (p2) *p2++ = '\0'; - ret |= MMDRV_Install(p1, p1, FALSE); - p1 = p2; - } - } + if (! RegCreateKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\WinMM", &hKey)) { + size = sizeof(driver_buffer); + if (RegQueryValueExA(hKey, "Drivers", 0, &type, (LPVOID)driver_buffer, &size)) + strcpy(driver_buffer, WINE_DEFAULT_WINMM_DRIVER); - /* finish with mappers */ - size = sizeof(buffer); - if (!RegQueryValueExA(hKey, "WaveMapper", 0, &type, (LPVOID)buffer, &size)) - ret |= MMDRV_Install("wavemapper", buffer, TRUE); - size = sizeof(buffer); - if (!RegQueryValueExA(hKey, "MidiMapper", 0, &type, (LPVOID)buffer, &size)) - ret |= MMDRV_Install("midimapper", buffer, TRUE); + /* finish with mappers */ + size = sizeof(mapper_buffer); + if (RegQueryValueExA(hKey, "WaveMapper", 0, &type, (LPVOID)mapper_buffer, &size)) + strcpy(mapper_buffer, WINE_DEFAULT_WINMM_MAPPER); - RegCloseKey(hKey); + size = sizeof(midi_buffer); + if (RegQueryValueExA(hKey, "MidiMapper", 0, &type, (LPVOID)midi_buffer, &size)) + strcpy(midi_buffer, WINE_DEFAULT_WINMM_MIDI); - return ret; -} + RegCloseKey(hKey); + } -/********************************************************************** **** - * MMDRV_InitHardcoded [internal] - */ -static BOOL MMDRV_InitHardcoded(void) -{ - TRACE("()\n"); - /* first load hardware drivers */ #ifndef __REACTOS__ - MMDRV_Install("wineoss.drv", "wineoss.drv", FALSE); -#endif /* __REACTOS__ */ + p1 = driver_buffer; + while (p1) { + p2 = strchr(p1, ';'); + if (p2) *p2++ = '\0'; + ret |= MMDRV_Install(p1, p1, FALSE); + p1 = p2; + } +#endif #ifdef __REACTOS__ // AG: TESTING: - MMDRV_Install("mmdrv.dll", "mmdrv.dll", FALSE); + ret |= MMDRV_Install("mmdrv.dll", "mmdrv.dll", FALSE); #endif - /* finish with mappers */ - MMDRV_Install("wavemapper", "msacm32.dll", TRUE); - MMDRV_Install("midimapper", "midimap.dll", TRUE); + ret |= MMDRV_Install("wavemapper", mapper_buffer, TRUE); + ret |= MMDRV_Install("midimapper", midi_buffer, TRUE); + return ret; - return TRUE; } -/********************************************************************** **** - * MMDRV_Init [internal] - */ -BOOL MMDRV_Init(void) -{ - TRACE("()\n"); - /* FIXME: MMDRV_InitFromRegistry shall be MMDRV_Init in a near future */ - return MMDRV_InitFromRegistry() || MMDRV_InitHardcoded(); -} - /****************************************************************** * ExitPerType * _____ Modified: trunk/reactos/lib/winmm/mci.c --- trunk/reactos/lib/winmm/mci.c 2005-05-06 19:11:20 UTC (rev 15055) +++ trunk/reactos/lib/winmm/mci.c 2005-05-06 19:16:10 UTC (rev 15056) @@ -1458,7 +1458,11 @@ if (lpstrRet) { lpwstrRet = HeapAlloc(GetProcessHeap(), 0, uRetLen * sizeof(WCHAR)); - if (!lpwstrRet) return MCIERR_OUT_OF_MEMORY; + if (!lpwstrRet) { + WARN("no memory\n"); + HeapFree( GetProcessHeap(), 0, lpwstrCommand ); + return MCIERR_OUT_OF_MEMORY; + } } ret = mciSendStringW(lpwstrCommand, lpwstrRet, uRetLen, hwndCallback); if (lpwstrRet) _____ Modified: trunk/reactos/lib/winmm/mmio.c --- trunk/reactos/lib/winmm/mmio.c 2005-05-06 19:11:20 UTC (rev 15055) +++ trunk/reactos/lib/winmm/mmio.c 2005-05-06 19:16:10 UTC (rev 15056) @@ -1360,26 +1360,27 @@ { LPSTR szFn = NULL; LPSTR sznFn = NULL; - UINT ret; + UINT ret = MMSYSERR_NOMEM; INT len; if (szFileName) { len = WideCharToMultiByte( CP_ACP, 0, szFileName, -1, NULL, 0, NULL, NULL ); szFn = HeapAlloc( GetProcessHeap(), 0, len ); - if (!szFn) return MMSYSERR_NOMEM; + if (!szFn) goto done; WideCharToMultiByte( CP_ACP, 0, szFileName, -1, szFn, len, NULL, NULL ); } if (szNewFileName) { len = WideCharToMultiByte( CP_ACP, 0, szNewFileName, -1, NULL, 0, NULL, NULL ); sznFn = HeapAlloc( GetProcessHeap(), 0, len ); - if (!sznFn) return MMSYSERR_NOMEM; + if (!sznFn) goto done; WideCharToMultiByte( CP_ACP, 0, szNewFileName, -1, sznFn, len, NULL, NULL ); } ret = mmioRenameA(szFn, sznFn, lpmmioinfo, dwFlags); +done: HeapFree(GetProcessHeap(),0,szFn); HeapFree(GetProcessHeap(),0,sznFn); return ret; _____ Modified: trunk/reactos/lib/winmm/mmsystem.c --- trunk/reactos/lib/winmm/mmsystem.c 2005-05-06 19:11:20 UTC (rev 15055) +++ trunk/reactos/lib/winmm/mmsystem.c 2005-05-06 19:16:10 UTC (rev 15056) @@ -731,7 +731,7 @@ /*********************************************************************** *** * midiOutGetErrorText [MMSYSTEM.203] - * midiInGetErrorText [MMSYSTEM.203] + * midiInGetErrorText [MMSYSTEM.303] */ UINT16 WINAPI midiOutGetErrorText16(UINT16 uError, LPSTR lpText, UINT16 uSize) { @@ -1231,7 +1231,7 @@ /*********************************************************************** *** * waveOutGetErrorText [MMSYSTEM.403] - * waveInGetErrorText [MMSYSTEM.403] + * waveInGetErrorText [MMSYSTEM.503] */ UINT16 WINAPI waveOutGetErrorText16(UINT16 uError, LPSTR lpText, UINT16 uSize) { @@ -2260,7 +2260,7 @@ LPDRVCONFIGINFO dci32 = (LPDRVCONFIGINFO)(*lParam2); if (dci16) { - LPSTR str1; + LPSTR str1 = NULL,str2; INT len; dci16->dwDCISize = sizeof(DRVCONFIGINFO16); @@ -2271,6 +2271,7 @@ WideCharToMultiByte( CP_ACP, 0, dci32->lpszDCISectionName, -1, str1, len, NULL, NULL ); dci16->lpszDCISectionName = MapLS( str1 ); } else { + HeapFree( GetProcessHeap(), 0, dci16); return WINMM_MAP_NOMEM; } } else { @@ -2278,11 +2279,13 @@ } if (dci32->lpszDCIAliasName) { len = WideCharToMultiByte( CP_ACP, 0, dci32->lpszDCIAliasName, -1, NULL, 0, NULL, NULL ); - str1 = HeapAlloc( GetProcessHeap(), 0, len ); - if (str1) { - WideCharToMultiByte( CP_ACP, 0, dci32->lpszDCIAliasName, -1, str1, len, NULL, NULL ); - dci16->lpszDCIAliasName = MapLS( str1 ); + str2 = HeapAlloc( GetProcessHeap(), 0, len ); + if (str2) { + WideCharToMultiByte( CP_ACP, 0, dci32->lpszDCIAliasName, -1, str2, len, NULL, NULL ); + dci16->lpszDCIAliasName = MapLS( str2 ); } else { + HeapFree( GetProcessHeap(), 0, str1); + HeapFree( GetProcessHeap(), 0, dci16); return WINMM_MAP_NOMEM; } } else { _____ Modified: trunk/reactos/lib/winmm/time.c --- trunk/reactos/lib/winmm/time.c 2005-05-06 19:11:20 UTC (rev 15055) +++ trunk/reactos/lib/winmm/time.c 2005-05-06 19:16:10 UTC (rev 15056) @@ -315,11 +315,11 @@ TRACE("(%u, %u, %p, %08lX, %04X);\n", wDelay, wResol, lpFunc, dwUser, wFlags); - lpNewTimer = (LPWINE_TIMERENTRY)HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_TIMERENTRY)); - if (lpNewTimer == NULL) + if (wDelay < MMSYSTIME_MININTERVAL || wDelay > MMSYSTIME_MAXINTERVAL) return 0; - if (wDelay < MMSYSTIME_MININTERVAL || wDelay > MMSYSTIME_MAXINTERVAL) + lpNewTimer = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_TIMERENTRY)); + if (lpNewTimer == NULL) return 0; TIME_MMTimeStart(); _____ Modified: trunk/reactos/lib/winmm/wavemap/wavemap.c --- trunk/reactos/lib/winmm/wavemap/wavemap.c 2005-05-06 19:11:20 UTC (rev 15055) +++ trunk/reactos/lib/winmm/wavemap/wavemap.c 2005-05-06 19:16:10 UTC (rev 15056) @@ -166,6 +166,7 @@ if (dwFlags & WAVE_MAPPED) { if (lpDesc->uMappedDeviceID >= ndhi) { WARN("invalid parameter: dwFlags WAVE_MAPPED\n"); + HeapFree(GetProcessHeap(), 0, wom); return MMSYSERR_INVALPARAM; } ndlo = lpDesc->uMappedDeviceID; @@ -427,9 +428,10 @@ if (lpTime->wType == TIME_MS) timepos.wType = TIME_BYTES; + /* This can change timepos.wType if the requested type is not supported */ val = waveOutGetPosition(wom->u.out.hInnerWave, &timepos, dwParam2); - if (lpTime->wType == TIME_BYTES || lpTime->wType == TIME_MS) + if (timepos.wType == TIME_BYTES) { DWORD dwInnerSamplesPerOuter = wom->nSamplesPerSecInner / wom->nSamplesPerSecOuter; if (dwInnerSamplesPerOuter > 0) @@ -463,10 +465,12 @@ /* Once we have the TIME_BYTES right, we can easily convert to TIME_MS */ if (lpTime->wType == TIME_MS) - lpTime->u.cb = MulDiv(lpTime->u.cb, 1000, wom->avgSpeedOuter); + lpTime->u.ms = MulDiv(lpTime->u.cb, 1000, wom->avgSpeedOuter); + else + lpTime->wType = TIME_BYTES; } - else if (lpTime->wType == TIME_SAMPLES) - lpTime->u.cb = MulDiv(timepos.u.cb, wom->nSamplesPerSecOuter, wom->nSamplesPerSecInner); + else if (lpTime->wType == TIME_SAMPLES && timepos.wType == TIME_SAMPLES) + lpTime->u.sample = MulDiv(timepos.u.sample, wom->nSamplesPerSecOuter, wom->nSamplesPerSecInner); else /* other time types don't require conversion */ lpTime->u = timepos.u; @@ -586,6 +590,13 @@ return ret; } +static DWORD wodMapperReconfigure(WAVEMAPDATA* wom, DWORD dwParam1, DWORD dwParam2) +{ + FIXME("(%p %08lx %08lx) stub!\n", wom, dwParam1, dwParam2); + + return MMSYSERR_NOERROR; +} + /*********************************************************************** *** * wodMessage (MSACM.@) */ @@ -621,6 +632,7 @@ case WODM_RESTART: return wodRestart ((WAVEMAPDATA*)dwUser); case WODM_RESET: return wodReset ((WAVEMAPDATA*)dwUser); case WODM_MAPPER_STATUS: return wodMapperStatus ((WAVEMAPDATA*)dwUser, dwParam1, (LPVOID)dwParam2); + case DRVM_MAPPER_RECONFIGURE: return wodMapperReconfigure((WAVEMAPDATA*)dwUser, dwParam1, dwParam2); /* known but not supported */ case DRV_QUERYDEVICEINTERFACESIZE: case DRV_QUERYDEVICEINTERFACE: @@ -961,15 +973,62 @@ static DWORD widGetPosition(WAVEMAPDATA* wim, LPMMTIME lpTime, DWORD dwParam2) { DWORD val; - + MMTIME timepos; TRACE("(%p %p %08lx)\n", wim, lpTime, dwParam2); - val = waveInGetPosition(wim->u.in.hInnerWave, lpTime, dwParam2); - if (lpTime->wType == TIME_BYTES) - lpTime->u.cb = MulDiv(lpTime->u.cb, wim->avgSpeedOuter, wim->avgSpeedInner); - if (lpTime->wType == TIME_SAMPLES) - lpTime->u.cb = MulDiv(lpTime->u.cb, wim->nSamplesPerSecOuter, wim->nSamplesPerSecInner); - /* other time types don't require conversion */ + memcpy(&timepos, lpTime, sizeof(timepos)); + + /* For TIME_MS, we're going to recalculate using TIME_BYTES */ + if (lpTime->wType == TIME_MS) + timepos.wType = TIME_BYTES; + + /* This can change timepos.wType if the requested type is not supported */ + val = waveInGetPosition(wim->u.in.hInnerWave, &timepos, dwParam2); + + if (timepos.wType == TIME_BYTES) + { + DWORD dwInnerSamplesPerOuter = wim->nSamplesPerSecInner / wim->nSamplesPerSecOuter; + if (dwInnerSamplesPerOuter > 0) + { + DWORD dwInnerBytesPerSample = wim->avgSpeedInner / wim->nSamplesPerSecInner; + DWORD dwInnerBytesPerOuterSample = dwInnerBytesPerSample * dwInnerSamplesPerOuter; + DWORD remainder = 0; + + /* If we are up sampling (going from lower sample rate to higher), + ** we need to make a special accomodation for times when we've + ** written a partial output sample. This happens frequently + ** to us because we use msacm to do our up sampling, and it + ** will up sample on an unaligned basis. + ** For example, if you convert a 2 byte wide 8,000 'outer' + ** buffer to a 2 byte wide 48,000 inner device, you would + ** expect 2 bytes of input to produce 12 bytes of output. + ** Instead, msacm will produce 8 bytes of output. + ** But reporting our position as 1 byte of output is + ** nonsensical; the output buffer position needs to be + ** aligned on outer sample size, and aggressively rounded up. + */ + remainder = timepos.u.cb % dwInnerBytesPerOuterSample; + if (remainder > 0) + { + timepos.u.cb -= remainder; + timepos.u.cb += dwInnerBytesPerOuterSample; + } + } + + lpTime->u.cb = MulDiv(timepos.u.cb, wim->avgSpeedOuter, wim->avgSpeedInner); + + /* Once we have the TIME_BYTES right, we can easily convert to TIME_MS */ + if (lpTime->wType == TIME_MS) + lpTime->u.ms = MulDiv(lpTime->u.cb, 1000, wim->avgSpeedOuter); + else + lpTime->wType = TIME_BYTES; + } + else if (lpTime->wType == TIME_SAMPLES && timepos.wType == TIME_SAMPLES) + lpTime->u.sample = MulDiv(timepos.u.sample, wim->nSamplesPerSecOuter, wim->nSamplesPerSecInner); + else + /* other time types don't require conversion */ + lpTime->u = timepos.u; + return val; } @@ -1058,6 +1117,13 @@ return ret; } +static DWORD widMapperReconfigure(WAVEMAPDATA* wim, DWORD dwParam1, DWORD dwParam2) +{ + FIXME("(%p %08lx %08lx) stub!\n", wim, dwParam1, dwParam2); + + return MMSYSERR_NOERROR; +} + /*********************************************************************** *** * widMessage (MSACM.@) */ @@ -1088,6 +1154,7 @@ case WIDM_START: return widStart ((WAVEMAPDATA*)dwUser); case WIDM_STOP: return widStop ((WAVEMAPDATA*)dwUser); case WIDM_MAPPER_STATUS: return widMapperStatus ((WAVEMAPDATA*)dwUser, dwParam1, (LPVOID)dwParam2); + case DRVM_MAPPER_RECONFIGURE: return widMapperReconfigure((WAVEMAPDATA*)dwUser, dwParam1, dwParam2); /* known but not supported */ case DRV_QUERYDEVICEINTERFACESIZE: case DRV_QUERYDEVICEINTERFACE: _____ Modified: trunk/reactos/lib/winmm/winemm.h --- trunk/reactos/lib/winmm/winemm.h 2005-05-06 19:11:20 UTC (rev 15055) +++ trunk/reactos/lib/winmm/winemm.h 2005-05-06 19:16:10 UTC (rev 15056) @@ -28,6 +28,10 @@ #include "winbase.h" #include "mmddk.h" +#define WINE_DEFAULT_WINMM_DRIVER "wineoss.drv" +#define WINE_DEFAULT_WINMM_MAPPER "msacm.drv" +#define WINE_DEFAULT_WINMM_MIDI "midimap.drv" + typedef DWORD (WINAPI *MessageProc16)(UINT16 wDevID, UINT16 wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2); typedef DWORD (WINAPI *MessageProc32)(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2); _____ Modified: trunk/reactos/lib/winmm/winmm.c --- trunk/reactos/lib/winmm/winmm.c 2005-05-06 19:11:20 UTC (rev 15055) +++ trunk/reactos/lib/winmm/winmm.c 2005-05-06 19:16:10 UTC (rev 15056) @@ -441,7 +441,7 @@ if (lpmcdA->u.cMultipleItems != 0) { size *= lpmcdA->u.cMultipleItems; } - pDetailsW = (MIXERCONTROLDETAILS_LISTTEXTW *)HeapAlloc(GetProcessHeap(), 0, size); + pDetailsW = HeapAlloc(GetProcessHeap(), 0, size); lpmcdA->paDetails = pDetailsW; lpmcdA->cbDetails = sizeof(MIXERCONTROLDETAILS_LISTTEXTW); /* set up lpmcd->paDetails */ @@ -492,7 +492,15 @@ mlcW.dwLineID = lpmlcA->dwLineID; mlcW.u.dwControlID = lpmlcA->u.dwControlID; mlcW.u.dwControlType = lpmlcA->u.dwControlType; - mlcW.cControls = lpmlcA->cControls; + + /* Debugging on Windows shows for MIXER_GETLINECONTROLSF_ONEBYTYPE only, + the control count is assumed to be 1 - This is relied upon by a game, + "Dynomite Deluze" */ + if (MIXER_GETLINECONTROLSF_ONEBYTYPE == fdwControls) { + mlcW.cControls = 1; + } else { + mlcW.cControls = lpmlcA->cControls; + } mlcW.cbmxctrl = sizeof(MIXERCONTROLW); mlcW.pamxctrl = HeapAlloc(GetProcessHeap(), 0, mlcW.cControls * mlcW.cbmxctrl); @@ -2580,6 +2588,7 @@ UINT uSize) { LPWINE_MLD wmld; + UINT result; TRACE("(%p, %p, %u);\n", hWaveIn, lpWaveInHdr, uSize); @@ -2589,9 +2598,18 @@ if ((wmld = MMDRV_Get(hWaveIn, MMDRV_WAVEIN, FALSE)) == NULL) return MMSYSERR_INVALHANDLE; + if ((result = MMDRV_Message(wmld, WIDM_PREPARE, (DWORD_PTR)lpWaveInHdr, + uSize, TRUE)) != MMSYSERR_NOTSUPPORTED) + return result; + + if (lpWaveInHdr->dwFlags & WHDR_INQUEUE) + return WAVERR_STILLPLAYING; + + lpWaveInHdr->dwFlags |= WHDR_PREPARED; + lpWaveInHdr->dwFlags &= ~WHDR_DONE; lpWaveInHdr->dwBytesRecorded = 0; - return MMDRV_Message(wmld, WIDM_PREPARE, (DWORD_PTR)lpWaveInHdr, uSize, TRUE); + return MMSYSERR_NOERROR; } /*********************************************************************** *** @@ -2601,20 +2619,30 @@ UINT uSize) { LPWINE_MLD wmld; + UINT result; TRACE("(%p, %p, %u);\n", hWaveIn, lpWaveInHdr, uSize); if (lpWaveInHdr == NULL || uSize < sizeof (WAVEHDR)) return MMSYSERR_INVALPARAM; - if (!(lpWaveInHdr->dwFlags & WHDR_PREPARED)) { + if (!(lpWaveInHdr->dwFlags & WHDR_PREPARED)) return MMSYSERR_NOERROR; - } if ((wmld = MMDRV_Get(hWaveIn, MMDRV_WAVEIN, FALSE)) == NULL) return MMSYSERR_INVALHANDLE; - return MMDRV_Message(wmld, WIDM_UNPREPARE, (DWORD_PTR)lpWaveInHdr, uSize, TRUE); + if ((result = MMDRV_Message(wmld, WIDM_UNPREPARE, (DWORD_PTR)lpWaveInHdr, + uSize, TRUE)) != MMSYSERR_NOTSUPPORTED) + return result; + + if (lpWaveInHdr->dwFlags & WHDR_INQUEUE) + return WAVERR_STILLPLAYING; + + lpWaveInHdr->dwFlags &= ~WHDR_PREPARED; + lpWaveInHdr->dwFlags |= WHDR_DONE; + + return MMSYSERR_NOERROR; } /*********************************************************************** *** _____ Modified: trunk/reactos/lib/winmm/winmm_Es.rc --- trunk/reactos/lib/winmm/winmm_Es.rc 2005-05-06 19:11:20 UTC (rev 15055) +++ trunk/reactos/lib/winmm/winmm_Es.rc 2005-05-06 19:16:10 UTC (rev 15056) @@ -1,5 +1,6 @@ /* * Copyright 1999 Julio Cesar Gazquez + * Copyright 2005 JosÚ Manuel Ferrer Ortiz * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,30 +18,30 @@ */ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL - BEGIN +BEGIN - /* MMSYS errors */ +/* MMSYS errors */ MMSYSERR_NOERROR, "El comando especificado fue ejecutado." MMSYSERR_ERROR, "Error externo indefinido." MMSYSERR_BADDEVICEID, "Un identificador de dispositivo que ha sido usado estß fuera de rango para su sistema." - MMSYSERR_NOTENABLED, "El controlador no fue activado." + MMSYSERR_NOTENABLED, "El manejador no fue activado." MMSYSERR_ALLOCATED, "El dispositivo especificado a·n estß en uso. Espere hasta que estÚ libre e intente nuevamente." MMSYSERR_INVALHANDLE, "El handle de dispositivo especificado es invßlido." - MMSYSERR_NODRIVER, "No hay un controlador instalado en su sistema !\n" - MMSYSERR_NOMEM, "No hay suficiente memoria disponible para esta tarea. Cierre una o mßs aplicaciones para aumentar la memoria disponible e intente nuevamente." - MMSYSERR_NOTSUPPORTED, "Esta funci¾n no estß soportada. Use la funci¾n Capacidades para determinar que funciones y mensajes soporta el controlador." + MMSYSERR_NODRIVER, "íNo hay un manejador instalado en su sistema!\n" + MMSYSERR_NOMEM, "No hay suficiente memoria disponible para esta tarea. Cierre una o mßs aplicaciones para aumentar la memoria disponible e intÚntelo de nuevo." + MMSYSERR_NOTSUPPORTED, "Esta funci¾n no estß soportada. Use la funci¾n Capacidades para determinar quÚ funciones y mensajes soporta el manejador." MMSYSERR_BADERRNUM, "Se ha especificado un n·mero de error que no estß definido en el sistema." - MMSYSERR_INVALFLAG, "Se ha pasado un flag no vßlido a una funci¾n del sistema." + MMSYSERR_INVALFLAG, "Se ha pasado una bandera no vßlida a una funci¾n del sistema." MMSYSERR_INVALPARAM, "Se ha pasado un parßmetro no vßlido a una funci¾n del sistema." - /* WAVE errors */ +/* WAVE errors */ WAVERR_BADFORMAT, "El formato especificado no estß soportado o no puede ser traducido. Use la funci¾n Capacidades para determinar los formatos soportados." WAVERR_STILLPLAYING, "Esta operaci¾n no puede ejecutarse mientras contin·a la reproducci¾n. Reinicie el dispositivo, o espere hasta que la reproducci¾n termine." - WAVERR_UNPREPARED, "La cabecera del forma de onda no estß preparada. Use la funci¾n Preparar para preparar la cabecera, e intente nuevamente." - WAVERR_SYNC, "No puede abrirse el dispositivo sin usar el flag WAVE_ALLOWSYNC. Use el flag, e intente nuevamente." + WAVERR_UNPREPARED, "La cabecera de onda no estß preparada. Use la funci¾n Preparar para prepararla, e intÚntelo de nuevo." + WAVERR_SYNC, "No puede abrirse el dispositivo sin usar la bandera WAVE_ALLOWSYNC. UtilÝcela, e intÚntelo de nuevo." - /* MIDI errors */ - MIDIERR_UNPREPARED, "La cabecera MIDI no estß preparada. Use la funci¾n Preparar para preparar la cabecera, e intente nuevamente." +/* MIDI errors */ + MIDIERR_UNPREPARED, "La cabecera MIDI no estß preparada. Use la funci¾n Preparar para prepararla, e intÚntelo de nuevo." MIDIERR_STILLPLAYING, "Esta operaci¾n no puede ejecutarse mientras se contin·a tocando. Reinicie el dispositivo, o espera hasta que termine de tocar." MIDIERR_NOMAP, "No se encontr¾ un mapa MIDI. Puede haber un problema con el controlador, el el fichero MIDIMAP.CFG puede faltar o estar corrupto." MIDIERR_NOTREADY, "El puerto estß transmitiendo datos al dispositivo. Espera hasta que los datos hayan sido transmitidos, e intente nuevamente." @@ -123,4 +124,4 @@ MCIERR_SEQ_PORTUNSPECIFIED, "El sistema no tiene actualmente un puerto MIDI especificado." MCIERR_SEQ_TIMER, "Todos los temporizadores de multimedia estßn siendo usados por otras aplicaciones. Cierre una de esas aplicaciones e intente nuevamente." - END +END

19 years, 4 months

[gvg] 15055: Fix filename case

by gvg＠svn.reactos.com

Fix filename case Added: trunk/reactos/subsys/system/reporterror/Dk.rc Deleted: trunk/reactos/subsys/system/reporterror/dk.rc _____ Copied: trunk/reactos/subsys/system/reporterror/Dk.rc (from rev 15054, trunk/reactos/subsys/system/reporterror/dk.rc) _____ Deleted: trunk/reactos/subsys/system/reporterror/dk.rc --- trunk/reactos/subsys/system/reporterror/dk.rc 2005-05-06 19:06:59 UTC (rev 15054) +++ trunk/reactos/subsys/system/reporterror/dk.rc 2005-05-06 19:11:20 UTC (rev 15055) @@ -1,54 +0,0 @@ -LANGUAGE LANG_DANISH, SUBLANG_DEFAULT - -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Fejl Meddeler Assistenten" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Systemet er blev genoprettet fra en fejl.", -1, 115, 15, 160, 24 - LTEXT "Ïnsker du at indsende en fejl rapport til ReactOS Projektet?", -1, 115, 35, 160, 17 -END - -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Fejl Meddeler Assistenten" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Beskriv venligst hvad du pr°vede at g°re inden fejlen opstod.\n\nKlik pÕ 'Nµste' for at indsende rapporten til ReactOS Projektet eller 'Fortryd' for ikke at indsende nogle informationer.",-1,10,0,225,40 - LTEXT "Din e-mail adresse (valgfri):",-1,10,40,120,20 - EDITTEXT IDE_SUBMIT_REPORT_YOUR_EMAIL, 110,40,150,12 - LTEXT "Beskrivelse af problemet (valgfri):",-1,10,55,120,20 - EDITTEXT IDE_SUBMIT_REPORT_PROBLEM_DESCRIPTION,10,65,250,55,ES_WANTRETURN|ES_MULT ILINE|ES_LEFT|WS_BORDER|WS_TABSTOP|WS_VSCROLL -END - -IDD_SUBMITTING_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Fejl Meddeler Assistenten" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "{STATUS}",IDC_SUBMISSION_STATUS,25,58,225,8 - CONTROL "", IDC_SUBMITTING_IN_PROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 -END - -IDD_SUBMITTED_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Fejl Meddeler Assistenten" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Din fejl rapport blev vellykket indsendt til ReactOS Projektet. Mange Tak.",-1,25,5,225,20 -END - -STRINGTABLE -BEGIN - IDS_WIZARD_NAME "Rapporterings Fejl ved indsendelse til ReactOS Projektet" - IDS_FAILED_TO_CONTACT_SERVER "Systemet var ikke i stand til at kontakte Fejl Rapportings Serveren.\nVµr venlig at sikre dig at dit system er forbundet til Internettet." - IDS_FAILED_TO_DELIVER_ERROR_REPORT "Systemet var ikke i stand til at levere Fejl Rapporten." -END - -STRINGTABLE -BEGIN - IDS_CONTACTING_SERVER "Kontakter Fejl Rapporterings Serveren Vent Venligst..." - IDS_FAILED_TO_INITIALIZE_WINSOCK "Fejl opstod da man fors°gte at initialisere Winsock 2.0 (Reactos Fejl Kode %d)" - IDS_FAILED_TO_LOCATE_SERVER "Kunne ikke komme i kontakt med Fejl Rapportings Serveren. Pr°v Venligst igen Senere.." -END -

19 years, 4 months

[chorns] 15054: Correct typo

by chorns＠svn.reactos.com

Correct typo Modified: trunk/reactos/subsys/system/reporterror/reporterror.c _____ Modified: trunk/reactos/subsys/system/reporterror/reporterror.c --- trunk/reactos/subsys/system/reporterror/reporterror.c 2005-05-06 17:30:45 UTC (rev 15053) +++ trunk/reactos/subsys/system/reporterror/reporterror.c 2005-05-06 19:06:59 UTC (rev 15054) @@ -278,14 +278,14 @@ memset(parameterBuffer, '\0', MAX_REQUEST_BUFFER_SIZE); strcat(parameterBuffer, "errorReport="); - strcat(parameterBuffer, "<ErrorReportResponse>"); + strcat(parameterBuffer, "<ErrorReportRequest>"); strcat(parameterBuffer, "<YourEmail>"); strcat(parameterBuffer, errorReport->YourEmail); strcat(parameterBuffer, "</YourEmail>"); strcat(parameterBuffer, "<ProblemDescription>"); strcat(parameterBuffer, errorReport->ProblemDescription); strcat(parameterBuffer, "</ProblemDescription>"); - strcat(parameterBuffer, "</ErrorReportResponse>"); + strcat(parameterBuffer, "</ErrorReportRequest>"); strcat(parameterBuffer, "\r\n"); urlencodeBuffer = malloc(MAX_REQUEST_BUFFER_SIZE); @@ -311,7 +311,6 @@ BOOL WasErrorReportDelivered(LPSTR httpResponse) { - return strstr(httpResponse, "</ErrorReportResponse>") != NULL; }

19 years, 4 months

[greatlrd] 15053: Thx w3seek that pointout a bug in ConInString it should have been in fristplase GetConsoleCP() instead for GetConsoleOutputCP

by greatlrd＠svn.reactos.com

Thx w3seek that pointout a bug in ConInString it should have been in fristplase GetConsoleCP() instead for GetConsoleOutputCP Modified: trunk/reactos/subsys/system/cmd/console.c _____ Modified: trunk/reactos/subsys/system/cmd/console.c --- trunk/reactos/subsys/system/cmd/console.c 2005-05-06 17:10:21 UTC (rev 15052) +++ trunk/reactos/subsys/system/cmd/console.c 2005-05-06 17:30:45 UTC (rev 15053) @@ -17,7 +17,6 @@ #define OUTPUT_BUFFER_SIZE 4096 - VOID ConInDisable (VOID) { HANDLE hInput = GetStdHandle (STD_INPUT_HANDLE); @@ -105,7 +104,7 @@ ReadFile (hFile, (PVOID)pBuf, dwLength, &dwRead, NULL); #ifdef _UNICODE - MultiByteToWideChar( GetConsoleOutputCP(), 0, pBuf, dwLength + 1, lpInput, dwLength + 1); + MultiByteToWideChar( GetConsoleCP(), 0, pBuf, dwLength + 1, lpInput, dwLength + 1); #endif p = lpInput; for (i = 0; i < dwRead; i++, p++)

19 years, 4 months

[greatlrd] 15052: At last unicode version of cmd are now output text with right code page

by greatlrd＠svn.reactos.com

At last unicode version of cmd are now output text with right code page so charater on other langues like swedish, french, ... will display right now Modified: trunk/reactos/subsys/system/cmd/console.c _____ Modified: trunk/reactos/subsys/system/cmd/console.c --- trunk/reactos/subsys/system/cmd/console.c 2005-05-06 16:47:09 UTC (rev 15051) +++ trunk/reactos/subsys/system/cmd/console.c 2005-05-06 17:10:21 UTC (rev 15052) @@ -105,7 +105,7 @@ ReadFile (hFile, (PVOID)pBuf, dwLength, &dwRead, NULL); #ifdef _UNICODE - MultiByteToWideChar(CP_ACP, 0, pBuf, dwLength + 1, lpInput, dwLength + 1); + MultiByteToWideChar( GetConsoleOutputCP(), 0, pBuf, dwLength + 1, lpInput, dwLength + 1); #endif p = lpInput; for (i = 0; i < dwRead; i++, p++) @@ -133,7 +133,7 @@ WCHAR ws[2]; ws[0] = c; ws[1] = 0; - WideCharToMultiByte(CP_ACP, 0, ws, 2, as, 2, NULL, NULL); + WideCharToMultiByte( GetConsoleOutputCP(), 0, ws, 2, as, 2, NULL, NULL); cc = as[0]; #else cc = c; @@ -159,7 +159,7 @@ len = _tcslen(szText); #ifdef _UNICODE pBuf = malloc(len + 1); - len = WideCharToMultiByte(CP_ACP, 0, szText, len + 1, pBuf, len + 1, NULL, NULL) - 1; + len = WideCharToMultiByte( GetConsoleOutputCP(), 0, szText, len + 1, pBuf, len + 1, NULL, NULL) - 1; #else pBuf = szText; #endif @@ -194,7 +194,7 @@ len = _vstprintf (szOut, szFormat, arg_ptr); #ifdef _UNICODE pBuf = malloc(len + 1); - len = WideCharToMultiByte(CP_ACP, 0, szOut, len + 1, pBuf, len + 1, NULL, NULL) - 1; + len = WideCharToMultiByte( GetConsoleOutputCP(), 0, szOut, len + 1, pBuf, len + 1, NULL, NULL) - 1; #else pBuf = szOut; #endif

19 years, 4 months

[weiden] 15051: - fixed TransactNamedPipe to properly wait on completion for synchronous operations

by weiden＠svn.reactos.com

- fixed TransactNamedPipe to properly wait on completion for synchronous operations - prevent completion port notification by not passing an APC context to the kernel when the low-order bit of the event handle is set (for asynchronous operations) Modified: trunk/reactos/lib/kernel32/file/npipe.c _____ Modified: trunk/reactos/lib/kernel32/file/npipe.c --- trunk/reactos/lib/kernel32/file/npipe.c 2005-05-06 16:23:24 UTC (rev 15050) +++ trunk/reactos/lib/kernel32/file/npipe.c 2005-05-06 16:47:09 UTC (rev 15051) @@ -892,64 +892,93 @@ * @implemented */ BOOL STDCALL -TransactNamedPipe(HANDLE hNamedPipe, - LPVOID lpInBuffer, - DWORD nInBufferSize, - LPVOID lpOutBuffer, - DWORD nOutBufferSize, - LPDWORD lpBytesRead, - LPOVERLAPPED lpOverlapped) +TransactNamedPipe(IN HANDLE hNamedPipe, + IN LPVOID lpInBuffer, + IN DWORD nInBufferSize, + OUT LPVOID lpOutBuffer, + IN DWORD nOutBufferSize, + OUT LPDWORD lpBytesRead OPTIONAL, + IN LPOVERLAPPED lpOverlapped OPTIONAL) { - IO_STATUS_BLOCK IoStatusBlock; - NTSTATUS Status; + NTSTATUS Status; + + if (lpBytesRead != NULL) + { + *lpBytesRead = 0; + } - if (lpOverlapped == NULL) - { - Status = NtFsControlFile(hNamedPipe, - NULL, - NULL, - NULL, - &IoStatusBlock, - FSCTL_PIPE_TRANSCEIVE, - lpInBuffer, - nInBufferSize, - lpOutBuffer, - nOutBufferSize); - if (Status == STATUS_PENDING) - { - NtWaitForSingleObject(hNamedPipe, - 0, - FALSE); - Status = IoStatusBlock.Status; - } - if (NT_SUCCESS(Status)) - { - *lpBytesRead = IoStatusBlock.Information; - } - } - else - { - lpOverlapped->Internal = STATUS_PENDING; + if (lpOverlapped != NULL) + { + PVOID ApcContext; - Status = NtFsControlFile(hNamedPipe, - lpOverlapped->hEvent, - NULL, - NULL, - (PIO_STATUS_BLOCK)lpOverlapped, - FSCTL_PIPE_TRANSCEIVE, - lpInBuffer, - nInBufferSize, - lpOutBuffer, - nOutBufferSize); - } + ApcContext = (((ULONG_PTR)lpOverlapped->hEvent & 0x1) ? NULL : lpOverlapped); + lpOverlapped->Internal = STATUS_PENDING; - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return(FALSE); - } + Status = NtFsControlFile(hNamedPipe, + lpOverlapped->hEvent, + NULL, + ApcContext, + (PIO_STATUS_BLOCK)lpOverlapped, + FSCTL_PIPE_TRANSCEIVE, + lpInBuffer, + nInBufferSize, + lpOutBuffer, + nOutBufferSize); - return(TRUE); + /* return FALSE in case of failure and pending operations! */ + if (!NT_SUCCESS(Status) || Status == STATUS_PENDING) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + if (lpBytesRead != NULL) + { + *lpBytesRead = lpOverlapped->InternalHigh; + } + } + else + { + IO_STATUS_BLOCK Iosb; + + Status = NtFsControlFile(hNamedPipe, + NULL, + NULL, + NULL, + &Iosb, + FSCTL_PIPE_TRANSCEIVE, + lpInBuffer, + nInBufferSize, + lpOutBuffer, + nOutBufferSize); + + /* wait in case operation is pending */ + if (Status == STATUS_PENDING) + { + Status = NtWaitForSingleObject(hNamedPipe, + FALSE, + NULL); + if (NT_SUCCESS(Status)) + { + Status = Iosb.Status; + } + } + + if (NT_SUCCESS(Status)) + { + /* lpNumberOfBytesRead must not be NULL here, in fact Win doesn't + check that case either and crashes (only after the operation + completed) */ + *lpBytesRead = Iosb.Information; + } + else + { + SetLastErrorByStatus(Status); + return FALSE; + } + } + + return TRUE; } /* EOF */

19 years, 4 months

[gvg] 15050: Sync to Wine-20050419:

by gvg＠svn.reactos.com

Sync to Wine-20050419: Peter Berg Larsen <pebl(a)math.ku.dk> - Strncpy elimination. - Janitorial: Get rid of strncpy/strncpyW. Jakob Eriksson <jakov(a)vmlinux.org> - Get rid of HeapAlloc casts. Troy Rollo <wine(a)troy.rollo.name> - Corrections to UrlIsW and UrlIsA. - URL_IS_OPAQUE results depend only on the scheme, not on the URL. - URL_IS_FILEURL also only depends on the scheme ("file:"). Francois Gouget <fgouget(a)free.fr> - Assorted spelling fixes. Robert Shearman <rob(a)codeweavers.com> - Fix SHCopyKey to treat string parameter correctly as source path instead of destination path. Jon Griffiths <jon_p_griffiths(a)yahoo.com> - Use LMEM_ flags for LocalAlloc(), not GMEM_ (GlobalAlloc). - Implement @188,190,195,200,256,478,481. - IUnknown_EnableModeless() also handles IOleInPlaceActiveObject. - Tests and small fix for PathMakePretty(). - Fix a crash and test failure with early native dlls. Modified: trunk/reactos/include/wine/shlguid.h Modified: trunk/reactos/lib/shlwapi/istream.c Modified: trunk/reactos/lib/shlwapi/ordinal.c Modified: trunk/reactos/lib/shlwapi/path.c Modified: trunk/reactos/lib/shlwapi/reg.c Modified: trunk/reactos/lib/shlwapi/regstream.c Modified: trunk/reactos/lib/shlwapi/shlwapi.spec Modified: trunk/reactos/lib/shlwapi/string.c Modified: trunk/reactos/lib/shlwapi/url.c Modified: trunk/reactos/w32api/include/ocidl.h Modified: trunk/reactos/w32api/include/oleidl.h Modified: trunk/reactos/w32api/include/shlguid.h Modified: trunk/reactos/w32api/include/shlobj.h _____ Modified: trunk/reactos/include/wine/shlguid.h --- trunk/reactos/include/wine/shlguid.h 2005-05-06 16:21:30 UTC (rev 15049) +++ trunk/reactos/include/wine/shlguid.h 2005-05-06 16:23:24 UTC (rev 15050) @@ -34,6 +34,7 @@ DEFINE_SHLGUID(IID_IShellLinkW, 0x000214F9L, 0, 0); DEFINE_SHLGUID(IID_IShellExecuteHookA, 0x000214F5L, 0, 0); DEFINE_SHLGUID(IID_IShellExecuteHookW, 0x000214FBL, 0, 0); +DEFINE_SHLGUID(IID_IQueryInfo, 0x00021500L, 0, 0); DEFINE_GUID(SID_STopLevelBrowser, 0x4C96BE40L, 0x915C, 0x11CF, 0x99, 0xD3, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37); @@ -52,4 +53,7 @@ DEFINE_GUID(CLSID_AutoComplete, 0x00bb2763, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); +DEFINE_GUID(IID_IInputObject, 0x068284FAA, 0x6A48, 0x11D0, 0x8C, 0x78, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xB4); +DEFINE_GUID(IID_IInputObjectSite, 0x0F1DB8392, 0x7331, 0x11D0, 0x8C, 0x99, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); + #endif /* __WINE_SHLGUID_H */ _____ Modified: trunk/reactos/lib/shlwapi/istream.c --- trunk/reactos/lib/shlwapi/istream.c 2005-05-06 16:21:30 UTC (rev 15049) +++ trunk/reactos/lib/shlwapi/istream.c 2005-05-06 16:23:24 UTC (rev 15050) @@ -352,7 +352,7 @@ { ISHFileStream* fileStream; - fileStream = (ISHFileStream*)HeapAlloc(GetProcessHeap(), 0, sizeof(ISHFileStream)); + fileStream = HeapAlloc(GetProcessHeap(), 0, sizeof(ISHFileStream)); if (fileStream) { _____ Modified: trunk/reactos/lib/shlwapi/ordinal.c --- trunk/reactos/lib/shlwapi/ordinal.c 2005-05-06 16:21:30 UTC (rev 15049) +++ trunk/reactos/lib/shlwapi/ordinal.c 2005-05-06 16:23:24 UTC (rev 15050) @@ -1339,7 +1339,7 @@ *lpUnknown = NULL; TRACE("doing Release\n"); - + return IUnknown_Release(temp); } @@ -1397,7 +1397,7 @@ if (lpUnknown1 == lpUnknown2) return TRUE; - + return FALSE; } @@ -1848,12 +1848,46 @@ } /*********************************************************************** ** + * @ [SHLWAPI.188] + * + * Call IOleControlSite_TranslateAccelerator() on an object. + * + * PARAMS + * lpUnknown [I] Object supporting the IOleControlSite interface. + * lpMsg [I] Key message to be processed. + * dwModifiers [I] Flags containing the state of the modifier keys. + * + * RETURNS + * Success: S_OK. + * Failure: An HRESULT error code, or E_INVALIDARG if lpUnknown is NULL. + */ +HRESULT WINAPI IUnknown_TranslateAcceleratorOCS(IUnknown *lpUnknown, LPMSG lpMsg, DWORD dwModifiers) +{ + IOleControlSite* lpCSite = NULL; + HRESULT hRet = E_INVALIDARG; + + TRACE("(%p,%p,0x%08lx)\n", lpUnknown, lpMsg, dwModifiers); + if (lpUnknown) + { + hRet = IUnknown_QueryInterface(lpUnknown, &IID_IOleControlSite, + (void**)&lpCSite); + if (SUCCEEDED(hRet) && lpCSite) + { + hRet = IOleControlSite_TranslateAccelerator(lpCSite, lpMsg, dwModifiers); + IOleControlSite_Release(lpCSite); + } + } + return hRet; +} + + +/********************************************************************** *** * @ [SHLWAPI.189] * * Call IOleControlSite_GetExtendedControl() on an object. * * PARAMS - * lpUnknown [I] Object supporting the IOleControlSite interface + * lpUnknown [I] Object supporting the IOleControlSite interface. * lppDisp [O] Destination for resulting IDispatch. * * RETURNS @@ -1862,7 +1896,7 @@ */ DWORD WINAPI IUnknown_OnFocusOCS(IUnknown *lpUnknown, IDispatch** lppDisp) { - IOleControlSite* lpCSite; + IOleControlSite* lpCSite = NULL; HRESULT hRet = E_FAIL; TRACE("(%p,%p)\n", lpUnknown, lppDisp); @@ -1880,6 +1914,41 @@ } /*********************************************************************** ** + * @ [SHLWAPI.190] + */ +HRESULT WINAPI IUnknown_HandleIRestrict(LPUNKNOWN lpUnknown, PVOID lpArg1, + PVOID lpArg2, PVOID lpArg3, PVOID lpArg4) +{ + /* FIXME: {D12F26B2-D90A-11D0-830D-00AA005B4383} - What object does this represent? */ + static const DWORD service_id[] = { 0xd12f26b2, 0x11d0d90a, 0xaa000d83, 0x83435b00 }; + /* FIXME: {D12F26B1-D90A-11D0-830D-00AA005B4383} - Also Unknown/undocumented */ + static const DWORD function_id[] = { 0xd12f26b1, 0x11d0d90a, 0xaa000d83, 0x83435b00 }; + HRESULT hRet = E_INVALIDARG; + LPUNKNOWN lpUnkInner = NULL; /* FIXME: Real type is unknown */ + + TRACE("(%p,%p,%p,%p,%p)\n", lpUnknown, lpArg1, lpArg2, lpArg3, lpArg4); + + if (lpUnknown && lpArg4) + { + hRet = IUnknown_QueryService(lpUnknown, (REFGUID)service_id, + (REFGUID)function_id, (void**)&lpUnkInner); + + if (SUCCEEDED(hRet) && lpUnkInner) + { + /* FIXME: The type of service object requested is unknown, however + * testing shows that its first method is called with 4 parameters. + * Fake this by using IParseDisplayName_ParseDisplayName since the + * signature and position in the vtable matches our unknown object type. + */ + hRet = IParseDisplayName_ParseDisplayName((LPPARSEDISPLAYNAME)lpUnkInner, + lpArg1, lpArg2, lpArg3, lpArg4); + IUnknown_Release(lpUnkInner); + } + } + return hRet; +} + +/********************************************************************** *** * @ [SHLWAPI.192] * * Get a sub-menu from a menu item. @@ -1966,6 +2035,55 @@ } /*********************************************************************** ** + * @ [SHLWAPI.195] + * + * Determine if a shell folder can be expanded. + * + * PARAMS + * lpFolder [I] Parent folder containing the object to test. + * pidl [I] Id of the object to test. + * + * RETURNS + * Success: S_OK, if the object is expandable, S_FALSE otherwise. + * Failure: E_INVALIDARG, if any argument is invalid. + * + * NOTES + * If the object to be tested does not expose the IQueryInfo() interface it + * will not be identified as an expandable folder. + */ +HRESULT WINAPI SHIsExpandableFolder(LPSHELLFOLDER lpFolder, LPCITEMIDLIST pidl) +{ + HRESULT hRet = E_INVALIDARG; + IQueryInfo *lpInfo; + + if (lpFolder && pidl) + { + hRet = IShellFolder_GetUIObjectOf(lpFolder, NULL, 1, &pidl, &IID_IQueryInfo, + NULL, (void**)&lpInfo); + if (FAILED(hRet)) + hRet = S_FALSE; /* Doesn't expose IQueryInfo */ + else + { + DWORD dwFlags = 0; + + /* MSDN states of IQueryInfo_GetInfoFlags() that "This method is not + * currently used". Really? You wouldn't be holding out on me would you? + */ + hRet = IQueryInfo_GetInfoFlags(lpInfo, &dwFlags); + + if (SUCCEEDED(hRet)) + { + /* 0x2 is an undocumented flag apparently indicating expandability */ + hRet = dwFlags & 0x2 ? S_OK : S_FALSE; + } + + IQueryInfo_Release(lpInfo); + } + } + return hRet; +} + +/********************************************************************** *** * @ [SHLWAPI.197] * * Blank out a region of text by drawing the background only. @@ -2051,6 +2169,21 @@ } /*********************************************************************** ** + * @ [SHLWAPI.200] + * + */ +HRESULT WINAPI MayQSForward(IUnknown* lpUnknown, PVOID lpReserved, + REFGUID riidCmdGrp, ULONG cCmds, + OLECMD *prgCmds, OLECMDTEXT* pCmdText) +{ + FIXME("(%p,%p,%p,%ld,%p,%p) - stub\n", + lpUnknown, lpReserved, riidCmdGrp, cCmds, prgCmds, pCmdText); + + /* FIXME: Calls IsQSForward & IUnknown_QueryStatus */ + return DRAGDROP_E_NOTREGISTERED; +} + +/********************************************************************** *** * @ [SHLWAPI.201] * */ @@ -2351,6 +2484,29 @@ } /*********************************************************************** ** + * @ [SHLWAPI.256] + */ +HRESULT WINAPI IUnknown_GetSite(LPUNKNOWN lpUnknown, REFIID iid, PVOID *lppSite) +{ + HRESULT hRet = E_INVALIDARG; + LPOBJECTWITHSITE lpSite = NULL; + + TRACE("(%p,%s,%p)\n", lpUnknown, debugstr_guid(iid), lppSite); + + if (lpUnknown && iid && lppSite) + { + hRet = IUnknown_QueryInterface(lpUnknown, &IID_IObjectWithSite, + (void**)&lpSite); + if (SUCCEEDED(hRet) && lpSite) + { + hRet = IObjectWithSite_GetSite(lpSite, iid, lppSite); + IObjectWithSite_Release(lpSite); + } + } + return hRet; +} + +/********************************************************************** *** * @ [SHLWAPI.257] * * Create a worker window using CreateWindowExA(). @@ -2510,7 +2666,7 @@ * Failure: An HRESULT error code. * * NOTES - * This QueryInterface asks the inner object for a interface. In case + * This QueryInterface asks the inner object for an interface. In case * of aggregation this request would be forwarded by the inner to the * outer object. This function asks the inner object directly for the * interface circumventing the forwarding to the outer object. @@ -3051,7 +3207,8 @@ * NOTES * lpUnknown must support the IOleInPlaceFrame interface, the * IInternetSecurityMgrSite interface, the IShellBrowser interface - * or the IDocHostUIHandler interface, or this call fails. + * the IDocHostUIHandler interface, or the IOleInPlaceActiveObject interface, + * or this call will fail. */ HRESULT WINAPI IUnknown_EnableModeless(IUnknown *lpUnknown, BOOL bModeless) { @@ -3063,7 +3220,9 @@ if (!lpUnknown) return E_FAIL; - if (IsIface(IOleInPlaceFrame)) + if (IsIface(IOleInPlaceActiveObject)) + EnableModeless(IOleInPlaceActiveObject); + else if (IsIface(IOleInPlaceFrame)) EnableModeless(IOleInPlaceFrame); else if (IsIface(IShellBrowser)) EnableModeless(IShellBrowser); @@ -3696,7 +3855,7 @@ case OS_HOME: ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && majorv >= 5 && minorv >= 1) case OS_PROFESSIONAL: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT) + ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT) case OS_DATACENTER: ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT) case OS_ADVSERVER: @@ -3747,6 +3906,70 @@ } /*********************************************************************** ** + * @ [SHLWAPI.478] + * + * Call IInputObject_TranslateAcceleratorIO() on an object. + * + * PARAMS + * lpUnknown [I] Object supporting the IInputObject interface. + * lpMsg [I] Key message to be processed. + * + * RETURNS + * Success: S_OK. + * Failure: An HRESULT error code, or E_INVALIDARG if lpUnknown is NULL. + */ +HRESULT WINAPI IUnknown_TranslateAcceleratorIO(IUnknown *lpUnknown, LPMSG lpMsg) +{ + IInputObject* lpInput = NULL; + HRESULT hRet = E_INVALIDARG; + + TRACE("(%p,%p)\n", lpUnknown, lpMsg); + if (lpUnknown) + { + hRet = IUnknown_QueryInterface(lpUnknown, &IID_IInputObject, + (void**)&lpInput); + if (SUCCEEDED(hRet) && lpInput) + { + hRet = IInputObject_TranslateAcceleratorIO(lpInput, lpMsg); + IInputObject_Release(lpInput); + } + } + return hRet; +} + +/********************************************************************** *** + * @ [SHLWAPI.481] + * + * Call IInputObject_HasFocusIO() on an object. + * + * PARAMS + * lpUnknown [I] Object supporting the IInputObject interface. + * + * RETURNS + * Success: S_OK, if lpUnknown is an IInputObject object and has the focus, + * or S_FALSE otherwise. + * Failure: An HRESULT error code, or E_INVALIDARG if lpUnknown is NULL. + */ +HRESULT WINAPI IUnknown_HasFocusIO(IUnknown *lpUnknown) +{ + IInputObject* lpInput = NULL; + HRESULT hRet = E_INVALIDARG; + + TRACE("(%p)\n", lpUnknown); + if (lpUnknown) + { + hRet = IUnknown_QueryInterface(lpUnknown, &IID_IInputObject, + (void**)&lpInput); + if (SUCCEEDED(hRet) && lpInput) + { + hRet = IInputObject_HasFocusIO(lpInput); + IInputObject_Release(lpInput); + } + } + return hRet; +} + +/********************************************************************** *** * ColorRGBToHLS [SHLWAPI.@] * * Convert an rgb COLORREF into the hls color space. @@ -3940,9 +4163,9 @@ /*********************************************************************** ** * @ [SHLWAPI.461] */ -DWORD WINAPI SHGetAppCompatFlags(DWORD Unknown) +DWORD WINAPI SHGetAppCompatFlags(DWORD dwUnknown) { - FIXME("stub\n"); + FIXME("(0x%08lx) stub\n", dwUnknown); return 0; } @@ -4015,17 +4238,24 @@ /*********************************************************************** * IUnknown_OnFocusChangeIS (SHLWAPI.@) */ -DWORD WINAPI IUnknown_OnFocusChangeIS(IUnknown * pUnk, IUnknown * pFocusObject, BOOL bChange) +HRESULT WINAPI IUnknown_OnFocusChangeIS(LPUNKNOWN lpUnknown, LPUNKNOWN pFocusObject, BOOL bFocus) { - FIXME("(%p, %p, %s)\n", pUnk, pFocusObject, bChange ? "TRUE" : "FALSE"); + IInputObjectSite *pIOS = NULL; + HRESULT hRet = E_INVALIDARG; -/* - IInputObjectSite * pIOS = NULL; - if (SUCCEEDED(IUnknown_QueryInterface(pUnk, &IID_IInputObjectSite, (void **)&pIOS)) - IInputObjectSite_OnFocusChangeIS(pIOS, pFocusObject, bChange); -*/ + TRACE("(%p, %p, %s)\n", lpUnknown, pFocusObject, bFocus ? "TRUE" : "FALSE"); - return 0; + if (lpUnknown) + { + hRet = IUnknown_QueryInterface(lpUnknown, &IID_IInputObjectSite, + (void **)&pIOS); + if (SUCCEEDED(hRet) && pIOS) + { + hRet = IInputObjectSite_OnFocusChangeIS(pIOS, pFocusObject, bFocus); + IInputObjectSite_Release(pIOS); + } + } + return hRet; } /*********************************************************************** _____ Modified: trunk/reactos/lib/shlwapi/path.c --- trunk/reactos/lib/shlwapi/path.c 2005-05-06 16:21:30 UTC (rev 15049) +++ trunk/reactos/lib/shlwapi/path.c 2005-05-06 16:23:24 UTC (rev 15050) @@ -168,14 +168,14 @@ if (!lpszFile || !*lpszFile) { /* Use dir only */ - strncpyW(szTemp, lpszDir, MAX_PATH); + lstrcpynW(szTemp, lpszDir, MAX_PATH); } else if (!lpszDir || !*lpszDir || !PathIsRelativeW(lpszFile)) { if (!lpszDir || !*lpszDir || *lpszFile != '\\' || PathIsUNCW(lpszFile)) { /* Use file only */ - strncpyW(szTemp, lpszFile, MAX_PATH); + lstrcpynW(szTemp, lpszFile, MAX_PATH); } else { @@ -188,7 +188,7 @@ if (bUseBoth) { - strncpyW(szTemp, lpszDir, MAX_PATH); + lstrcpynW(szTemp, lpszDir, MAX_PATH); if (bStrip) { PathStripToRootW(szTemp); @@ -1687,7 +1687,8 @@ if (!lpszPath) return FALSE; - iPrevErrMode = SetErrorMode(1); + /* Prevent a dialog box if path is on a disk that has been ejected. */ + iPrevErrMode = SetErrorMode(SEM_FAILCRITICALERRORS); dwAttr = GetFileAttributesA(lpszPath); SetErrorMode(iPrevErrMode); return dwAttr == INVALID_FILE_ATTRIBUTES ? FALSE : TRUE; @@ -1708,7 +1709,7 @@ if (!lpszPath) return FALSE; - iPrevErrMode = SetErrorMode(1); + iPrevErrMode = SetErrorMode(SEM_FAILCRITICALERRORS); dwAttr = GetFileAttributesW(lpszPath); SetErrorMode(iPrevErrMode); return dwAttr == INVALID_FILE_ATTRIBUTES ? FALSE : TRUE; @@ -2580,21 +2581,24 @@ TRACE("(%s)\n", debugstr_a(lpszPath)); - if (!pszIter || !*pszIter) + if (!pszIter) return FALSE; - while (*pszIter) + if (*pszIter) { - if (islower(*pszIter) || IsDBCSLeadByte(*pszIter)) - return FALSE; /* Not DOS path */ - pszIter++; + do + { + if (islower(*pszIter) || IsDBCSLeadByte(*pszIter)) + return FALSE; /* Not DOS path */ + pszIter++; + } while (*pszIter); + pszIter = lpszPath + 1; + while (*pszIter) + { + *pszIter = tolower(*pszIter); + pszIter++; + } } - pszIter = lpszPath + 1; - while (*pszIter) - { - *pszIter = tolower(*pszIter); - pszIter++; - } return TRUE; } @@ -2609,21 +2613,24 @@ TRACE("(%s)\n", debugstr_w(lpszPath)); - if (!pszIter || !*pszIter) + if (!pszIter) return FALSE; - while (*pszIter) + if (*pszIter) { - if (islowerW(*pszIter)) - return FALSE; /* Not DOS path */ - pszIter++; + do + { + if (islowerW(*pszIter)) + return FALSE; /* Not DOS path */ + pszIter++; + } while (*pszIter); + pszIter = lpszPath + 1; + while (*pszIter) + { + *pszIter = tolowerW(*pszIter); + pszIter++; + } } - pszIter = lpszPath + 1; - while (*pszIter) - { - *pszIter = tolowerW(*pszIter); - pszIter++; - } return TRUE; } @@ -2767,7 +2774,7 @@ * dx [I] Desired width * * RETURNS - * TRUE If the path was modified. + * TRUE If the path was modified/went well. * FALSE Otherwise. */ BOOL WINAPI PathCompactPathA(HDC hDC, LPSTR lpszPath, UINT dx) @@ -2803,7 +2810,7 @@ TRACE("(%p,%s,%d)\n", hDC, debugstr_w(lpszPath), dx); if (!lpszPath) - return bRet; + return FALSE; if (!hDC) hdc = hDC = GetDC(0); @@ -2838,7 +2845,7 @@ * the file name as possible, allowing for the ellipses, e.g: * c:\some very long path\filename ==> c:\some v...\filename */ - strncpyW(buff, sFile, MAX_PATH); + lstrcpynW(buff, sFile, MAX_PATH); do { @@ -2880,7 +2887,7 @@ if (dwLen > MAX_PATH - 3) dwLen = MAX_PATH - 3; - strncpyW(buff, sFile, dwLen); + lstrcpynW(buff, sFile, dwLen); do { dwLen--; @@ -3390,8 +3397,8 @@ return FALSE; *lpszPath = '\0'; - strncpyW(szFrom, lpszFrom, MAX_PATH); - strncpyW(szTo, lpszTo, MAX_PATH); + lstrcpynW(szFrom, lpszFrom, MAX_PATH); + lstrcpynW(szTo, lpszTo, MAX_PATH); if(!(dwAttrFrom & FILE_ATTRIBUTE_DIRECTORY)) PathRemoveFileSpecW(szFrom); @@ -3739,7 +3746,7 @@ if (!lpszPath || !PathIsDirectoryW(lpszPath)) return FALSE; - strncpyW(szSearch, lpszPath, MAX_PATH); + lstrcpynW(szSearch, lpszPath, MAX_PATH); PathAddBackslashW(szSearch); dwLen = strlenW(szSearch); if (dwLen > MAX_PATH - 4) _____ Modified: trunk/reactos/lib/shlwapi/reg.c --- trunk/reactos/lib/shlwapi/reg.c 2005-05-06 16:21:30 UTC (rev 15049) +++ trunk/reactos/lib/shlwapi/reg.c 2005-05-06 16:23:24 UTC (rev 15050) @@ -133,7 +133,7 @@ *phNewUSKey = NULL; /* Create internal HUSKEY */ - hKey = (LPSHUSKEY)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*hKey)); + hKey = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*hKey)); lstrcpynW(hKey->lpszPath, Path, sizeof(hKey->lpszPath)); if (hRelativeUSKey) @@ -1305,7 +1305,7 @@ * * subcase-2: buffer is to small to hold the expanded string: * the function return success (!!) and the result is truncated - * *** This is clearly a error in the native implementation. *** + * *** This is clearly an error in the native implementation. *** * * case-2: the unexpanded string is bigger than the expanded one * The buffer must have enough space to hold the unexpanded @@ -1340,7 +1340,7 @@ char cNull = '\0'; nBytesToAlloc = (!pvData || (dwRet == ERROR_MORE_DATA)) ? dwUnExpDataLen : *pcbData; - szData = (LPSTR) LocalAlloc(GMEM_ZEROINIT, nBytesToAlloc); + szData = (LPSTR) LocalAlloc(LMEM_ZEROINIT, nBytesToAlloc); RegQueryValueExA (hKey, lpszValue, lpReserved, NULL, (LPBYTE)szData, &nBytesToAlloc); dwExpDataLen = ExpandEnvironmentStringsA(szData, &cNull, 1); dwUnExpDataLen = max(nBytesToAlloc, dwExpDataLen); @@ -1349,7 +1349,7 @@ else { nBytesToAlloc = (lstrlenA(pvData)+1) * sizeof (CHAR); - szData = (LPSTR) LocalAlloc(GMEM_ZEROINIT, nBytesToAlloc ); + szData = (LPSTR) LocalAlloc(LMEM_ZEROINIT, nBytesToAlloc ); lstrcpyA(szData, pvData); dwExpDataLen = ExpandEnvironmentStringsA(szData, pvData, *pcbData / sizeof(CHAR)); if (dwExpDataLen > *pcbData) dwRet = ERROR_MORE_DATA; @@ -1401,7 +1401,7 @@ WCHAR cNull = '\0'; nBytesToAlloc = (!pvData || (dwRet == ERROR_MORE_DATA)) ? dwUnExpDataLen : *pcbData; - szData = (LPWSTR) LocalAlloc(GMEM_ZEROINIT, nBytesToAlloc); + szData = (LPWSTR) LocalAlloc(LMEM_ZEROINIT, nBytesToAlloc); RegQueryValueExW (hKey, lpszValue, lpReserved, NULL, (LPBYTE)szData, &nBytesToAlloc); dwExpDataLen = ExpandEnvironmentStringsW(szData, &cNull, 1); dwUnExpDataLen = max(nBytesToAlloc, dwExpDataLen); @@ -1410,7 +1410,7 @@ else { nBytesToAlloc = (lstrlenW(pvData) + 1) * sizeof(WCHAR); - szData = (LPWSTR) LocalAlloc(GMEM_ZEROINIT, nBytesToAlloc ); + szData = (LPWSTR) LocalAlloc(LMEM_ZEROINIT, nBytesToAlloc ); lstrcpyW(szData, pvData); dwExpDataLen = ExpandEnvironmentStringsW(szData, pvData, *pcbData/sizeof(WCHAR) ); if (dwExpDataLen > *pcbData) dwRet = ERROR_MORE_DATA; @@ -2183,7 +2183,7 @@ * * PARAMS * hKeySrc [I] Source key to copy from - * lpszSubKey [I] Sub key under hKeyDst, or NULL to use hKeyDst directly + * lpszSrcSubKey [I] Sub key under hKeySrc, or NULL to use hKeySrc directly * hKeyDst [I] Destination key * dwReserved [I] Reserved, must be 0 * @@ -2196,16 +2196,16 @@ * (It will loop until out of stack, or the registry is full). This * bug is present in Win32 also. */ -DWORD WINAPI SHCopyKeyA(HKEY hKeySrc, LPCSTR lpszSubKey, HKEY hKeyDst, DWORD dwReserved) +DWORD WINAPI SHCopyKeyA(HKEY hKeySrc, LPCSTR lpszSrcSubKey, HKEY hKeyDst, DWORD dwReserved) { WCHAR szSubKeyW[MAX_PATH]; - TRACE("(hkey=%p,%s,%p08x,%ld)\n", hKeySrc, debugstr_a(lpszSubKey), hKeyDst, dwReserved); + TRACE("(hkey=%p,%s,%p08x,%ld)\n", hKeySrc, debugstr_a(lpszSrcSubKey), hKeyDst, dwReserved); - if (lpszSubKey) - MultiByteToWideChar(0, 0, lpszSubKey, -1, szSubKeyW, MAX_PATH); + if (lpszSrcSubKey) + MultiByteToWideChar(0, 0, lpszSrcSubKey, -1, szSubKeyW, MAX_PATH); - return SHCopyKeyW(hKeySrc, lpszSubKey ? szSubKeyW : NULL, hKeyDst, dwReserved); + return SHCopyKeyW(hKeySrc, lpszSrcSubKey ? szSubKeyW : NULL, hKeyDst, dwReserved); } /*********************************************************************** ** @@ -2213,7 +2213,7 @@ * * See SHCopyKeyA. */ -DWORD WINAPI SHCopyKeyW(HKEY hKeySrc, LPCWSTR lpszSubKey, HKEY hKeyDst, DWORD dwReserved) +DWORD WINAPI SHCopyKeyW(HKEY hKeySrc, LPCWSTR lpszSrcSubKey, HKEY hKeyDst, DWORD dwReserved) { DWORD dwKeyCount = 0, dwValueCount = 0, dwMaxKeyLen = 0; DWORD dwMaxValueLen = 0, dwMaxDataLen = 0, i; @@ -2222,18 +2222,18 @@ WCHAR szName[MAX_PATH], *lpszName = szName; DWORD dwRet = S_OK; - TRACE("hkey=%p,%s,%p08x,%ld)\n", hKeySrc, debugstr_w(lpszSubKey), hKeyDst, dwReserved); + TRACE("hkey=%p,%s,%p08x,%ld)\n", hKeySrc, debugstr_w(lpszSrcSubKey), hKeyDst, dwReserved); if(!hKeyDst || !hKeySrc) dwRet = ERROR_INVALID_PARAMETER; else { - /* Open destination key */ - if(lpszSubKey) - dwRet = RegOpenKeyExW(hKeyDst, lpszSubKey, 0, KEY_ALL_ACCESS, &hKeyDst); + /* Open source key */ + if(lpszSrcSubKey) + dwRet = RegOpenKeyExW(hKeySrc, lpszSrcSubKey, 0, KEY_ALL_ACCESS, &hKeySrc); if(dwRet) - hKeyDst = 0; /* Don't close this key since we didn't open it */ + hKeyDst = NULL; /* Don't close this key since we didn't open it */ else { /* Get details about sub keys and values */ @@ -2303,7 +2303,7 @@ if (lpBuff != buff) HeapFree(GetProcessHeap(), 0, lpBuff); - if (lpszSubKey && hKeyDst) + if (lpszSrcSubKey && hKeyDst) RegCloseKey(hKeyDst); return dwRet; } _____ Modified: trunk/reactos/lib/shlwapi/regstream.c --- trunk/reactos/lib/shlwapi/regstream.c 2005-05-06 16:21:30 UTC (rev 15049) +++ trunk/reactos/lib/shlwapi/regstream.c 2005-05-06 16:23:24 UTC (rev 15050) @@ -343,7 +343,7 @@ { ISHRegStream* regStream; - regStream = (ISHRegStream*)HeapAlloc(GetProcessHeap(), 0, sizeof(ISHRegStream)); + regStream = HeapAlloc(GetProcessHeap(), 0, sizeof(ISHRegStream)); if (regStream) { @@ -493,7 +493,7 @@ if (lpbData) { - LPBYTE lpbDup = (LPBYTE)HeapAlloc(GetProcessHeap(), 0, dwDataLen); + LPBYTE lpbDup = HeapAlloc(GetProcessHeap(), 0, dwDataLen); if (lpbDup) { _____ Modified: trunk/reactos/lib/shlwapi/shlwapi.spec --- trunk/reactos/lib/shlwapi/shlwapi.spec 2005-05-06 16:21:30 UTC (rev 15049) +++ trunk/reactos/lib/shlwapi/shlwapi.spec 2005-05-06 16:23:24 UTC (rev 15050) @@ -185,19 +185,19 @@ 185 stdcall -noname SHMessageBoxCheckA(ptr str str long long str) 186 stdcall -noname SHSimulateDrop(ptr ptr long ptr ptr) 187 stdcall -noname SHLoadFromPropertyBag(ptr ptr) -188 stub -noname IUnknown_TranslateAcceleratorOCS +188 stdcall -noname IUnknown_TranslateAcceleratorOCS(ptr ptr long) 189 stdcall -noname IUnknown_OnFocusOCS(ptr ptr) -190 stub -noname IUnknown_HandleIRestrict +190 stdcall -noname IUnknown_HandleIRestrict(ptr ptr ptr ptr ptr) 191 stdcall -noname SHMessageBoxCheckW(ptr wstr wstr long long wstr) 192 stdcall -noname SHGetMenuFromID(ptr long) 193 stdcall -noname SHGetCurColorRes() 194 stdcall -noname SHWaitForSendMessageThread(ptr long) -195 stub -noname SHIsExpandableFolder -196 stub -noname DnsRecordSetCompare +195 stdcall -noname SHIsExpandableFolder(ptr ptr) +196 stub -noname DnsRecordSetCompare #stdcall @(ptr ptr ptr ptr) dnsapi.DnsRecordSetCompare 197 stdcall -noname SHFillRectClr(long ptr long) 198 stdcall -noname SHSearchMapInt(ptr ptr long long) 199 stdcall -noname IUnknown_Set(ptr ptr) -200 stub -noname MayQSForward +200 stdcall -noname MayQSForward(ptr ptr ptr long ptr ptr) 201 stdcall -noname MayExecForward(ptr long ptr long long ptr ptr) 202 stdcall -noname IsQSForward(ptr long ptr) 203 stdcall -noname SHStripMneumonicA(str) @@ -253,7 +253,7 @@ 253 stub -noname StopWatchExA 254 stub -noname StopWatchExW 255 stub -noname EventTraceHandler -256 stub -noname IUnknown_GetSite +256 stdcall -noname IUnknown_GetSite(ptr ptr ptr) 257 stdcall -noname SHCreateWorkerWindowA(long ptr long long ptr long) 258 stub -noname SHRegisterWaitForSingleObject 259 stub -noname SHUnregisterWait @@ -475,10 +475,10 @@ 475 stub -noname GetShellSecurityDescriptor 476 stub -noname SHGetObjectCompatFlags 477 stub -noname SHCreatePropertyBagOnMemory -478 stub -noname IUnknown_TranslateAcceleratorIO +478 stdcall -noname IUnknown_TranslateAcceleratorIO(ptr ptr) 479 stub -noname IUnknown_UIActivateIO 480 stub -noname UrlCrackW -481 stub -noname IUnknown_HasFocusIO +481 stdcall -noname IUnknown_HasFocusIO(ptr) 482 stub -noname SHMessageBoxHelpA 483 stub -noname SHMessageBoxHelpW 484 stub -noname IUnknown_QueryServiceExec @@ -543,7 +543,7 @@ 548 stub -noname SHAreIconsEqual 549 stdcall -noname SHCoCreateInstanceAC(ptr ptr long ptr ptr) -550 stub -noname GetTemplateInfoFroHandle +550 stub -noname GetTemplateInfoFromHandle 551 stub -noname IShellFolder_CompareIDs @ stdcall AssocCreate(long long long long ptr ptr) _____ Modified: trunk/reactos/lib/shlwapi/string.c --- trunk/reactos/lib/shlwapi/string.c 2005-05-06 16:21:30 UTC (rev 15049) +++ trunk/reactos/lib/shlwapi/string.c 2005-05-06 16:23:24 UTC (rev 15050) @@ -1577,7 +1577,7 @@ ulKB = (ulKB - ulNextDigit) / 10; } while (ulKB > 0); - strncpy(lpszDest, szOut + 1, cchMax); + lstrcpynA(lpszDest, szOut + 1, cchMax); return lpszDest; } @@ -1605,7 +1605,7 @@ ulKB = (ulKB - ulNextDigit) / 10; } while (ulKB > 0); - strncpyW(lpszDest, szOut + 1, cchMax); + lstrcpynW(lpszDest, szOut + 1, cchMax); return lpszDest; } @@ -2027,7 +2027,7 @@ if (iDigits) /* Always write seconds if we have significant digits */ SHLWAPI_WriteTimeClass(szCopy, dwMS, szSec, iDigits); - strncpyW(lpszStr, szCopy, cchMax); + lstrcpynW(lpszStr, szCopy, cchMax); iRet = strlenW(lpszStr); } return iRet; @@ -2301,7 +2301,7 @@ sprintfW(wszBuff, bfFormats[i].lpwszFormat, dBytes); wszAdd[1] = bfFormats[i].wPrefix; strcatW(wszBuff, wszAdd); - strncpyW(lpszDest, wszBuff, cchMax); + lstrcpynW(lpszDest, wszBuff, cchMax); return lpszDest; } @@ -2546,7 +2546,7 @@ if (nWideCharCount < len - 1) { - mem = (LPSTR)HeapAlloc(GetProcessHeap(), 0, *lpiLen); + mem = HeapAlloc(GetProcessHeap(), 0, *lpiLen); if (!mem) return 0; @@ -2577,7 +2577,7 @@ reqLen = WideCharToMultiByte(CodePage, 0, lpSrcStr, len, NULL, 0, NULL, NULL); if (reqLen) { - mem = (LPSTR)HeapAlloc(GetProcessHeap(), 0, reqLen); + mem = HeapAlloc(GetProcessHeap(), 0, reqLen); if (mem) { reqLen = WideCharToMultiByte(CodePage, 0, lpSrcStr, len, mem, @@ -2638,9 +2638,6 @@ TRACE("(%s,%p,0x%08x)\n", debugstr_a(lpszSrc), lpszDst, iLen); - /* Our original version used lstrncpy/lstrlen, incorrectly filling up all - * of lpszDst with extra NULs. This version is correct, and faster too. - */ lpszRet = StrCpyNXA(lpszDst, lpszSrc, iLen); return lpszRet - lpszDst + 1; } _____ Modified: trunk/reactos/lib/shlwapi/url.c --- trunk/reactos/lib/shlwapi/url.c 2005-05-06 16:21:30 UTC (rev 15049) +++ trunk/reactos/lib/shlwapi/url.c 2005-05-06 16:23:24 UTC (rev 15050) @@ -238,7 +238,7 @@ /* see if known scheme and return indicator number */ len = WideCharToMultiByte(0, 0, y->pszProtocol, y->cchProtocol, 0, 0, 0, 0); - cmpstr = (LPSTR)HeapAlloc(GetProcessHeap(), 0, len); + cmpstr = HeapAlloc(GetProcessHeap(), 0, len); WideCharToMultiByte(0, 0, y->pszProtocol, y->cchProtocol, cmpstr, len, 0, 0); y->nScheme = URL_SCHEME_UNKNOWN; inet_pro = shlwapi_schemes; @@ -329,7 +329,7 @@ DWORD EscapeFlags; LPWSTR lpszUrlCpy, wk1, wk2, mp, root; INT nByteLen, state; - DWORD nLen; + DWORD nLen, nWkLen; TRACE("(%s %p %p 0x%08lx)\n", debugstr_w(pszUrl), pszCanonicalized, pcchCanonicalized, dwFlags); @@ -379,9 +379,10 @@ state = 4; break; case 3: - strcpyW(wk2, wk1); - wk1 += strlenW(wk1); - wk2 += strlenW(wk2); + nWkLen = strlenW(wk1); + memcpy(wk2, wk1, (nWkLen + 1) * sizeof(WCHAR)); + wk1 += nWkLen; + wk2 += nWkLen; break; case 4: if (!isalnumW(*wk1) && (*wk1 != L'-') && (*wk1 != L'.')) {state = 3; break;} @@ -401,13 +402,14 @@ TRACE("wk1=%c\n", (CHAR)*wk1); mp = strchrW(wk1, L'/'); if (!mp) { - strcpyW(wk2, wk1); - wk1 += strlenW(wk1); - wk2 += strlenW(wk2); + nWkLen = strlenW(wk1); + memcpy(wk2, wk1, (nWkLen + 1) * sizeof(WCHAR)); + wk1 += nWkLen; + wk2 += nWkLen; continue; } nLen = mp - wk1 + 1; - strncpyW(wk2, wk1, nLen); + memcpy(wk2, wk1, nLen * sizeof(WCHAR)); wk2 += nLen; wk1 += nLen; if (*wk1 == L'.') { @@ -517,7 +519,7 @@ if(!pszBase || !pszRelative || !pcchCombined) return E_INVALIDARG; - base = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, + base = HeapAlloc(GetProcessHeap(), 0, (3*INTERNET_MAX_URL_LENGTH) * sizeof(WCHAR)); relative = base + INTERNET_MAX_URL_LENGTH; combined = relative + INTERNET_MAX_URL_LENGTH; @@ -718,7 +720,7 @@ * Return the pszBase scheme with pszRelative. Basically * keeps the scheme and replaces the domain and following. */ - strncpyW(preliminary, base.pszProtocol, base.cchProtocol + 1); + memcpy(preliminary, base.pszProtocol, (base.cchProtocol + 1)*sizeof(WCHAR)); work = preliminary + base.cchProtocol + 1; strcpyW(work, relative.pszSuffix); if (!(dwFlags & URL_PLUGGABLE_PROTOCOL) && @@ -731,7 +733,7 @@ * after the location is pszRelative. (Replace document * from root on.) */ - strncpyW(preliminary, base.pszProtocol, base.cchProtocol+1+sizeloc); + memcpy(preliminary, base.pszProtocol, (base.cchProtocol+1+sizeloc)*sizeof(WCHAR)); work = preliminary + base.cchProtocol + 1 + sizeloc; if (dwFlags & URL_PLUGGABLE_PROTOCOL) *(work++) = L'/'; @@ -742,7 +744,8 @@ * Return the pszBase without its document (if any) and * append pszRelative after its scheme. */ - strncpyW(preliminary, base.pszProtocol, base.cchProtocol+1+base.cchSuffix); + memcpy(preliminary, base.pszProtocol, + (base.cchProtocol+1+base.cchSuffix)*sizeof(WCHAR)); work = preliminary + base.cchProtocol+1+base.cchSuffix - 1; if (*work++ != L'/') *(work++) = L'/'; @@ -1640,13 +1643,19 @@ base.cbSize = sizeof(base); res1 = ParseURLA(pszUrl, &base); if (res1) return FALSE; /* invalid scheme */ - if ((*base.pszSuffix == '/') && (*(base.pszSuffix+1) == '/')) - /* has scheme followed by 2 '/' */ - return FALSE; - return TRUE; + switch (base.nScheme) + { + case URL_SCHEME_MAILTO: + case URL_SCHEME_SHELL: + case URL_SCHEME_JAVASCRIPT: + case URL_SCHEME_VBSCRIPT: + case URL_SCHEME_ABOUT: + return TRUE; + } + return FALSE; case URLIS_FILEURL: - return !StrCmpNA("file://", pszUrl, 7); + return !StrCmpNA("file:", pszUrl, 5); case URLIS_DIRECTORY: last = pszUrl + strlen(pszUrl) - 1; @@ -1671,7 +1680,7 @@ */ BOOL WINAPI UrlIsW(LPCWSTR pszUrl, URLIS Urlis) { - static const WCHAR stemp[] = { 'f','i','l','e',':','/','/',0 }; + static const WCHAR stemp[] = { 'f','i','l','e',':',0 }; PARSEDURLW base; DWORD res1; [truncated at 1000 lines; 222 more skipped]

19 years, 4 months

← Newer
1
...
63
64
65
66
67
68
69
...
82
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 May 2005