Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[gvg] 15630: Robert Shearman <rob@codeweavers.com>

by gvg＠svn.reactos.com

Robert Shearman <rob(a)codeweavers.com> - Rename DllRegisterServer and DllUnregisterServer to avoid confusion with the COM functions of different signatures. 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-28 22:01:15 UTC (rev 15629) +++ trunk/reactos/subsys/system/msiexec/msiexec.c 2005-05-28 22:04:24 UTC (rev 15630) @@ -273,7 +273,7 @@ return proc; } -static DWORD DllRegisterServer(LPCWSTR DllName) +static DWORD DoDllRegisterServer(LPCWSTR DllName) { HRESULT hr; DLLREGISTERSERVER pfDllRegisterServer = NULL; @@ -293,7 +293,7 @@ return 0; } -static DWORD DllUnregisterServer(LPCWSTR DllName) +static DWORD DoDllUnregisterServer(LPCWSTR DllName) { HRESULT hr; DLLUNREGISTERSERVER pfDllUnregisterServer = NULL; @@ -887,11 +887,11 @@ } else if(FunctionDllRegisterServer) { - ReturnCode = DllRegisterServer(DllName); + ReturnCode = DoDllRegisterServer(DllName); } else if(FunctionDllUnregisterServer) { - ReturnCode = DllUnregisterServer(DllName); + ReturnCode = DoDllUnregisterServer(DllName); } else if (FunctionRegServer) {

19 years, 7 months

[gvg] 15629: Alexandre Julliard <julliard@winehq.org>

by gvg＠svn.reactos.com

Alexandre Julliard <julliard(a)winehq.org> - Added rules for building import libraries in the individual dll makefiles, and added support for building a .def.a static import library too. - Removed unnecessary code in the 16-bit DllEntryPoint function of some dlls, and also fixed its ordinal in a few places. Mike McCormack <mike(a)codeweavers.com> - Make WINMM_IData statically allocated. - Make multimedia threads high priority. Robert Reif <reif(a)earthlink.net> - Change FIXME to WARN. - Set thread priority for timer thread. - Add timer thread priority test. Modified: trunk/reactos/lib/winmm/Makefile.in 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/mmsystem.spec Modified: trunk/reactos/lib/winmm/playsound.c Modified: trunk/reactos/lib/winmm/time.c Modified: trunk/reactos/lib/winmm/winemm.h Modified: trunk/reactos/lib/winmm/winmm.c _____ Modified: trunk/reactos/lib/winmm/Makefile.in --- trunk/reactos/lib/winmm/Makefile.in 2005-05-28 22:00:46 UTC (rev 15628) +++ trunk/reactos/lib/winmm/Makefile.in 2005-05-28 22:01:15 UTC (rev 15629) @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winmm.dll +IMPORTLIB = libwinmm.$(IMPLIBEXT) IMPORTS = user32 advapi32 kernel32 ntdll EXTRALIBS = $(LIBUNICODE) _____ Modified: trunk/reactos/lib/winmm/mci.c --- trunk/reactos/lib/winmm/mci.c 2005-05-28 22:00:46 UTC (rev 15628) +++ trunk/reactos/lib/winmm/mci.c 2005-05-28 22:01:15 UTC (rev 15629) @@ -104,12 +104,12 @@ { LPWINE_MCIDRIVER wmd = 0; - EnterCriticalSection(&WINMM_IData->cs); - for (wmd = WINMM_IData->lpMciDrvs; wmd; wmd = wmd->lpNext) { + EnterCriticalSection(&WINMM_IData.cs); + for (wmd = WINMM_IData.lpMciDrvs; wmd; wmd = wmd->lpNext) { if (wmd->wDeviceID == wDevID) break; } - LeaveCriticalSection(&WINMM_IData->cs); + LeaveCriticalSection(&WINMM_IData.cs); return wmd; } @@ -127,8 +127,8 @@ if (!strcmpiW(lpstrName, wszAll)) return MCI_ALL_DEVICE_ID; - EnterCriticalSection(&WINMM_IData->cs); - for (wmd = WINMM_IData->lpMciDrvs; wmd; wmd = wmd->lpNext) { + EnterCriticalSection(&WINMM_IData.cs); + for (wmd = WINMM_IData.lpMciDrvs; wmd; wmd = wmd->lpNext) { if (wmd->lpstrElementName && strcmpW(wmd->lpstrElementName, lpstrName) == 0) { ret = wmd->wDeviceID; break; @@ -142,7 +142,7 @@ break; } } - LeaveCriticalSection(&WINMM_IData->cs); + LeaveCriticalSection(&WINMM_IData.cs); return ret; } @@ -679,7 +679,7 @@ /* well try to load id */ if (uDevType >= MCI_DEVTYPE_FIRST && uDevType <= MCI_DEVTYPE_LAST) { - if (LoadStringW(WINMM_IData->hWinMM32Instance, uDevType, buf, sizeof(buf) / sizeof(WCHAR))) { + if (LoadStringW(WINMM_IData.hWinMM32Instance, uDevType, buf, sizeof(buf) / sizeof(WCHAR))) { str = buf; } } else if (uDevType == 0) { @@ -688,15 +688,15 @@ } uTbl = MCI_NO_COMMAND_TABLE; if (str) { - HRSRC hRsrc = FindResourceW(WINMM_IData->hWinMM32Instance, str, (LPCWSTR)RT_RCDATA); + HRSRC hRsrc = FindResourceW(WINMM_IData.hWinMM32Instance, str, (LPCWSTR)RT_RCDATA); HANDLE hMem = 0; - if (hRsrc) hMem = LoadResource(WINMM_IData->hWinMM32Instance, hRsrc); + if (hRsrc) hMem = LoadResource(WINMM_IData.hWinMM32Instance, hRsrc); if (hMem) { uTbl = MCI_SetCommandTable(LockResource(hMem), uDevType); } else { WARN("No command table found in resource %p[%s]\n", - WINMM_IData->hWinMM32Instance, debugstr_w(str)); + WINMM_IData.hWinMM32Instance, debugstr_w(str)); } } TRACE("=> %d\n", uTbl); @@ -799,14 +799,14 @@ if (wmd->dwPrivate != 0) WARN("Unloading mci driver with non nul dwPrivate field\n"); - EnterCriticalSection(&WINMM_IData->cs); - for (tmp = &WINMM_IData->lpMciDrvs; *tmp; tmp = &(*tmp)->lpNext) { + EnterCriticalSection(&WINMM_IData.cs); + for (tmp = &WINMM_IData.lpMciDrvs; *tmp; tmp = &(*tmp)->lpNext) { if (*tmp == wmd) { *tmp = wmd->lpNext; break; } } - LeaveCriticalSection(&WINMM_IData->cs); + LeaveCriticalSection(&WINMM_IData.cs); HeapFree(GetProcessHeap(), 0, wmd->lpstrDeviceType); HeapFree(GetProcessHeap(), 0, wmd->lpstrAlias); @@ -871,12 +871,12 @@ wmd->dwYieldData = VK_CANCEL; wmd->CreatorThread = GetCurrentThreadId(); - EnterCriticalSection(&WINMM_IData->cs); + EnterCriticalSection(&WINMM_IData.cs); /* wmd must be inserted in list before sending opening the driver, coz' it * may want to lookup at wDevID */ - wmd->lpNext = WINMM_IData->lpMciDrvs; - WINMM_IData->lpMciDrvs = wmd; + wmd->lpNext = WINMM_IData.lpMciDrvs; + WINMM_IData.lpMciDrvs = wmd; for (modp.wDeviceID = MCI_MAGIC; MCI_GetDriver(modp.wDeviceID) != 0; @@ -884,7 +884,7 @@ wmd->wDeviceID = modp.wDeviceID; - LeaveCriticalSection(&WINMM_IData->cs); + LeaveCriticalSection(&WINMM_IData.cs); TRACE("wDevID=%04X \n", modp.wDeviceID); @@ -1195,7 +1195,7 @@ case MCI_RESOURCE_RETURNED: /* return string which ID is HIWORD(data[1]), * string is loaded from mmsystem.dll */ - LoadStringW(WINMM_IData->hWinMM32Instance, HIWORD(data[1]), + LoadStringW(WINMM_IData.hWinMM32Instance, HIWORD(data[1]), lpstrRet, uRetLen); break; case MCI_RESOURCE_RETURNED|MCI_RESOURCE_DRIVER: @@ -1647,7 +1647,7 @@ if (uDevType < MCI_DEVTYPE_FIRST || uDevType > MCI_DEVTYPE_LAST || - !LoadStringW(WINMM_IData->hWinMM32Instance, uDevType, + !LoadStringW(WINMM_IData.hWinMM32Instance, uDevType, strDevTyp, sizeof(strDevTyp) / sizeof(WCHAR))) { dwRet = MCIERR_BAD_INTEGER; goto errCleanUp; @@ -1762,17 +1762,17 @@ if (wDevID == MCI_ALL_DEVICE_ID) { LPWINE_MCIDRIVER next; - EnterCriticalSection(&WINMM_IData->cs); + EnterCriticalSection(&WINMM_IData.cs); /* FIXME: shall I notify once after all is done, or for * each of the open drivers ? if the latest, which notif * to return when only one fails ? */ - for (wmd = WINMM_IData->lpMciDrvs; wmd; ) { + for (wmd = WINMM_IData.lpMciDrvs; wmd; ) { next = wmd->lpNext; MCI_Close(wmd->wDeviceID, dwParam, lpParms); wmd = next; } - LeaveCriticalSection(&WINMM_IData->cs); + LeaveCriticalSection(&WINMM_IData.cs); return 0; } @@ -1832,11 +1832,11 @@ if (lpParms->wDeviceType < MCI_DEVTYPE_FIRST || lpParms->wDeviceType > MCI_DEVTYPE_LAST) { if (dwFlags & MCI_SYSINFO_OPEN) { TRACE("MCI_SYSINFO_QUANTITY: # of open MCI drivers\n"); - EnterCriticalSection(&WINMM_IData->cs); - for (wmd = WINMM_IData->lpMciDrvs; wmd; wmd = wmd->lpNext) { + EnterCriticalSection(&WINMM_IData.cs); + for (wmd = WINMM_IData.lpMciDrvs; wmd; wmd = wmd->lpNext) { cnt++; } - LeaveCriticalSection(&WINMM_IData->cs); + LeaveCriticalSection(&WINMM_IData.cs); } else { TRACE("MCI_SYSINFO_QUANTITY: # of installed MCI drivers\n"); if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, wszHklmMci, @@ -1850,11 +1850,11 @@ } else { if (dwFlags & MCI_SYSINFO_OPEN) { TRACE("MCI_SYSINFO_QUANTITY: # of open MCI drivers of type %u\n", lpParms->wDeviceType); - EnterCriticalSection(&WINMM_IData->cs); - for (wmd = WINMM_IData->lpMciDrvs; wmd; wmd = wmd->lpNext) { + EnterCriticalSection(&WINMM_IData.cs); + for (wmd = WINMM_IData.lpMciDrvs; wmd; wmd = wmd->lpNext) { if (wmd->wType == lpParms->wDeviceType) cnt++; } - LeaveCriticalSection(&WINMM_IData->cs); + LeaveCriticalSection(&WINMM_IData.cs); } else { TRACE("MCI_SYSINFO_QUANTITY: # of installed MCI drivers of type %u\n", lpParms->wDeviceType); FIXME("Don't know how to get # of MCI devices of a given type\n"); @@ -2135,7 +2135,7 @@ if (lpstrBuffer != NULL && uLength > 0 && wError >= MCIERR_BASE && wError <= MCIERR_CUSTOM_DRIVER_BASE) { - if (LoadStringW(WINMM_IData->hWinMM32Instance, + if (LoadStringW(WINMM_IData.hWinMM32Instance, wError, lpstrBuffer, uLength) > 0) { ret = TRUE; } @@ -2153,7 +2153,7 @@ if (lpstrBuffer != NULL && uLength > 0 && dwError >= MCIERR_BASE && dwError <= MCIERR_CUSTOM_DRIVER_BASE) { - if (LoadStringA(WINMM_IData->hWinMM32Instance, + if (LoadStringA(WINMM_IData.hWinMM32Instance, dwError, lpstrBuffer, uLength) > 0) { ret = TRUE; } _____ Modified: trunk/reactos/lib/winmm/mmio.c --- trunk/reactos/lib/winmm/mmio.c 2005-05-28 22:00:46 UTC (rev 15628) +++ trunk/reactos/lib/winmm/mmio.c 2005-05-28 22:01:15 UTC (rev 15629) @@ -440,12 +440,12 @@ { LPWINE_MMIO wm = NULL; - EnterCriticalSection(&WINMM_IData->cs); - for (wm = WINMM_IData->lpMMIO; wm; wm = wm->lpNext) { + EnterCriticalSection(&WINMM_IData.cs); + for (wm = WINMM_IData.lpMMIO; wm; wm = wm->lpNext) { if (wm->info.hmmio == h) break; } - LeaveCriticalSection(&WINMM_IData->cs); + LeaveCriticalSection(&WINMM_IData.cs); return wm; } @@ -461,13 +461,13 @@ wm = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WINE_MMIO)); if (wm) { - EnterCriticalSection(&WINMM_IData->cs); + EnterCriticalSection(&WINMM_IData.cs); /* lookup next unallocated WORD handle, with a non NULL value */ while (++MMIO_counter == 0 || MMIO_Get((HMMIO)(ULONG_PTR)MMIO_counter)); wm->info.hmmio = (HMMIO)(ULONG_PTR)MMIO_counter; - wm->lpNext = WINMM_IData->lpMMIO; - WINMM_IData->lpMMIO = wm; - LeaveCriticalSection(&WINMM_IData->cs); + wm->lpNext = WINMM_IData.lpMMIO; + WINMM_IData.lpMMIO = wm; + LeaveCriticalSection(&WINMM_IData.cs); } return wm; } @@ -481,9 +481,9 @@ { LPWINE_MMIO* m; - EnterCriticalSection(&WINMM_IData->cs); + EnterCriticalSection(&WINMM_IData.cs); /* search for the matching one... */ - m = &(WINMM_IData->lpMMIO); + m = &(WINMM_IData.lpMMIO); while (*m && *m != wm) m = &(*m)->lpNext; /* ...and destroy */ if (*m) { @@ -491,7 +491,7 @@ HeapFree(GetProcessHeap(), 0, wm); wm = NULL; } - LeaveCriticalSection(&WINMM_IData->cs); + LeaveCriticalSection(&WINMM_IData.cs); return wm ? FALSE : TRUE; } _____ Modified: trunk/reactos/lib/winmm/mmsystem.c --- trunk/reactos/lib/winmm/mmsystem.c 2005-05-28 22:00:46 UTC (rev 15628) +++ trunk/reactos/lib/winmm/mmsystem.c 2005-05-28 22:01:15 UTC (rev 15629) @@ -59,7 +59,7 @@ */ /*********************************************************************** *** - * DllEntryPoint (MMSYSTEM.2046) + * DllEntryPoint (MMSYSTEM.4) * * MMSYSTEM DLL entry point * @@ -74,12 +74,12 @@ /* need to load WinMM in order to: * - initiate correctly shared variables (WINMM_Init()) */ - if (!GetModuleHandleA("WINMM.DLL") && !LoadLibraryA("WINMM.DLL")) + if (!GetModuleHandleA("WINMM.DLL")) { ERR("Could not load sibling WinMM.dll\n"); return FALSE; } - WINMM_IData->hWinMM16Instance = hinstDLL; + WINMM_IData.hWinMM16Instance = hinstDLL; /* hook in our 16 bit function pointers */ pFnGetMMThread16 = WINMM_GetmmThread; pFnOpenDriver16 = DRIVER_OpenDriver16; @@ -91,7 +91,7 @@ MMDRV_Init16(); break; case DLL_PROCESS_DETACH: - WINMM_IData->hWinMM16Instance = 0; + WINMM_IData.hWinMM16Instance = 0; pFnGetMMThread16 = NULL; pFnOpenDriver16 = NULL; pFnCloseDriver16 = NULL; @@ -114,7 +114,7 @@ int WINAPI MMSYSTEM_WEP(HINSTANCE16 hInstance, WORD wDataSeg, WORD cbHeapSize, LPSTR lpCmdLine) { - FIXME("STUB: Unloading MMSystem DLL ... hInst=%04X \n", hInstance); + TRACE("STUB: Unloading MMSystem DLL ... hInst=%04X \n", hInstance); return TRUE; } @@ -1946,6 +1946,7 @@ CloseHandle(lpMMThd->hEvent); ret = 2; } else { + SetThreadPriority(lpMMThd->hThread, THREAD_PRIORITY_TIME_CRITICAL); TRACE("Got a nice thread hndl=%p id=0x%08lx\n", lpMMThd->hThread, lpMMThd->dwThreadID); ret = 0; } _____ Modified: trunk/reactos/lib/winmm/mmsystem.spec --- trunk/reactos/lib/winmm/mmsystem.spec 2005-05-28 22:00:46 UTC (rev 15628) +++ trunk/reactos/lib/winmm/mmsystem.spec 2005-05-28 22:01:15 UTC (rev 15629) @@ -1,6 +1,7 @@ -#1 pascal MMSYSTEM_WEP(word word word ptr) MMSYSTEM_WEP +1 pascal WEP(word word word ptr) MMSYSTEM_WEP 2 pascal sndPlaySound(ptr word) sndPlaySound16 3 pascal PlaySound(ptr word long) PlaySound16 +4 pascal DllEntryPoint(long word word word long word) MMSYSTEM_LibMain 5 pascal mmsystemGetVersion() mmsystemGetVersion16 6 pascal DriverProc(long word word long long) DriverProc16 8 pascal WMMMidiRunOnce() WMMMidiRunOnce16 @@ -171,6 +172,5 @@ #2005 stub MCIGETTHUNKTABLE #2006 stub WINMMSL_THUNKDATA16 -2046 pascal DllEntryPoint(long word word word long word) MMSYSTEM_LibMain # these are Wine only exported functions. Is there another way to do it ? 2047 pascal __wine_mmThreadEntryPoint(long) WINE_mmThreadEntryPoint _____ Modified: trunk/reactos/lib/winmm/playsound.c --- trunk/reactos/lib/winmm/playsound.c 2005-05-28 22:00:46 UTC (rev 15628) +++ trunk/reactos/lib/winmm/playsound.c 2005-05-28 22:01:15 UTC (rev 15629) @@ -194,11 +194,11 @@ { WINE_PLAYSOUND** p; - EnterCriticalSection(&WINMM_IData->cs); - for (p = &WINMM_IData->lpPlaySound; *p && *p != wps; p = &((*p)->lpNext)); + EnterCriticalSection(&WINMM_IData.cs); + for (p = &WINMM_IData.lpPlaySound; *p && *p != wps; p = &((*p)->lpNext)); if (*p) *p = (*p)->lpNext; - if (WINMM_IData->lpPlaySound == NULL) SetEvent(WINMM_IData->psLastEvent); - LeaveCriticalSection(&WINMM_IData->cs); + if (WINMM_IData.lpPlaySound == NULL) SetEvent(WINMM_IData.psLastEvent); + LeaveCriticalSection(&WINMM_IData.cs); if (wps->bAlloc) HeapFree(GetProcessHeap(), 0, (void*)wps->pszSound); if (wps->hThread) CloseHandle(wps->hThread); HeapFree(GetProcessHeap(), 0, wps); @@ -382,7 +382,7 @@ mmioSeek(hmmio, mmckInfo.dwDataOffset, SEEK_SET); while (left) { - if (WaitForSingleObject(WINMM_IData->psStopEvent, 0) == WAIT_OBJECT_0) + if (WaitForSingleObject(WINMM_IData.psStopEvent, 0) == WAIT_OBJECT_0) { wps->bLoop = FALSE; break; @@ -430,7 +430,7 @@ /* FIXME? I see no difference between SND_NOWAIT and SND_NOSTOP ! * there could be one if several sounds can be played at once... */ - if ((fdwSound & (SND_NOWAIT | SND_NOSTOP)) && WINMM_IData->lpPlaySound != NULL) + if ((fdwSound & (SND_NOWAIT | SND_NOSTOP)) && WINMM_IData.lpPlaySound != NULL) return FALSE; /* alloc internal structure, if we need to play something */ @@ -440,27 +440,27 @@ return FALSE; } - EnterCriticalSection(&WINMM_IData->cs); + EnterCriticalSection(&WINMM_IData.cs); /* since several threads can enter PlaySound in parallel, we're not * sure, at this point, that another thread didn't start a new playsound */ - while (WINMM_IData->lpPlaySound != NULL) + while (WINMM_IData.lpPlaySound != NULL) { - ResetEvent(WINMM_IData->psLastEvent); + ResetEvent(WINMM_IData.psLastEvent); /* FIXME: doc says we have to stop all instances of pszSound if it's non * NULL... as of today, we stop all playing instances */ - SetEvent(WINMM_IData->psStopEvent); + SetEvent(WINMM_IData.psStopEvent); - LeaveCriticalSection(&WINMM_IData->cs); - WaitForSingleObject(WINMM_IData->psLastEvent, INFINITE); - EnterCriticalSection(&WINMM_IData->cs); + LeaveCriticalSection(&WINMM_IData.cs); + WaitForSingleObject(WINMM_IData.psLastEvent, INFINITE); + EnterCriticalSection(&WINMM_IData.cs); - ResetEvent(WINMM_IData->psStopEvent); + ResetEvent(WINMM_IData.psStopEvent); } - if (wps) wps->lpNext = WINMM_IData->lpPlaySound; - WINMM_IData->lpPlaySound = wps; - LeaveCriticalSection(&WINMM_IData->cs); + if (wps) wps->lpNext = WINMM_IData.lpPlaySound; + WINMM_IData.lpPlaySound = wps; + LeaveCriticalSection(&WINMM_IData.cs); if (!pszSound || (fdwSound & SND_PURGE)) return TRUE; @@ -471,6 +471,7 @@ wps->bLoop = (fdwSound & SND_LOOP) ? TRUE : FALSE; if ((handle = CreateThread(NULL, 0, proc_PlaySound, wps, 0, &id)) != 0) { wps->hThread = handle; + SetThreadPriority(handle, THREAD_PRIORITY_TIME_CRITICAL); return TRUE; } } _____ Modified: trunk/reactos/lib/winmm/time.c --- trunk/reactos/lib/winmm/time.c 2005-05-28 22:00:46 UTC (rev 15628) +++ trunk/reactos/lib/winmm/time.c 2005-05-28 22:01:15 UTC (rev 15629) @@ -264,7 +264,8 @@ TIME_TimersList = NULL; TIME_hWakeEvent = CreateEventW(NULL, FALSE, FALSE, NULL); TIME_TimeToDie = FALSE; - TIME_hMMTimer = CreateThread(NULL, 0, TIME_MMSysTimeThread, WINMM_IData, 0, NULL); + TIME_hMMTimer = CreateThread(NULL, 0, TIME_MMSysTimeThread, &WINMM_IData, 0, NULL); + SetThreadPriority(TIME_hMMTimer, THREAD_PRIORITY_TIME_CRITICAL); } } @@ -334,7 +335,7 @@ lpNewTimer->dwUser = dwUser; lpNewTimer->wFlags = wFlags; - EnterCriticalSection(&WINMM_IData->cs); + EnterCriticalSection(&WINMM_IData.cs); if ((wFlags & TIME_KILL_SYNCHRONOUS) && !TIME_hKillEvent) TIME_hKillEvent = CreateEventW(NULL, TRUE, TRUE, NULL); @@ -347,7 +348,7 @@ TIME_TimersList = lpNewTimer; lpNewTimer->wTimerID = wNewID + 1; - LeaveCriticalSection(&WINMM_IData->cs); + LeaveCriticalSection(&WINMM_IData.cs); /* Wake the service thread in case there is work to be done */ SetEvent(TIME_hWakeEvent); @@ -378,7 +379,7 @@ LPWINE_TIMERENTRY lpSelf = NULL, *lpTimer; TRACE("(%u)\n", wID); - EnterCriticalSection(&WINMM_IData->cs); + EnterCriticalSection(&WINMM_IData.cs); /* remove WINE_TIMERENTRY from list */ for (lpTimer = &TIME_TimersList; *lpTimer; lpTimer = &(*lpTimer)->lpNext) { if (wID == (*lpTimer)->wTimerID) { @@ -388,7 +389,7 @@ break; } } - LeaveCriticalSection(&WINMM_IData->cs); + LeaveCriticalSection(&WINMM_IData.cs); if (!lpSelf) { @@ -433,7 +434,7 @@ if (wPeriod > MMSYSTIME_MININTERVAL) { - FIXME("Stub; we set our timer resolution at minimum\n"); + WARN("Stub; we set our timer resolution at minimum\n"); } return 0; @@ -449,7 +450,7 @@ if (wPeriod > MMSYSTIME_MININTERVAL) { - FIXME("Stub; we set our timer resolution at minimum\n"); + WARN("Stub; we set our timer resolution at minimum\n"); } return 0; } _____ Modified: trunk/reactos/lib/winmm/winemm.h --- trunk/reactos/lib/winmm/winemm.h 2005-05-28 22:00:46 UTC (rev 15628) +++ trunk/reactos/lib/winmm/winemm.h 2005-05-28 22:01:15 UTC (rev 15629) @@ -292,7 +292,7 @@ void TIME_MMTimeStop(void); /* Global variables */ -extern LPWINE_MM_IDATA WINMM_IData; +extern WINE_MM_IDATA WINMM_IData; /* pointers to 16 bit functions (if sibling MMSYSTEM.DLL is loaded * NULL otherwise _____ Modified: trunk/reactos/lib/winmm/winmm.c --- trunk/reactos/lib/winmm/winmm.c 2005-05-28 22:00:46 UTC (rev 15628) +++ trunk/reactos/lib/winmm/winmm.c 2005-05-28 22:01:15 UTC (rev 15629) @@ -65,25 +65,23 @@ * G L O B A L S E T T I N G S * ======================================================================== */ -LPWINE_MM_IDATA WINMM_IData /* = NULL */; +WINE_MM_IDATA WINMM_IData; /*********************************************************************** *** * WINMM_CreateIData [internal] */ static BOOL WINMM_CreateIData(HINSTANCE hInstDLL) { - WINMM_IData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WINE_MM_IDATA)); + memset( &WINMM_IData, 0, sizeof WINMM_IData ); - if (!WINMM_IData) - return FALSE; - WINMM_IData->hWinMM32Instance = hInstDLL; - InitializeCriticalSection(&WINMM_IData->cs); + WINMM_IData.hWinMM32Instance = hInstDLL; + InitializeCriticalSection(&WINMM_IData.cs); /* FIXME crashes in ReactOS - WINMM_IData->cs.DebugInfo->Spare[1] = (DWORD)"WINMM_IData"; + WINMM_IData.cs.DebugInfo->Spare[1] = (DWORD)"WINMM_IData"; */ - WINMM_IData->psStopEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - WINMM_IData->psLastEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - TRACE("Created IData (%p)\n", WINMM_IData); + WINMM_IData.psStopEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + WINMM_IData.psLastEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + TRACE("Initialized IData (%p)\n", &WINMM_IData); return TRUE; } @@ -92,17 +90,13 @@ */ static void WINMM_DeleteIData(void) { - if (WINMM_IData) { - TIME_MMTimeStop(); + TIME_MMTimeStop(); - /* FIXME: should also free content and resources allocated - * inside WINMM_IData */ - CloseHandle(WINMM_IData->psStopEvent); - CloseHandle(WINMM_IData->psLastEvent); - DeleteCriticalSection(&WINMM_IData->cs); - HeapFree(GetProcessHeap(), 0, WINMM_IData); - WINMM_IData = NULL; - } + /* FIXME: should also free content and resources allocated + * inside WINMM_IData */ + CloseHandle(WINMM_IData.psStopEvent); + CloseHandle(WINMM_IData.psLastEvent); + DeleteCriticalSection(&WINMM_IData.cs); } /****************************************************************** @@ -867,7 +861,7 @@ * a warning for the test was always true */ (/*uError >= MMSYSERR_BASE && */ uError <= MMSYSERR_LASTERROR) || (uError >= MIDIERR_BASE && uError <= MIDIERR_LASTERROR)) { - if (LoadStringW(WINMM_IData->hWinMM32Instance, + if (LoadStringW(WINMM_IData.hWinMM32Instance, uError, lpText, uSize) > 0) { ret = MMSYSERR_NOERROR; } @@ -1796,6 +1790,7 @@ midiStreamClose((HMIDISTRM)hMidiOut); return MMSYSERR_NOMEM; } + SetThreadPriority(lpMidiStrm->hThread, THREAD_PRIORITY_TIME_CRITICAL); /* wait for thread to have started, and for its queue to be created */ { @@ -2177,7 +2172,7 @@ * a warning for the test was always true */ (/*uError >= MMSYSERR_BASE && */ uError <= MMSYSERR_LASTERROR) || (uError >= WAVERR_BASE && uError <= WAVERR_LASTERROR)) { - if (LoadStringW(WINMM_IData->hWinMM32Instance, + if (LoadStringW(WINMM_IData.hWinMM32Instance, uError, lpText, uSize) > 0) { ret = MMSYSERR_NOERROR; } @@ -2807,6 +2802,7 @@ if (hEvent) CloseHandle(hEvent); return TASKERR_OUTOFMEMORY; } + SetThreadPriority(hThread, THREAD_PRIORITY_TIME_CRITICAL); if (ph) *ph = hEvent; CloseHandle(hThread); return 0;

19 years, 7 months

[jimtabor] 15628: Added def to xml file.

by jimtabor＠svn.reactos.com

Added def to xml file. Modified: trunk/reactos/drivers/usb/usbport/usbport.xml _____ Modified: trunk/reactos/drivers/usb/usbport/usbport.xml --- trunk/reactos/drivers/usb/usbport/usbport.xml 2005-05-28 22:00:27 UTC (rev 15627) +++ trunk/reactos/drivers/usb/usbport/usbport.xml 2005-05-28 22:00:46 UTC (rev 15628) @@ -1,4 +1,5 @@ <module name="usbport" type="kernelmodedriver" installbase="system32/drivers" installname="usbport.sys"> + <importlibrary definition="usbport.def" /> <define name="__USE_W32API" /> <include base="ntoskrnl">include</include> <library>ntoskrnl</library>

19 years, 7 months

[jimtabor] 15627: Added def to xml file.

by jimtabor＠svn.reactos.com

Added def to xml file. Modified: trunk/reactos/drivers/usb/usbd/usbd.xml _____ Modified: trunk/reactos/drivers/usb/usbd/usbd.xml --- trunk/reactos/drivers/usb/usbd/usbd.xml 2005-05-28 21:46:37 UTC (rev 15626) +++ trunk/reactos/drivers/usb/usbd/usbd.xml 2005-05-28 22:00:27 UTC (rev 15627) @@ -1,4 +1,5 @@ <module name="usbd" type="kernelmodedriver" installbase="system32/drivers" installname="usbd.sys"> + <importlibrary definition="usbd.def" /> <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library>

19 years, 7 months

[ion] 15626: use right optimization setting

by ion＠svn.reactos.com

use right optimization setting Modified: trunk/reactos/ReactOS.xml _____ Modified: trunk/reactos/ReactOS.xml --- trunk/reactos/ReactOS.xml 2005-05-28 21:44:21 UTC (rev 15625) +++ trunk/reactos/ReactOS.xml 2005-05-28 21:46:37 UTC (rev 15626) @@ -15,7 +15,7 @@ <property name="DBG_OR_KDBG" value="true" /> </if> <if property="DBG" value="0"> - <compilerflag>-O2</compilerflag> + <compilerflag>-Os</compilerflag> <compilerflag>-Wno-strict-aliasing</compilerflag> <compilerflag>-ftracer</compilerflag> <compilerflag>-momit-leaf-frame-pointer</compilerflag>

19 years, 7 months

[gvg] 15625: Alexandre Julliard <julliard@winehq.org>

by gvg＠svn.reactos.com

Alexandre Julliard <julliard(a)winehq.org> - Added rules for building import libraries in the individual dll makefiles, and added support for building a .def.a static import library too. Troy Rollo <wine(a)troy.rollo.name> - Implement URLMonikerImpl_BindToStorage. - Correct bug truncating downloaded files to 4096 bytes. Jacek Caban <jack(a)itma.pwr.wroc.pl> - Separated IBinding and IMoniker interfaces. Mike McCormack <mike(a)codeweavers.com> - Add the missing interface method PromptAction to IInternetZoneManager. - Stub implementation for GetSoftwareUpdateInfo. Francois Gouget <fgouget(a)free.fr> - Update win32.api to match the current sources. - Declare CoGetClassObjectFromURL() in urlmon.h. Christian Costa <titan.costa(a)wanadoo.fr> - Added stub implementation for CoGetClassObjectFromURL. Modified: trunk/reactos/lib/urlmon/Makefile.in Modified: trunk/reactos/lib/urlmon/sec_mgr.c Modified: trunk/reactos/lib/urlmon/umon.c Added: trunk/reactos/lib/urlmon/umstream.c Modified: trunk/reactos/lib/urlmon/urlmon.spec Modified: trunk/reactos/lib/urlmon/urlmon.xml Modified: trunk/reactos/lib/urlmon/urlmon_main.c Modified: trunk/reactos/lib/urlmon/urlmon_main.h _____ Modified: trunk/reactos/lib/urlmon/Makefile.in --- trunk/reactos/lib/urlmon/Makefile.in 2005-05-28 21:40:01 UTC (rev 15624) +++ trunk/reactos/lib/urlmon/Makefile.in 2005-05-28 21:44:21 UTC (rev 15625) @@ -3,6 +3,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = urlmon.dll +IMPORTLIB = liburlmon.$(IMPLIBEXT) IMPORTS = cabinet ole32 shlwapi wininet user32 advapi32 kernel32 ntdll EXTRALIBS = -luuid @@ -10,6 +11,7 @@ regsvr.c \ sec_mgr.c \ umon.c \ + umstream.c \ urlmon_main.c SUBDIRS = tests _____ Modified: trunk/reactos/lib/urlmon/sec_mgr.c --- trunk/reactos/lib/urlmon/sec_mgr.c 2005-05-28 21:40:01 UTC (rev 15624) +++ trunk/reactos/lib/urlmon/sec_mgr.c 2005-05-28 21:44:21 UTC (rev 15625) @@ -353,6 +353,21 @@ } /******************************************************************** + * IInternetZoneManager_PromptAction + */ +static HRESULT WINAPI ZoneMgrImpl_PromptAction(IInternetZoneManager* iface, + DWORD dwAction, + HWND hwndParent, + LPCWSTR pwszUrl, + LPCWSTR pwszText, + DWORD dwPromptFlags) +{ + FIXME("%p %08lx %p %s %s %08lx\n", iface, dwAction, hwndParent, + debugstr_w(pwszUrl), debugstr_w(pwszText), dwPromptFlags ); + return E_NOTIMPL; +} + +/******************************************************************** * IInternetZoneManager_LogAction */ static HRESULT WINAPI ZoneMgrImpl_LogAction(IInternetZoneManager* iface, @@ -425,12 +440,14 @@ ZoneMgrImpl_SetZoneCustomPolicy, ZoneMgrImpl_GetZoneActionPolicy, ZoneMgrImpl_SetZoneActionPolicy, + ZoneMgrImpl_PromptAction, ZoneMgrImpl_LogAction, ZoneMgrImpl_CreateZoneEnumerator, ZoneMgrImpl_GetZoneAt, ZoneMgrImpl_DestroyZoneEnumerator, ZoneMgrImpl_CopyTemplatePoliciesToZone, }; + HRESULT ZoneMgrImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) { ZoneMgrImpl* ret = HeapAlloc(GetProcessHeap(), 0, sizeof(ZoneMgrImpl)); _____ Modified: trunk/reactos/lib/urlmon/umon.c --- trunk/reactos/lib/urlmon/umon.c 2005-05-28 21:40:01 UTC (rev 15624) +++ trunk/reactos/lib/urlmon/umon.c 2005-05-28 21:44:21 UTC (rev 15625) @@ -48,19 +48,252 @@ /*static BOOL registered_wndclass = FALSE;*/ +typedef struct { + IBindingVtbl *lpVtbl; + + ULONG ref; + + LPWSTR URLName; + + HWND hwndCallback; + IBindCtx *pBC; + HINTERNET hinternet, hconnect, hrequest; + HANDLE hCacheFile; + IUMCacheStream *pstrCache; + IBindStatusCallback *pbscb; + DWORD total_read, expected_size; +} Binding; + +static HRESULT WINAPI Binding_QueryInterface(IBinding* iface, REFIID riid, void **ppvObject) +{ + Binding *This = (Binding*)iface; + + TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppvObject); + + if((This == NULL) || (ppvObject == NULL)) + return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IBinding, riid)) { + *ppvObject = iface; + IBinding_AddRef(iface); + return S_OK; + } + + *ppvObject = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI Binding_AddRef(IBinding* iface) +{ + Binding *This = (Binding*)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%ld\n", This, ref); + + return ref; +} + +static ULONG WINAPI Binding_Release(IBinding* iface) +{ + Binding *This = (Binding*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%ld\n",This, ref); + + if(!ref) { + HeapFree(GetProcessHeap(), 0, This->URLName); + if (This->hCacheFile) + CloseHandle(This->hCacheFile); + if (This->pstrCache) + { + UMCloseCacheFileStream(This->pstrCache); + IStream_Release((IStream *)This->pstrCache); + } + if (This->pbscb) + IBindStatusCallback_Release(This->pbscb); + + HeapFree(GetProcessHeap(), 0, This); + + URLMON_UnlockModule(); + } + + return ref; +} + +static HRESULT WINAPI Binding_Abort(IBinding* iface) +{ + Binding *This = (Binding*)iface; + + FIXME("(%p): stub\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI Binding_GetBindResult(IBinding* iface, CLSID* pclsidProtocol, DWORD* pdwResult, LPOLESTR* pszResult, DWORD* pdwReserved) +{ + Binding *This = (Binding*)iface; + + FIXME("(%p)->(%p, %p, %p, %p): stub\n", This, pclsidProtocol, pdwResult, pszResult, pdwReserved); + + return E_NOTIMPL; +} + +static HRESULT WINAPI Binding_GetPriority(IBinding* iface, LONG* pnPriority) +{ + Binding *This = (Binding*)iface; + + FIXME("(%p)->(%p): stub\n", This, pnPriority); + + return E_NOTIMPL; +} + +static HRESULT WINAPI Binding_Resume(IBinding* iface) +{ + Binding *This = (Binding*)iface; + + FIXME("(%p): stub\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI Binding_SetPriority(IBinding* iface, LONG nPriority) +{ + Binding *This = (Binding*)iface; + + FIXME("(%p)->(%ld): stub\n", This, nPriority); + + return E_NOTIMPL; +} + +static HRESULT WINAPI Binding_Suspend(IBinding* iface) +{ + Binding *This = (Binding*)iface; + + FIXME("(%p): stub\n", This); + + return E_NOTIMPL; +} + +static void Binding_CloseCacheDownload(Binding *This) +{ + CloseHandle(This->hCacheFile); + This->hCacheFile = 0; + UMCloseCacheFileStream(This->pstrCache); + IStream_Release((IStream *)This->pstrCache); + This->pstrCache = 0; +} + +static HRESULT Binding_MoreCacheData(Binding *This, char *buf, DWORD dwBytes) +{ + DWORD written; + + if (WriteFile(This->hCacheFile, buf, dwBytes, &written, NULL) && written == dwBytes) + { + HRESULT hr; + + This->total_read += written; + hr = IBindStatusCallback_OnProgress(This->pbscb, + This->total_read + written, + This->expected_size, + (This->total_read == written) ? + BINDSTATUS_BEGINDOWNLOADDATA : + BINDSTATUS_DOWNLOADINGDATA, + NULL); + if (!hr) + { + STGMEDIUM stg; + FORMATETC fmt; + + fmt.cfFormat = 0; + fmt.ptd = NULL; + fmt.dwAspect = 0; + fmt.lindex = -1; + fmt.tymed = TYMED_ISTREAM; + + stg.tymed = TYMED_ISTREAM; + stg.u.pstm = (IStream *)This->pstrCache; + stg.pUnkForRelease = NULL; + + hr = IBindStatusCallback_OnDataAvailable(This->pbscb, + (This->total_read == written) ? + BSCF_FIRSTDATANOTIFICATION : + BSCF_INTERMEDIATEDATANOTIFICATION, + This->total_read + written, + &fmt, + &stg); + } + if (written < dwBytes) + return STG_E_MEDIUMFULL; + else + return hr; + } + return HRESULT_FROM_WIN32(GetLastError()); +} + +static void Binding_FinishedDownload(Binding *This, HRESULT hr) +{ + STGMEDIUM stg; + FORMATETC fmt; + + fmt.ptd = NULL; + fmt.dwAspect = 0; + fmt.lindex = -1; + fmt.tymed = TYMED_ISTREAM; + + stg.tymed = TYMED_ISTREAM; + stg.u.pstm = (IStream *)This->pstrCache; + stg.pUnkForRelease = NULL; + + IBindStatusCallback_OnProgress(This->pbscb, This->total_read, This->expected_size, BINDSTATUS_ENDDOWNLOADDATA, NULL); + IBindStatusCallback_OnDataAvailable(This->pbscb, BSCF_LASTDATANOTIFICATION, This->total_read, &fmt, &stg); + if (hr) + { + WCHAR *pwchError = 0; + + FormatMessageW (FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_ALLOCATE_BUFFER, + NULL, (DWORD) hr, + 0, (LPWSTR) &pwchError, + 0, NULL); + if (!pwchError) + { + static WCHAR achFormat[] = { '%', '0', '8', 'x', 0 }; + + pwchError =(WCHAR *) LocalAlloc(LMEM_FIXED, sizeof(WCHAR) * 9); + wsprintfW(pwchError, achFormat, hr); + } + IBindStatusCallback_OnStopBinding(This->pbscb, hr, pwchError); + LocalFree(pwchError); + } + else + { + IBindStatusCallback_OnStopBinding(This->pbscb, hr, NULL); + } + IBindStatusCallback_Release(This->pbscb); + This->pbscb = 0; +} + +static IBindingVtbl BindingVtbl = +{ + Binding_QueryInterface, + Binding_AddRef, + Binding_Release, + Binding_Abort, + Binding_Suspend, + Binding_Resume, + Binding_SetPriority, + Binding_GetPriority, + Binding_GetBindResult +}; + /* filemoniker data structure */ -typedef struct URLMonikerImpl{ +typedef struct { - IMonikerVtbl* lpvtbl1; /* VTable relative to the IMoniker interface.*/ - IBindingVtbl* lpvtbl2; /* VTable to IBinding interface */ + IMonikerVtbl* lpvtbl; /* VTable relative to the IMoniker interface.*/ ULONG ref; /* reference counter for this object */ LPOLESTR URLName; /* URL string identified by this URLmoniker */ - - HWND hwndCallback; - IBindCtx *pBC; - HINTERNET hinternet, hconnect, hrequest; } URLMonikerImpl; /*********************************************************************** ******** @@ -133,6 +366,7 @@ return refCount; } + /*********************************************************************** ******* * URLMoniker_GetClassID ************************************************************************ ******/ @@ -310,6 +544,8 @@ return; } #endif + + /*********************************************************************** ******* * URLMoniker_BindToStorage ************************************************************************ ******/ @@ -321,12 +557,12 @@ { URLMonikerImpl *This = (URLMonikerImpl *)iface; HRESULT hres; - IBindStatusCallback *pbscb; BINDINFO bi; DWORD bindf; - IStream *pstr; + WCHAR szFileName[MAX_PATH + 1]; + Binding *bind; + int len; - FIXME("(%p)->(%p,%p,%s,%p): stub\n",This,pbc,pmkToLeft,debugstr_guid(riid),ppvObject); if(pmkToLeft) { FIXME("pmkToLeft != NULL\n"); return E_NOTIMPL; @@ -336,122 +572,288 @@ return E_NOTIMPL; } - /* FIXME This is a bad hack (tm). We should clearly download to a temporary file. - We also need to implement IStream ourselves so that IStream_Read can return - E_PENDING */ + bind = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(Binding)); + bind->lpVtbl = &BindingVtbl; + bind->ref = 1; + URLMON_LockModule(); - hres = CreateStreamOnHGlobal(0, TRUE, &pstr); + len = lstrlenW(This->URLName)+1; + bind->URLName = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + memcpy(bind->URLName, This->URLName, len*sizeof(WCHAR)); + hres = UMCreateStreamOnCacheFile(bind->URLName, 0, szFileName, &bind->hCacheFile, &bind->pstrCache); + if(SUCCEEDED(hres)) { - TRACE("Created dummy stream...\n"); + TRACE("Created stream...\n"); - hres = IBindCtx_GetObjectParam(pbc, (LPOLESTR)BSCBHolder, (IUnknown**)&pbscb); + *ppvObject = (void *) bind->pstrCache; + IStream_AddRef((IStream *) bind->pstrCache); + + hres = IBindCtx_GetObjectParam(pbc, (LPOLESTR)BSCBHolder, (IUnknown**)&bind->pbscb); if(SUCCEEDED(hres)) { TRACE("Got IBindStatusCallback...\n"); memset(&bi, 0, sizeof(bi)); bi.cbSize = sizeof(bi); bindf = 0; - hres = IBindStatusCallback_GetBindInfo(pbscb, &bindf, &bi); + hres = IBindStatusCallback_GetBindInfo(bind->pbscb, &bindf, &bi); if(SUCCEEDED(hres)) { + WCHAR *urlcopy, *tmpwc; URL_COMPONENTSW url; - WCHAR *host, *path; - DWORD len, lensz = sizeof(len), total_read = 0; - LARGE_INTEGER last_read_pos; - FORMATETC fmt; - STGMEDIUM stg; + WCHAR *host, *path, *user, *pass; + DWORD lensz = sizeof(bind->expected_size); + DWORD dwService = 0; + BOOL bSuccess; TRACE("got bindinfo. bindf = %08lx extrainfo = %s bindinfof = %08lx bindverb = %08lx iid %s\n", bindf, debugstr_w(bi.szExtraInfo), bi.grfBindInfoF, bi.dwBindVerb, debugstr_guid(&bi.iid)); - hres = IBindStatusCallback_OnStartBinding(pbscb, 0, (IBinding*)&This->lpvtbl2); + hres = IBindStatusCallback_OnStartBinding(bind->pbscb, 0, (IBinding*)bind); TRACE("OnStartBinding rets %08lx\n", hres); + /* This class will accept URLs with the backslash in them. But InternetCrackURL will not - it + * requires forward slashes (this is the behaviour of Microsoft's INETAPI). So we need to make + * a copy of the URL here and change the backslash to a forward slash everywhere it appears - + * but only before any '#' or '?', after which backslash should be left alone. + */ + urlcopy = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * (lstrlenW(bind->URLName) + 1)); + lstrcpyW(urlcopy, bind->URLName); + for (tmpwc = urlcopy; *tmpwc && *tmpwc != '#' && *tmpwc != '?'; ++tmpwc) + if (*tmpwc == '\\') + *tmpwc = '/'; + #if 0 - if(!registered_wndclass) { + if(!registered_wndclass) { WNDCLASSA urlmon_wndclass = {0, URLMON_WndProc,0, 0, URLMON_hInstance, 0, 0, 0, NULL, "URLMON_Callback_Window_Class"}; - RegisterClassA(&urlmon_wndclass); - registered_wndclass = TRUE; - } + RegisterClassA(&urlmon_wndclass); + registered_wndclass = TRUE; + } - This->hwndCallback = CreateWindowA("URLMON_Callback_Window_Class", NULL, 0, 0, 0, 0, 0, 0, 0, - URLMON_hInstance, NULL); + This->hwndCallback = CreateWindowA("URLMON_Callback_Window_Class", NULL, 0, 0, 0, 0, 0, 0, 0, + URLMON_hInstance, NULL); #endif + bind->expected_size = 0; + bind->total_read = 0; + memset(&url, 0, sizeof(url)); url.dwStructSize = sizeof(url); - url.dwSchemeLength = url.dwHostNameLength = url.dwUrlPathLength = 1; - InternetCrackUrlW(This->URLName, 0, 0, &url); + url.dwSchemeLength = url.dwHostNameLength = url.dwUrlPathLength = url.dwUserNameLength = url.dwPasswordLength = 1; + InternetCrackUrlW(urlcopy, 0, 0, &url); host = HeapAlloc(GetProcessHeap(), 0, (url.dwHostNameLength + 1) * sizeof(WCHAR)); memcpy(host, url.lpszHostName, url.dwHostNameLength * sizeof(WCHAR)); host[url.dwHostNameLength] = '\0'; path = HeapAlloc(GetProcessHeap(), 0, (url.dwUrlPathLength + 1) * sizeof(WCHAR)); memcpy(path, url.lpszUrlPath, url.dwUrlPathLength * sizeof(WCHAR)); path[url.dwUrlPathLength] = '\0'; + if (url.dwUserNameLength) + { + user = HeapAlloc(GetProcessHeap(), 0, ((url.dwUserNameLength + 1) * sizeof(WCHAR))); + memcpy(user, url.lpszUserName, url.dwUserNameLength * sizeof(WCHAR)); + user[url.dwUserNameLength] = 0; + } + else + { + user = 0; + } + if (url.dwPasswordLength) + { + pass = HeapAlloc(GetProcessHeap(), 0, ((url.dwPasswordLength + 1) * sizeof(WCHAR))); + memcpy(pass, url.lpszPassword, url.dwPasswordLength * sizeof(WCHAR)); + pass[url.dwPasswordLength] = 0; + } + else + { + pass = 0; + } - This->hinternet = InternetOpenA("User Agent", 0, NULL, NULL, 0 /*INTERNET_FLAG_ASYNC*/); -/* InternetSetStatusCallback(This->hinternet, URLMON_InternetCallback);*/ + switch ((DWORD) url.nScheme) + { + case INTERNET_SCHEME_FTP: + case INTERNET_SCHEME_GOPHER: + case INTERNET_SCHEME_HTTP: + case INTERNET_SCHEME_HTTPS: - This->hconnect = InternetConnectW(This->hinternet, host, INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, - INTERNET_SERVICE_HTTP, 0, (DWORD)This); - This->hrequest = HttpOpenRequestW(This->hconnect, NULL, path, NULL, NULL, NULL, 0, (DWORD)This); + bind->hinternet = InternetOpenA("User Agent", 0, NULL, NULL, 0 /*INTERNET_FLAG_ASYNC*/); +/* InternetSetStatusCallback(bind->hinternet, URLMON_InternetCallback);*/ + if (!bind->hinternet) + { + hres = HRESULT_FROM_WIN32(GetLastError()); + break; + } - hres = IBindStatusCallback_OnProgress(pbscb, 0, 0, 0x22, NULL); - hres = IBindStatusCallback_OnProgress(pbscb, 0, 0, BINDSTATUS_FINDINGRESOURCE, NULL); - hres = IBindStatusCallback_OnProgress(pbscb, 0, 0, BINDSTATUS_CONNECTING, NULL); - hres = IBindStatusCallback_OnProgress(pbscb, 0, 0, BINDSTATUS_SENDINGREQUEST, NULL); - hres = E_OUTOFMEMORY; /* FIXME */ - if(HttpSendRequestW(This->hrequest, NULL, 0, NULL, 0)) { - len = 0; - HttpQueryInfoW(This->hrequest, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &len, &lensz, NULL); + switch ((DWORD) url.nScheme) + { + case INTERNET_SCHEME_FTP: + if (!url.nPort) + url.nPort = INTERNET_DEFAULT_FTP_PORT; + dwService = INTERNET_SERVICE_FTP; + break; + + case INTERNET_SCHEME_GOPHER: + if (!url.nPort) + url.nPort = INTERNET_DEFAULT_GOPHER_PORT; + dwService = INTERNET_SERVICE_GOPHER; + break; - TRACE("res = %ld gle = %08lx url len = %ld\n", hres, GetLastError(), len); + case INTERNET_SCHEME_HTTP: + if (!url.nPort) + url.nPort = INTERNET_DEFAULT_HTTP_PORT; + dwService = INTERNET_SERVICE_HTTP; + break; - last_read_pos.u.LowPart = last_read_pos.u.HighPart = 0; - fmt.cfFormat = 0; - fmt.ptd = NULL; - fmt.dwAspect = 0; - fmt.lindex = -1; - fmt.tymed = TYMED_ISTREAM; - stg.tymed = TYMED_ISTREAM; - stg.u.pstm = pstr; - stg.pUnkForRelease = NULL; + case INTERNET_SCHEME_HTTPS: + if (!url.nPort) + url.nPort = INTERNET_DEFAULT_HTTPS_PORT; + dwService = INTERNET_SERVICE_HTTP; + break; + } - while(1) { - char buf[4096]; - DWORD bufread; - DWORD written; - if(InternetReadFile(This->hrequest, buf, sizeof(buf), &bufread)) { - TRACE("read %ld bytes %s...\n", bufread, debugstr_an(buf, 10)); - if(bufread == 0) break; - IStream_Write(pstr, buf, bufread, &written); - total_read += bufread; - IStream_Seek(pstr, last_read_pos, STREAM_SEEK_SET, NULL); - hres = IBindStatusCallback_OnProgress(pbscb, total_read, len, (total_read == bufread) ? - BINDSTATUS_BEGINDOWNLOADDATA : - BINDSTATUS_DOWNLOADINGDATA, NULL); - hres = IBindStatusCallback_OnDataAvailable(pbscb, - (total_read == bufread) ? BSCF_FIRSTDATANOTIFICATION : - BSCF_INTERMEDIATEDATANOTIFICATION, - total_read, &fmt, &stg); - last_read_pos.u.LowPart += bufread; /* FIXME */ - } else + bind->hconnect = InternetConnectW(bind->hinternet, host, url.nPort, user, pass, + dwService, 0, (DWORD)bind); + if (!bind->hconnect) + { + hres = HRESULT_FROM_WIN32(GetLastError()); + CloseHandle(bind->hinternet); break; - } - hres = IBindStatusCallback_OnProgress(pbscb, total_read, len, BINDSTATUS_ENDDOWNLOADDATA, NULL); - hres = IBindStatusCallback_OnDataAvailable(pbscb, BSCF_LASTDATANOTIFICATION, total_read, &fmt, &stg); - TRACE("OnDataAvail rets %08lx\n", hres); - hres = IBindStatusCallback_OnStopBinding(pbscb, S_OK, NULL); - TRACE("OnStop rets %08lx\n", hres); - hres = S_OK; + } + + hres = IBindStatusCallback_OnProgress(bind->pbscb, 0, 0, 0x22, NULL); + hres = IBindStatusCallback_OnProgress(bind->pbscb, 0, 0, BINDSTATUS_FINDINGRESOURCE, NULL); + hres = IBindStatusCallback_OnProgress(bind->pbscb, 0, 0, BINDSTATUS_CONNECTING, NULL); + hres = IBindStatusCallback_OnProgress(bind->pbscb, 0, 0, BINDSTATUS_SENDINGREQUEST, NULL); + + bSuccess = FALSE; + + switch (dwService) + { + case INTERNET_SERVICE_GOPHER: + bind->hrequest = GopherOpenFileW(bind->hconnect, + path, + 0, + INTERNET_FLAG_RELOAD, + 0); + if (bind->hrequest) + bSuccess = TRUE; + else + hres = HRESULT_FROM_WIN32(GetLastError()); + break; + + case INTERNET_SERVICE_FTP: + bind->hrequest = FtpOpenFileW(bind->hconnect, + path, + GENERIC_READ, + FTP_TRANSFER_TYPE_BINARY | + INTERNET_FLAG_TRANSFER_BINARY | + INTERNET_FLAG_RELOAD, + 0); + if (bind->hrequest) + bSuccess = TRUE; + else + hres = HRESULT_FROM_WIN32(GetLastError()); + break; + + case INTERNET_SERVICE_HTTP: + bind->hrequest = HttpOpenRequestW(bind->hconnect, NULL, path, NULL, NULL, NULL, 0, (DWORD)bind); + if (!bind->hrequest) + { + hres = HRESULT_FROM_WIN32(GetLastError()); + } + else if (!HttpSendRequestW(bind->hrequest, NULL, 0, NULL, 0)) + { + hres = HRESULT_FROM_WIN32(GetLastError()); + InternetCloseHandle(bind->hrequest); + } + else + { + HttpQueryInfoW(bind->hrequest, + HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, + &bind->expected_size, + &lensz, + NULL); + bSuccess = TRUE; + } + break; + } + if(bSuccess) + { + TRACE("res = %ld gle = %08lx url len = %ld\n", hres, GetLastError(), bind->expected_size); + + IBindStatusCallback_OnProgress(bind->pbscb, 0, 0, BINDSTATUS_CACHEFILENAMEAVAILABLE, szFileName); + + while(1) { + char buf[4096]; + DWORD bufread; + if(InternetReadFile(bind->hrequest, buf, sizeof(buf), &bufread)) { + TRACE("read %ld bytes %s...\n", bufread, debugstr_an(buf, 10)); + if(bufread == 0) break; + hres = Binding_MoreCacheData(bind, buf, bufread); + } else + break; + } + InternetCloseHandle(bind->hrequest); + hres = S_OK; + } + + InternetCloseHandle(bind->hconnect); + InternetCloseHandle(bind->hinternet); + break; + + case INTERNET_SCHEME_FILE: + path = bind->URLName + 5; /* Skip the "file:" part */ + if ((path[0] != '/' && path[0] != '\\') || + (path[1] != '/' && path[1] != '\\')) + { + hres = E_FAIL; + } + else + { + HANDLE h; + + path += 2; + if (path[0] == '/' || path[0] == '\\') + ++path; + h = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + if (h == (HANDLE) HFILE_ERROR) + { + hres = HRESULT_FROM_WIN32(GetLastError()); + } + else + { + char buf[4096]; + DWORD bufread; + + IBindStatusCallback_OnProgress(bind->pbscb, 0, 0, BINDSTATUS_CACHEFILENAMEAVAILABLE, szFileName); + + while (ReadFile(h, buf, sizeof(buf), &bufread, NULL) && bufread > 0) + hres = Binding_MoreCacheData(bind, buf, bufread); + + CloseHandle(h); + hres = S_OK; + } + } + + break; + + default: + FIXME("Unsupported URI scheme"); + break; } - InternetCloseHandle(This->hrequest); - InternetCloseHandle(This->hconnect); - InternetCloseHandle(This->hinternet); - IBindStatusCallback_Release(pbscb); + Binding_CloseCacheDownload(bind); + Binding_FinishedDownload(bind, hres); + + if (user) + HeapFree(GetProcessHeap(), 0, user); + if (pass) + HeapFree(GetProcessHeap(), 0, pass); + HeapFree(GetProcessHeap(), 0, path); + HeapFree(GetProcessHeap(), 0, host); + HeapFree(GetProcessHeap(), 0, urlcopy); } } } - *ppvObject = (VOID*)pstr; + + IBinding_Release((IBinding*)bind); + return hres; } @@ -698,98 +1100,6 @@ return S_OK; } -static HRESULT WINAPI URLMonikerImpl_IBinding_QueryInterface(IBinding* iface,REFIID riid,void** ppvObject) -{ - ICOM_THIS_MULTI(URLMonikerImpl, lpvtbl2, iface); - - TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppvObject); - - /* Perform a sanity check on the parameters.*/ - if ( (This==0) || (ppvObject==0) ) - return E_INVALIDARG; - - /* Initialize the return parameter */ - *ppvObject = 0; - - /* Compare the riid with the interface IDs implemented by this object.*/ - if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IBinding, riid)) - *ppvObject = iface; - - /* Check that we obtained an interface.*/ - if ((*ppvObject)==0) - return E_NOINTERFACE; - - /* Query Interface always increases the reference count by one when it is successful */ - IBinding_AddRef(iface); - - return S_OK; - -} - -static ULONG WINAPI URLMonikerImpl_IBinding_AddRef(IBinding* iface) -{ - ICOM_THIS_MULTI(URLMonikerImpl, lpvtbl2, iface); - TRACE("(%p)\n",This); - - return URLMonikerImpl_AddRef((IMoniker*)This); -} - -static ULONG WINAPI URLMonikerImpl_IBinding_Release(IBinding* iface) -{ - ICOM_THIS_MULTI(URLMonikerImpl, lpvtbl2, iface); - TRACE("(%p)\n",This); - - return URLMonikerImpl_Release((IMoniker*)This); -} - -static HRESULT WINAPI URLMonikerImpl_IBinding_Abort(IBinding* iface) -{ - ICOM_THIS_MULTI(URLMonikerImpl, lpvtbl2, iface); - FIXME("(%p): stub\n", This); - - return E_NOTIMPL; -} - -static HRESULT WINAPI URLMonikerImpl_IBinding_GetBindResult(IBinding* iface, CLSID* pclsidProtocol, DWORD* pdwResult, LPOLESTR* pszResult, DWORD* pdwReserved) -{ - ICOM_THIS_MULTI(URLMonikerImpl, lpvtbl2, iface); - FIXME("(%p)->(%p, %p, %p, %p): stub\n", This, pclsidProtocol, pdwResult, pszResult, pdwReserved); - - return E_NOTIMPL; -} - -static HRESULT WINAPI URLMonikerImpl_IBinding_GetPriority(IBinding* iface, LONG* pnPriority) -{ - ICOM_THIS_MULTI(URLMonikerImpl, lpvtbl2, iface); - FIXME("(%p)->(%p): stub\n", This, pnPriority); - - return E_NOTIMPL; -} - -static HRESULT WINAPI URLMonikerImpl_IBinding_Resume(IBinding* iface) -{ - ICOM_THIS_MULTI(URLMonikerImpl, lpvtbl2, iface); - FIXME("(%p): stub\n", This); - - return E_NOTIMPL; -} - -static HRESULT WINAPI URLMonikerImpl_IBinding_SetPriority(IBinding* iface, LONG nPriority) -{ - ICOM_THIS_MULTI(URLMonikerImpl, lpvtbl2, iface); - FIXME("(%p)->(%ld): stub\n", This, nPriority); - - return E_NOTIMPL; -} - -static HRESULT WINAPI URLMonikerImpl_IBinding_Suspend(IBinding* iface) -{ - ICOM_THIS_MULTI(URLMonikerImpl, lpvtbl2, iface); - FIXME("(%p): stub\n", This); - - return E_NOTIMPL; -} - /*********************************************************************** *********/ /* Virtual function table for the URLMonikerImpl class which include IPersist,*/ /* IPersistStream and IMoniker functions. */ @@ -820,19 +1130,6 @@ URLMonikerImpl_IsSystemMoniker }; -static IBindingVtbl VTBinding_URLMonikerImpl = -{ - URLMonikerImpl_IBinding_QueryInterface, - URLMonikerImpl_IBinding_AddRef, - URLMonikerImpl_IBinding_Release, - URLMonikerImpl_IBinding_Abort, - URLMonikerImpl_IBinding_Suspend, - URLMonikerImpl_IBinding_Resume, - URLMonikerImpl_IBinding_SetPriority, - URLMonikerImpl_IBinding_GetPriority, - URLMonikerImpl_IBinding_GetBindResult -}; - /*********************************************************************** ******* * URLMoniker_Construct (local function) ************************************************************************ *******/ @@ -845,9 +1142,8 @@ memset(This, 0, sizeof(*This)); /* Initialize the virtual function table. */ - This->lpvtbl1 = &VT_URLMonikerImpl; - This->lpvtbl2 = &VTBinding_URLMonikerImpl; - This->ref = 0; + This->lpvtbl = &VT_URLMonikerImpl; + This->ref = 0; if(lpszLeftURLName) { hres = UrlCombineW(lpszLeftURLName, lpszURLName, NULL, &sizeStr, 0); _____ Copied: trunk/reactos/lib/urlmon/umstream.c (from rev 15623, vendor/wine/dlls/urlmon/current/umstream.c) Property changes on: trunk/reactos/lib/urlmon/umstream.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/urlmon/urlmon.spec --- trunk/reactos/lib/urlmon/urlmon.spec 2005-05-28 21:40:01 UTC (rev 15624) +++ trunk/reactos/lib/urlmon/urlmon.spec 2005-05-28 21:44:21 UTC (rev 15625) @@ -8,7 +8,7 @@ @ stub AsyncGetClassBits @ stub AsyncInstallDistributionUnit @ stub BindAsyncMoniker -@ stub CoGetClassObjectFromURL +@ stdcall CoGetClassObjectFromURL(ptr wstr long long wstr ptr long ptr ptr ptr) @ stub CoInstall @ stdcall CoInternetCombineUrl(wstr wstr long wstr long ptr long) @ stdcall CoInternetCompareUrl(wstr wstr long) _____ Modified: trunk/reactos/lib/urlmon/urlmon.xml --- trunk/reactos/lib/urlmon/urlmon.xml 2005-05-28 21:40:01 UTC (rev 15624) +++ trunk/reactos/lib/urlmon/urlmon.xml 2005-05-28 21:44:21 UTC (rev 15625) @@ -23,6 +23,7 @@ <file>regsvr.c</file> <file>sec_mgr.c</file> <file>umon.c</file> + <file>umstream.c</file> <file>urlmon_main.c</file> <file>urlmon.spec</file> </module> _____ Modified: trunk/reactos/lib/urlmon/urlmon_main.c --- trunk/reactos/lib/urlmon/urlmon_main.c 2005-05-28 21:40:01 UTC (rev 15624) +++ trunk/reactos/lib/urlmon/urlmon_main.c 2005-05-28 21:44:21 UTC (rev 15625) @@ -341,3 +341,17 @@ FIXME("%p %p %p %08lx\n", hwnd, pClassSpec, pQuery, flags); return E_NOTIMPL; } + +/********************************************************************** **** + * CoGetClassObjectFromURL (URLMON.@) + */ +HRESULT WINAPI CoGetClassObjectFromURL( REFCLSID rclsid, LPCWSTR szCodeURL, DWORD dwFileVersionMS, + DWORD dwFileVersionLS, LPCWSTR szContentType, + LPBINDCTX pBindCtx, DWORD dwClsContext, LPVOID pvReserved, + REFIID riid, LPVOID *ppv ) +{ + FIXME("(%s %s %ld %ld %s %p %ld %p %s %p) Stub!\n", debugstr_guid(rclsid), debugstr_w(szCodeURL), + dwFileVersionMS, dwFileVersionLS, debugstr_w(szContentType), pBindCtx, dwClsContext, pvReserved, + debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} _____ Modified: trunk/reactos/lib/urlmon/urlmon_main.h --- trunk/reactos/lib/urlmon/urlmon_main.h 2005-05-28 21:40:01 UTC (rev 15624) +++ trunk/reactos/lib/urlmon/urlmon_main.h 2005-05-28 21:44:21 UTC (rev 15625) @@ -37,4 +37,17 @@ #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) +typedef struct +{ + const IStreamVtbl *lpVtbl; + DWORD ref; + HANDLE handle; + BOOL closed; + WCHAR *pszFileName; + WCHAR *pszURL; +} IUMCacheStream; + +HRESULT UMCreateStreamOnCacheFile(LPCWSTR pszURL, DWORD dwSize, LPWSTR pszFileName, HANDLE *phfile, IUMCacheStream **ppstr); +void UMCloseCacheFileStream(IUMCacheStream *pstr); + #endif /* __WINE_URLMON_MAIN_H */

19 years, 7 months

[jimtabor] 15624: Temp Fix until I figure out what is wrong with Asserts.

by jimtabor＠svn.reactos.com

Temp Fix until I figure out what is wrong with Asserts. Modified: trunk/reactos/drivers/usb/usbport/usbport.c _____ Modified: trunk/reactos/drivers/usb/usbport/usbport.c --- trunk/reactos/drivers/usb/usbport/usbport.c 2005-05-28 21:39:03 UTC (rev 15623) +++ trunk/reactos/drivers/usb/usbport/usbport.c 2005-05-28 21:40:01 UTC (rev 15624) @@ -1,86 +1,86 @@ -/* - * ReactOS USB Port driver - * Copyright (C) 2004 Aleksey Bragin - * (C) 2005 Mark Tempel - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * STATUS: - * 19-Dec-2004 - just a stub for now, but with useful info by Filip - */ - -/* INCLUDES *******************************************************************/ -#include <stddef.h> -#include <windef.h> -#include <ddk/ntddk.h> -#include "usbport.h" -#include <debug.h> - -/* PUBLIC AND PRIVATE FUNCTIONS ***********************************************/ - -/* -** Standard DriverEntry method. -** We do nothing here. All real work is done in USBPRORT_RegisterUSBPortDriver. -*/ -NTSTATUS STDCALL -DriverEntry(IN PVOID Context1, IN PVOID Context2) -{ - DPRINT1("USBPORT.SYS DriverEntry\n"); - return STATUS_SUCCESS; -} -/* - * This method is used by miniports to connect set up - */ -NTSTATUS STDCALL -USBPORT_RegisterUSBPortDriver(PDRIVER_OBJECT DriverObject, DWORD Unknown1, - PUSB_CONTROLLER_INTERFACE Interface) -{ - //DPRINT1("USBPORT_RegisterUSBPortDriver\n"); - ASSERT(KeGetCurrentIRQL() < DISPATCH_LEVEL); - - return STATUS_SUCCESS; -} - -NTSTATUS STDCALL -USBPORT_GetHciMn(VOID) -{ - return 0x10000001; -} -/* - * This method is to allow miniports to create - */ -NTSTATUS STDCALL -USBPORT_AllocateUsbControllerInterface(OUT PUSB_CONTROLLER_INTERFACE *pControllerInterface) -{ - //DPRINT1("USBPORT_AllocateUsbControllerInterface\n"); - ASSERT(KeGetCurrentIRQL() < DISPATCH_LEVEL); - ASSERT(0 != ControllerObject); - - *pControllerInterface = (PUSB_CONTROLLER_INTERFACE)ExAllocatePoolWithTag(PagedPool, sizeof(USB_CONTROLLER_INTERFACE),USB_CONTROLLER_INTERFACE_TAG); - RtlZeroMemory(*pControllerInterface, sizeof(USB_CONTROLLER_INTERFACE)); - - return STATUS_SUCCESS; -} - -NTSTATUS STDCALL -USBPORT_FreeUsbControllerInterface(IN PUSB_CONTROLLER_INTERFACE ControllerInterface) -{ - //DPRINT1("USBPORT_FreeUsbControllerInterface\n"); - ASSERT(KeGetCurrentIRQL() < DISPATCH_LEVEL); - - ExFreePool(ControllerInterface); - - return STATUS_SUCCESS; -} +/* + * ReactOS USB Port driver + * Copyright (C) 2004 Aleksey Bragin + * (C) 2005 Mark Tempel + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * STATUS: + * 19-Dec-2004 - just a stub for now, but with useful info by Filip + */ + +/* INCLUDES *******************************************************************/ +#include <stddef.h> +#include <windef.h> +#include <ddk/ntddk.h> +#include "usbport.h" +#include <debug.h> + +/* PUBLIC AND PRIVATE FUNCTIONS ***********************************************/ + +/* +** Standard DriverEntry method. +** We do nothing here. All real work is done in USBPRORT_RegisterUSBPortDriver. +*/ +NTSTATUS STDCALL +DriverEntry(IN PVOID Context1, IN PVOID Context2) +{ + DPRINT1("USBPORT.SYS DriverEntry\n"); + return STATUS_SUCCESS; +} +/* + * This method is used by miniports to connect set up + */ +NTSTATUS STDCALL +USBPORT_RegisterUSBPortDriver(PDRIVER_OBJECT DriverObject, DWORD Unknown1, + PUSB_CONTROLLER_INTERFACE Interface) +{ + DPRINT1("USBPORT_RegisterUSBPortDriver\n"); +// ASSERT(KeGetCurrentIRQL() < DISPATCH_LEVEL); + + return STATUS_SUCCESS; +} + +NTSTATUS STDCALL +USBPORT_GetHciMn(VOID) +{ + return 0x10000001; +} +/* + * This method is to allow miniports to create + */ +NTSTATUS STDCALL +USBPORT_AllocateUsbControllerInterface(OUT PUSB_CONTROLLER_INTERFACE *pControllerInterface) +{ + DPRINT1("USBPORT_AllocateUsbControllerInterface\n"); +// ASSERT(KeGetCurrentIRQL() < DISPATCH_LEVEL); +// ASSERT(0 != ControllerObject); + + *pControllerInterface = (PUSB_CONTROLLER_INTERFACE)ExAllocatePoolWithTag(PagedPool, sizeof(USB_CONTROLLER_INTERFACE),USB_CONTROLLER_INTERFACE_TAG); + RtlZeroMemory(*pControllerInterface, sizeof(USB_CONTROLLER_INTERFACE)); + + return STATUS_SUCCESS; +} + +NTSTATUS STDCALL +USBPORT_FreeUsbControllerInterface(IN PUSB_CONTROLLER_INTERFACE ControllerInterface) +{ + DPRINT1("USBPORT_FreeUsbControllerInterface\n"); +// ASSERT(KeGetCurrentIRQL() < DISPATCH_LEVEL); + + ExFreePool(ControllerInterface); + + return STATUS_SUCCESS; +}

19 years, 7 months

[gvg] 15623: Alexandre Julliard <julliard@winehq.org>

by gvg＠svn.reactos.com

Alexandre Julliard <julliard(a)winehq.org> - Added rules for building import libraries in the individual dll makefiles, and added support for building a .def.a static import library too. Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> - Test cases for URL_UNESCAPE and small fix. Francois Gouget <fgouget(a)free.fr> - Assorted spelling fixes. Modified: trunk/reactos/lib/shlwapi/Makefile.in Modified: trunk/reactos/lib/shlwapi/reg.c Modified: trunk/reactos/lib/shlwapi/url.c _____ Modified: trunk/reactos/lib/shlwapi/Makefile.in --- trunk/reactos/lib/shlwapi/Makefile.in 2005-05-28 21:38:59 UTC (rev 15622) +++ trunk/reactos/lib/shlwapi/Makefile.in 2005-05-28 21:39:03 UTC (rev 15623) @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = shlwapi.dll +IMPORTLIB = libshlwapi.$(IMPLIBEXT) IMPORTS = ole32 user32 gdi32 advapi32 kernel32 ntdll DELAYIMPORTS = oleaut32 EXTRALIBS = -luuid $(LIBUNICODE) _____ Modified: trunk/reactos/lib/shlwapi/reg.c --- trunk/reactos/lib/shlwapi/reg.c 2005-05-28 21:38:59 UTC (rev 15622) +++ trunk/reactos/lib/shlwapi/reg.c 2005-05-28 21:39:03 UTC (rev 15623) @@ -1300,10 +1300,10 @@ * * REG_EXPAND_SZ: * case-1: the unexpanded string is smaller than the expanded one - * subcase-1: the buffer is to small to hold the unexpanded string: + * subcase-1: the buffer is too small to hold the unexpanded string: * function fails and returns the size of the unexpanded string. * - * subcase-2: buffer is to small to hold the expanded string: + * subcase-2: buffer is too small to hold the expanded string: * the function return success (!!) and the result is truncated * *** This is clearly an error in the native implementation. *** * @@ -1332,7 +1332,7 @@ /* Expand type REG_EXPAND_SZ into REG_SZ */ LPSTR szData; - /* If the caller didn't supply a buffer or the buffer is to small we have + /* If the caller didn't supply a buffer or the buffer is too small we have * to allocate our own */ if ((!pvData) || (dwRet == ERROR_MORE_DATA) ) _____ Modified: trunk/reactos/lib/shlwapi/url.c --- trunk/reactos/lib/shlwapi/url.c 2005-05-28 21:38:59 UTC (rev 15622) +++ trunk/reactos/lib/shlwapi/url.c 2005-05-28 21:39:03 UTC (rev 15623) @@ -459,7 +459,7 @@ lpszUrlCpy[--nLen]=0; if(dwFlags & URL_UNESCAPE) - UrlUnescapeW(lpszUrlCpy, NULL, NULL, URL_UNESCAPE_INPLACE); + UrlUnescapeW(lpszUrlCpy, NULL, &nLen, URL_UNESCAPE_INPLACE); if((EscapeFlags = dwFlags & (URL_ESCAPE_UNSAFE | URL_ESCAPE_SPACES_ONLY | @@ -1160,7 +1160,7 @@ TRACE("(%s, %p, %p, 0x%08lx)\n", debugstr_w(pszUrl), pszUnescaped, pcchUnescaped, dwFlags); - if(!pszUrl || !pszUnescaped || !pcchUnescaped) + if(!pszUrl || (!pszUnescaped && !(dwFlags & URL_UNESCAPE_INPLACE))|| !pcchUnescaped) return E_INVALIDARG; if(dwFlags & URL_UNESCAPE_INPLACE)

19 years, 7 months

[jimtabor] 15622: Add Usbport to new build system.

by jimtabor＠svn.reactos.com

Add Usbport to new build system. Added: trunk/reactos/drivers/usb/usbport/usbport.xml _____ Added: trunk/reactos/drivers/usb/usbport/usbport.xml --- trunk/reactos/drivers/usb/usbport/usbport.xml 2005-05-28 21:38:05 UTC (rev 15621) +++ trunk/reactos/drivers/usb/usbport/usbport.xml 2005-05-28 21:38:59 UTC (rev 15622) @@ -0,0 +1,8 @@ +<module name="usbport" type="kernelmodedriver" installbase="system32/drivers" installname="usbport.sys"> + <define name="__USE_W32API" /> + <include base="ntoskrnl">include</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>usbport.c</file> + <file>usbport.rc</file> +</module>

19 years, 7 months

[jimtabor] 15621: Add Usbport to new build system.

by jimtabor＠svn.reactos.com

Add Usbport to new build system. Modified: trunk/reactos/drivers/usb/directory.xml _____ Modified: trunk/reactos/drivers/usb/directory.xml --- trunk/reactos/drivers/usb/directory.xml 2005-05-28 21:34:33 UTC (rev 15620) +++ trunk/reactos/drivers/usb/directory.xml 2005-05-28 21:38:05 UTC (rev 15621) @@ -4,3 +4,6 @@ <directory name="usbhub"> <xi:include href="usbhub/usbhub.xml" /> </directory> +<directory name="usbport"> + <xi:include href="usbport/usbport.xml" /> +</directory>

19 years, 7 months

← Newer
1
...
6
7
8
9
10
11
12
...
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