Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 44085: - Fix HalDisableSystemInterrupt -- it doesn't return anything. - Fix VideoPortEnable/DisableInterrupt -- they should only fail if the driver didn't provide an ISR (documented).
by sginsberg＠svn.reactos.org 10 Nov '09

10 Nov '09

Author: sginsberg Date: Wed Nov 11 00:00:51 2009 New Revision: 44085 URL: http://svn.reactos.org/svn/reactos?rev=44085&view=rev Log: - Fix HalDisableSystemInterrupt -- it doesn't return anything. - Fix VideoPortEnable/DisableInterrupt -- they should only fail if the driver didn't provide an ISR (documented). Modified: trunk/reactos/hal/hal/hal.c trunk/reactos/hal/halarm/generic/hal.c trunk/reactos/hal/halppc/generic/irql.c trunk/reactos/hal/halx86/mp/mpsirql.c trunk/reactos/include/ndk/halfuncs.h Modified: trunk/reactos/hal/hal/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.c?rev=44085&r1… ============================================================================== --- trunk/reactos/hal/hal/hal.c [iso-8859-1] (original) +++ trunk/reactos/hal/hal/hal.c [iso-8859-1] Wed Nov 11 00:00:51 2009 @@ -213,15 +213,12 @@ } -BOOLEAN -NTAPI -HalDisableSystemInterrupt( - ULONG Vector, - KIRQL Irql) -{ - UNIMPLEMENTED; - - return TRUE; +VOID +NTAPI +HalDisableSystemInterrupt(ULONG Vector, + KIRQL Irql) +{ + UNIMPLEMENTED; } Modified: trunk/reactos/hal/halarm/generic/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/generic/hal.c?r… ============================================================================== --- trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] Wed Nov 11 00:00:51 2009 @@ -276,15 +276,12 @@ } -BOOLEAN -NTAPI -HalDisableSystemInterrupt( - ULONG Vector, - KIRQL Irql) -{ - UNIMPLEMENTED; - - return TRUE; +VOID +NTAPI +HalDisableSystemInterrupt(ULONG Vector, + KIRQL Irql) +{ + UNIMPLEMENTED; } VOID Modified: trunk/reactos/hal/halppc/generic/irql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/irql.c?… ============================================================================== --- trunk/reactos/hal/halppc/generic/irql.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/irql.c [iso-8859-1] Wed Nov 11 00:00:51 2009 @@ -356,7 +356,7 @@ HalpEndSystemInterrupt(Irql); } -BOOLEAN +VOID NTAPI HalDisableSystemInterrupt( ULONG Vector, @@ -365,7 +365,10 @@ ULONG irq; if (Vector < IRQ_BASE || Vector >= IRQ_BASE + NR_IRQS) - return FALSE; + { + ASSERT(FALSE); + return; + } irq = Vector - IRQ_BASE; pic_mask.both |= (1 << irq); @@ -378,7 +381,7 @@ WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)(pic_mask.slave|pic_mask_intr.slave)); } - return TRUE; + return; } Modified: trunk/reactos/hal/halx86/mp/mpsirql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/mpsirql.c?re… ============================================================================== --- trunk/reactos/hal/halx86/mp/mpsirql.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/mpsirql.c [iso-8859-1] Wed Nov 11 00:00:51 2009 @@ -336,9 +336,10 @@ HalpLowerIrql (Irql, TRUE); } -BOOLEAN NTAPI -HalDisableSystemInterrupt (ULONG Vector, - KIRQL Irql) +VOID +NTAPI +HalDisableSystemInterrupt(ULONG Vector, + KIRQL Irql) { ULONG irq; @@ -348,13 +349,14 @@ Vector >= FIRST_DEVICE_VECTOR + NUMBER_DEVICE_VECTORS) { DPRINT1("Not a device interrupt, vector=%x\n", Vector); - return FALSE; + ASSERT(FALSE); + return; } irq = VECTOR2IRQ (Vector); IOAPICMaskIrq (irq); - return TRUE; + return; } Modified: trunk/reactos/include/ndk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/halfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/halfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/halfuncs.h [iso-8859-1] Wed Nov 11 00:00:51 2009 @@ -144,7 +144,7 @@ ); NTHALAPI -BOOLEAN +VOID NTAPI HalDisableSystemInterrupt( ULONG Vector,

1 0

[dgorbachev] 44084: Fix Japanese bug #4776.
by dgorbachev＠svn.reactos.org 10 Nov '09

10 Nov '09

Author: dgorbachev Date: Tue Nov 10 23:52:41 2009 New Revision: 44084 URL: http://svn.reactos.org/svn/reactos?rev=44084&view=rev Log: Fix Japanese bug #4776. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Tue Nov 10 23:52:41 2009 @@ -1224,8 +1224,16 @@ } else /* Not a popup */ { - if (*str == 0) - flags = MF_SEPARATOR; + if(!unicode) + { + if (*str == 0) + flags = MF_SEPARATOR; + } + else + { + if (*(LPCWSTR)str == 0) + flags = MF_SEPARATOR; + } if (flags & MF_SEPARATOR) {

1 0

[cwittich] 44083: sync shlwapi to wine 1.1.32
by cwittich＠svn.reactos.org 10 Nov '09

10 Nov '09

Author: cwittich Date: Tue Nov 10 22:36:55 2009 New Revision: 44083 URL: http://svn.reactos.org/svn/reactos?rev=44083&view=rev Log: sync shlwapi to wine 1.1.32 Modified: trunk/reactos/dll/win32/shlwapi/regstream.c trunk/reactos/dll/win32/shlwapi/url.c Modified: trunk/reactos/dll/win32/shlwapi/regstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/regstrea… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/regstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/regstream.c [iso-8859-1] Tue Nov 10 22:36:55 2009 @@ -221,7 +221,7 @@ return STG_E_INVALIDFUNCTION; /* we cut off the high part here */ - This->dwPos = tmp.LowPart; + This->dwPos = tmp.u.LowPart; if (plibNewPosition) plibNewPosition->QuadPart = This->dwPos; @@ -240,7 +240,7 @@ TRACE("(%p, %s)\n", This, wine_dbgstr_longlong(libNewSize.QuadPart)); /* we cut off the high part here */ - newLen = libNewSize.LowPart; + newLen = libNewSize.u.LowPart; newBuf = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->pbBuffer, newLen); if (!newBuf) return STG_E_INSUFFICIENTMEMORY; Modified: trunk/reactos/dll/win32/shlwapi/url.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/url.c?re… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/url.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/url.c [iso-8859-1] Tue Nov 10 22:36:55 2009 @@ -145,40 +145,29 @@ HRESULT WINAPI ParseURLA(LPCSTR x, PARSEDURLA *y) { WCHAR scheme[INTERNET_MAX_SCHEME_LENGTH]; - DWORD cnt, len; - - y->nScheme = URL_SCHEME_INVALID; - if (y->cbSize != sizeof(*y)) return E_INVALIDARG; - /* FIXME: leading white space generates error of 0x80041001 which - * is undefined - */ - if (*x <= ' ') return 0x80041001; - cnt = 0; - y->cchProtocol = 0; - y->pszProtocol = x; - while (*x) { - if (*x == ':') { - y->cchProtocol = cnt; - cnt = -1; - y->pszSuffix = x+1; - break; - } - x++; - cnt++; - } - - /* check for no scheme in string start */ - /* (apparently schemes *must* be larger than a single character) */ - if ((*x == '\0') || (y->cchProtocol <= 1)) { + const char *ptr = x; + int len; + + TRACE("%s %p\n", debugstr_a(x), y); + + if(y->cbSize != sizeof(*y)) + return E_INVALIDARG; + + while(*ptr && (isalnum(*ptr) || *ptr == '-')) + ptr++; + + if (*ptr != ':' || ptr <= x+1) { y->pszProtocol = NULL; return 0x80041001; } - /* found scheme, set length of remainder */ - y->cchSuffix = lstrlenA(y->pszSuffix); - - len = MultiByteToWideChar(CP_ACP, 0, y->pszProtocol, y->cchProtocol, - scheme, sizeof(scheme)/sizeof(WCHAR)); + y->pszProtocol = x; + y->cchProtocol = ptr-x; + y->pszSuffix = ptr+1; + y->cchSuffix = strlen(y->pszSuffix); + + len = MultiByteToWideChar(CP_ACP, 0, x, ptr-x, + scheme, sizeof(scheme)/sizeof(WCHAR)); y->nScheme = get_scheme_code(scheme, len); return S_OK; @@ -191,38 +180,26 @@ */ HRESULT WINAPI ParseURLW(LPCWSTR x, PARSEDURLW *y) { - DWORD cnt; - - y->nScheme = URL_SCHEME_INVALID; - if (y->cbSize != sizeof(*y)) return E_INVALIDARG; - /* FIXME: leading white space generates error of 0x80041001 which - * is undefined - */ - if (*x <= ' ') return 0x80041001; - cnt = 0; - y->cchProtocol = 0; - y->pszProtocol = x; - while (*x) { - if (*x == ':') { - y->cchProtocol = cnt; - cnt = -1; - y->pszSuffix = x+1; - break; - } - x++; - cnt++; - } - - /* check for no scheme in string start */ - /* (apparently schemes *must* be larger than a single character) */ - if ((*x == '\0') || (y->cchProtocol <= 1)) { + const WCHAR *ptr = x; + + TRACE("%s %p\n", debugstr_w(x), y); + + if(y->cbSize != sizeof(*y)) + return E_INVALIDARG; + + while(*ptr && (isalnumW(*ptr) || *ptr == '-')) + ptr++; + + if (*ptr != ':' || ptr <= x+1) { y->pszProtocol = NULL; return 0x80041001; } - /* found scheme, set length of remainder */ - y->cchSuffix = lstrlenW(y->pszSuffix); - y->nScheme = get_scheme_code(y->pszProtocol, y->cchProtocol); + y->pszProtocol = x; + y->cchProtocol = ptr-x; + y->pszSuffix = ptr+1; + y->cchSuffix = strlenW(y->pszSuffix); + y->nScheme = get_scheme_code(x, ptr-x); return S_OK; } @@ -2141,6 +2118,7 @@ BOOL WINAPI PathIsURLA(LPCSTR lpstrPath) { PARSEDURLA base; + HRESULT hres; TRACE("%s\n", debugstr_a(lpstrPath)); @@ -2148,8 +2126,8 @@ /* get protocol */ base.cbSize = sizeof(base); - ParseURLA(lpstrPath, &base); - return (base.nScheme != URL_SCHEME_INVALID); + hres = ParseURLA(lpstrPath, &base); + return hres == S_OK && (base.nScheme != URL_SCHEME_INVALID); } /************************************************************************* @@ -2160,6 +2138,7 @@ BOOL WINAPI PathIsURLW(LPCWSTR lpstrPath) { PARSEDURLW base; + HRESULT hres; TRACE("%s\n", debugstr_w(lpstrPath)); @@ -2167,8 +2146,8 @@ /* get protocol */ base.cbSize = sizeof(base); - ParseURLW(lpstrPath, &base); - return (base.nScheme != URL_SCHEME_INVALID); + hres = ParseURLW(lpstrPath, &base); + return hres == S_OK && (base.nScheme != URL_SCHEME_INVALID); } /*************************************************************************

1 0

[cwittich] 44082: sync SHGetFileInfo and CommandLineToArgvW to wine 1.1.32
by cwittich＠svn.reactos.org 10 Nov '09

10 Nov '09

Author: cwittich Date: Tue Nov 10 22:31:37 2009 New Revision: 44082 URL: http://svn.reactos.org/svn/reactos?rev=44082&view=rev Log: sync SHGetFileInfo and CommandLineToArgvW to wine 1.1.32 Modified: trunk/reactos/dll/win32/shell32/shell32_main.c Modified: trunk/reactos/dll/win32/shell32/shell32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.c [iso-8859-1] Tue Nov 10 22:31:37 2009 @@ -84,7 +84,7 @@ } argv[0]=(LPWSTR)(argv+1); if (numargs) - *numargs=2; + *numargs=1; return argv; } @@ -323,8 +323,7 @@ (flags & SHGFI_PIDL)? "pidl" : debugstr_w(path), dwFileAttributes, psfi, psfi->dwAttributes, sizeofpsfi, flags); - if ( (flags & SHGFI_USEFILEATTRIBUTES) && - (flags & (SHGFI_ATTRIBUTES|SHGFI_EXETYPE|SHGFI_PIDL))) + if (!path) return FALSE; /* windows initializes these values regardless of the flags */ @@ -403,7 +402,8 @@ { psfi->dwAttributes = 0xffffffff; } - IShellFolder_GetAttributesOf( psfParent, 1, (LPCITEMIDLIST*)&pidlLast, + if (psfParent) + IShellFolder_GetAttributesOf( psfParent, 1, (LPCITEMIDLIST*)&pidlLast, &(psfi->dwAttributes) ); } @@ -520,7 +520,7 @@ &uDummy, (LPVOID*)&pei); if (SUCCEEDED(hr)) { - hr = pei->lpVtbl->GetIconLocation(pei, uGilFlags, + hr = IExtractIconW_GetIconLocation(pei, uGilFlags, szLocation, MAX_PATH, &iIndex, &uFlags); if (uFlags & GIL_NOTFILENAME) @@ -530,7 +530,7 @@ wcscpy (psfi->szDisplayName, szLocation); psfi->iIcon = iIndex; } - pei->lpVtbl->Release(pei); + IExtractIconW_Release(pei); } } } @@ -553,7 +553,7 @@ static const WCHAR p1W[] = {'%','1',0}; psfi->iIcon = 0; - szExt = (LPWSTR) PathFindExtensionW(sTemp); + szExt = PathFindExtensionW(sTemp); if ( szExt && HCR_MapTypeToValueW(szExt, sTemp, MAX_PATH, TRUE) && HCR_GetDefaultIconW(sTemp, sTemp, MAX_PATH, &icon_idx)) @@ -569,18 +569,22 @@ } else { - IconNotYetLoaded=FALSE; + UINT ret; if (flags & SHGFI_SMALLICON) - PrivateExtractIconsW( sTemp,icon_idx, + ret = PrivateExtractIconsW( sTemp,icon_idx, GetSystemMetrics( SM_CXSMICON ), GetSystemMetrics( SM_CYSMICON ), &psfi->hIcon, 0, 1, 0); else - PrivateExtractIconsW( sTemp, icon_idx, + ret = PrivateExtractIconsW( sTemp, icon_idx, GetSystemMetrics( SM_CXICON), GetSystemMetrics( SM_CYICON), &psfi->hIcon, 0, 1, 0); - psfi->iIcon = icon_idx; + if (ret != 0 && ret != 0xFFFFFFFF) + { + IconNotYetLoaded=FALSE; + psfi->iIcon = icon_idx; + } } } } @@ -593,7 +597,7 @@ ret = FALSE; } } - if (ret) + if (ret && (flags & SHGFI_SYSICONINDEX)) { if (flags & SHGFI_SMALLICON) ret = (DWORD_PTR) ShellSmallIconList; @@ -633,6 +637,11 @@ /************************************************************************* * SHGetFileInfoA [SHELL32.@] + * + * Note: + * MSVBVM60.__vbaNew2 expects this function to return a value in range + * 1 .. 0x7fff when the function succeeds and flags does not contain + * SHGFI_EXETYPE or SHGFI_SYSICONINDEX (see bug 7701) */ DWORD_PTR WINAPI SHGetFileInfoA(LPCSTR path,DWORD dwFileAttributes, SHFILEINFOA *psfi, UINT sizeofpsfi,

1 0

[cwittich] 44081: partial shell32 sync to wine 1.1.32
by cwittich＠svn.reactos.org 10 Nov '09

10 Nov '09

Author: cwittich Date: Tue Nov 10 22:29:56 2009 New Revision: 44081 URL: http://svn.reactos.org/svn/reactos?rev=44081&view=rev Log: partial shell32 sync to wine 1.1.32 Modified: trunk/reactos/dll/win32/shell32/shellitem.c trunk/reactos/dll/win32/shell32/shellole.c Modified: trunk/reactos/dll/win32/shell32/shellitem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellite… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellitem.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellitem.c [iso-8859-1] Tue Nov 10 22:29:56 2009 @@ -337,13 +337,13 @@ { IPersistFolder2* ppf2Parent; - if (!SUCCEEDED(IPersistFolder2_QueryInterface(psfParent, &IID_IPersistFolder2, (void**)&ppf2Parent))) + if (FAILED(IPersistFolder2_QueryInterface(psfParent, &IID_IPersistFolder2, (void**)&ppf2Parent))) { FIXME("couldn't get IPersistFolder2 interface of parent\n"); return E_NOINTERFACE; } - if (!SUCCEEDED(IPersistFolder2_GetCurFolder(ppf2Parent, &temp_parent))) + if (FAILED(IPersistFolder2_GetCurFolder(ppf2Parent, &temp_parent))) { FIXME("couldn't get parent PIDL\n"); IPersistFolder2_Release(ppf2Parent); Modified: trunk/reactos/dll/win32/shell32/shellole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellole… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellole.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellole.c [iso-8859-1] Tue Nov 10 22:29:56 2009 @@ -41,6 +41,7 @@ } InterfaceTable[] = { {&CLSID_ShellFSFolder, &IFSFolder_Constructor}, {&CLSID_MyComputer, &ISF_MyComputer_Constructor}, + {&CLSID_NetworkPlaces, &ISF_NetworkPlaces_Constructor}, {&CLSID_ShellDesktop, &ISF_Desktop_Constructor}, {&CLSID_ShellItem, &IShellItem_Constructor}, {&CLSID_ShellLink, &IShellLink_Constructor}, @@ -53,7 +54,6 @@ {&CLSID_FolderShortcut, &FolderShortcut_Constructor}, #endif {&CLSID_MyDocuments, &ISF_MyDocuments_Constructor}, - {&CLSID_NetworkPlaces, &ISF_NetworkPlaces_Constructor}, {&CLSID_FontsFolderShortcut, &ISF_Fonts_Constructor}, {&CLSID_Printers, &ISF_Printers_Constructor}, {&CLSID_AdminFolderShortcut, &ISF_AdminTools_Constructor}, @@ -181,7 +181,7 @@ FreeLibrary( hLibrary ); hres = E_ACCESSDENIED; goto end; - } else if (! SUCCEEDED(hres = DllGetClassObject(myclsid, &IID_IClassFactory, (LPVOID*)&pcf))) { + } else if (FAILED(hres = DllGetClassObject(myclsid, &IID_IClassFactory, (LPVOID*)&pcf))) { TRACE("GetClassObject failed 0x%08x\n", hres); goto end; } @@ -538,7 +538,7 @@ void WINAPI DragFinish(HDROP h) { TRACE("\n"); - GlobalFree((HGLOBAL)h); + GlobalFree(h); } /************************************************************************* @@ -551,7 +551,7 @@ TRACE("\n"); - lpDropFileStruct = (DROPFILES *) GlobalLock(hDrop); + lpDropFileStruct = GlobalLock(hDrop); *p = lpDropFileStruct->pt; bRet = lpDropFileStruct->fNC; @@ -572,7 +572,7 @@ { LPSTR lpDrop; UINT i = 0; - DROPFILES *lpDropFileStruct = (DROPFILES *) GlobalLock(hDrop); + DROPFILES *lpDropFileStruct = GlobalLock(hDrop); TRACE("(%p, %x, %p, %u)\n", hDrop,lFile,lpszFile,lLength); @@ -627,7 +627,7 @@ { LPWSTR lpwDrop; UINT i = 0; - DROPFILES *lpDropFileStruct = (DROPFILES *) GlobalLock(hDrop); + DROPFILES *lpDropFileStruct = GlobalLock(hDrop); TRACE("(%p, %x, %p, %u)\n", hDrop,lFile,lpszwFile,lLength);

1 0

[cwittich] 44080: fix ILCreateControlPanel and ILCreatePrinters
by cwittich＠svn.reactos.org 10 Nov '09

10 Nov '09

Author: cwittich Date: Tue Nov 10 21:35:07 2009 New Revision: 44080 URL: http://svn.reactos.org/svn/reactos?rev=44080&view=rev Log: fix ILCreateControlPanel and ILCreatePrinters Modified: trunk/reactos/dll/win32/shell32/pidl.c Modified: trunk/reactos/dll/win32/shell32/pidl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.c?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] Tue Nov 10 21:35:07 2009 @@ -138,6 +138,9 @@ return SUCCEEDED(ret); } +/************************************************************************* + * ILGetDisplayNameEx [SHELL32.186] + */ BOOL WINAPI ILGetDisplayNameEx(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPVOID path, DWORD type) { TRACE_(shell)("%p %p %p %d\n", psf, pidl, path, type); @@ -1367,14 +1370,31 @@ LPITEMIDLIST _ILCreateControlPanel(void) { - LPITEMIDLIST ret = NULL; - LPITEMIDLIST parent = _ILCreateGuid(PT_GUID, &CLSID_MyComputer); + LPITEMIDLIST parent = _ILCreateGuid(PT_GUID, &CLSID_MyComputer), ret = NULL; TRACE("()\n"); - if (parent) { - LPITEMIDLIST printers = _ILCreateGuid(PT_YAGUID, &CLSID_ControlPanel); + LPITEMIDLIST cpl = _ILCreateGuid(PT_SHELLEXT, &CLSID_ControlPanel); + + if (cpl) + { + ret = ILCombine(parent, cpl); + SHFree(cpl); + } + SHFree(parent); + } + return ret; +} + +LPITEMIDLIST _ILCreatePrinters(void) +{ + LPITEMIDLIST parent = _ILCreateGuid(PT_GUID, &CLSID_MyComputer), ret = NULL; + + TRACE("()\n"); + if (parent) + { + LPITEMIDLIST printers = _ILCreateGuid(PT_YAGUID, &CLSID_Printers); if (printers) { @@ -1384,13 +1404,6 @@ SHFree(parent); } return ret; - - return _ILCreateGuid(PT_SHELLEXT, &CLSID_ControlPanel); -} - -LPITEMIDLIST _ILCreatePrinters(void) -{ - return _ILCreateGuid(PT_YAGUID, &CLSID_Printers); } LPITEMIDLIST _ILCreateNetwork(void)

1 0

[cwittich] 44079: sync shell32/shelllink to wine 1.1.32
by cwittich＠svn.reactos.org 10 Nov '09

10 Nov '09

Author: cwittich Date: Tue Nov 10 21:09:00 2009 New Revision: 44079 URL: http://svn.reactos.org/svn/reactos?rev=44079&view=rev Log: sync shell32/shelllink to wine 1.1.32 Modified: trunk/reactos/dll/win32/shell32/shelllink.c Modified: trunk/reactos/dll/win32/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelllink.c [iso-8859-1] Tue Nov 10 21:09:00 2009 @@ -219,35 +219,35 @@ } else if(IsEqualIID(riid, &IID_IShellLinkW)) { - *ppvObj = (void *)&(This->lpvtblw); + *ppvObj = &(This->lpvtblw); } else if(IsEqualIID(riid, &IID_IPersistFile)) { - *ppvObj = (void *)&(This->lpvtblPersistFile); + *ppvObj = &(This->lpvtblPersistFile); } else if(IsEqualIID(riid, &IID_IPersistStream)) { - *ppvObj = (void *)&(This->lpvtblPersistStream); + *ppvObj = &(This->lpvtblPersistStream); } else if(IsEqualIID(riid, &IID_IShellLinkDataList)) { - *ppvObj = (void *)&(This->lpvtblShellLinkDataList); + *ppvObj = &(This->lpvtblShellLinkDataList); } else if(IsEqualIID(riid, &IID_IShellExtInit)) { - *ppvObj = (void *)&(This->lpvtblShellExtInit); + *ppvObj = &(This->lpvtblShellExtInit); } else if(IsEqualIID(riid, &IID_IContextMenu)) { - *ppvObj = (void *)&(This->lpvtblContextMenu); + *ppvObj = &(This->lpvtblContextMenu); } else if(IsEqualIID(riid, &IID_IObjectWithSite)) { - *ppvObj = (void *)&(This->lpvtblObjectWithSite); + *ppvObj = &(This->lpvtblObjectWithSite); } else if(IsEqualIID(riid, &IID_IShellPropSheetExt)) { - *ppvObj = (void *)&(This->lpvtblPropSheetExt); + *ppvObj = &(This->lpvtblPropSheetExt); } if(*ppvObj) @@ -299,7 +299,7 @@ if (This->pPidl) ILFree(This->pPidl); - LocalFree((HANDLE)This); + LocalFree(This); return 0; } @@ -308,7 +308,7 @@ { TRACE("%p %p\n", This, pclsid); - memcpy( pclsid, &CLSID_ShellLink, sizeof (CLSID) ); + *pclsid = CLSID_ShellLink; return S_OK; } @@ -1650,6 +1650,8 @@ IShellLinkImpl *This = (IShellLinkImpl *)iface; TRACE("(%p)->(path=%s)\n",This, pszFile); + + if (!pszFile) return E_INVALIDARG; str = HEAP_strdupAtoW(GetProcessHeap(), 0, pszFile); if( !str )

1 0

[sginsberg] 44078: - Correct author of freeze.c (code was copied from cpu.c).
by sginsberg＠svn.reactos.org 10 Nov '09

10 Nov '09

Author: sginsberg Date: Tue Nov 10 17:42:31 2009 New Revision: 44078 URL: http://svn.reactos.org/svn/reactos?rev=44078&view=rev Log: - Correct author of freeze.c (code was copied from cpu.c). Modified: trunk/reactos/ntoskrnl/ke/freeze.c Modified: trunk/reactos/ntoskrnl/ke/freeze.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeze.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeze.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/freeze.c [iso-8859-1] Tue Nov 10 17:42:31 2009 @@ -4,7 +4,7 @@ * FILE: ntoskrnl/ke/freeze.c * PURPOSE: Routines for freezing and unfreezing processors for * kernel debugger synchronization. - * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org) + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES *******************************************************************/

1 0

[sginsberg] 44077: - Fix missing initialization of KdComPortInUse, containing the base address of the port used by kdcom. The serial driver checks this variable to determine if it can use the port or if it should stay (the fuck) off. KdCom no longer hangs after serial driver initialization in second stage.
by sginsberg＠svn.reactos.org 10 Nov '09

10 Nov '09

Author: sginsberg Date: Tue Nov 10 15:23:44 2009 New Revision: 44077 URL: http://svn.reactos.org/svn/reactos?rev=44077&view=rev Log: - Fix missing initialization of KdComPortInUse, containing the base address of the port used by kdcom. The serial driver checks this variable to determine if it can use the port or if it should stay (the fuck) off. KdCom no longer hangs after serial driver initialization in second stage. Modified: trunk/reactos/drivers/base/kddll/kdcom.c Modified: trunk/reactos/drivers/base/kddll/kdcom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kdcom.c… ============================================================================== --- trunk/reactos/drivers/base/kddll/kdcom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kdcom.c [iso-8859-1] Tue Nov 10 15:23:44 2009 @@ -204,6 +204,7 @@ /* Get base address */ ComPortBase = UlongToPtr(BaseArray[ComPortNumber]); + KdComPortInUse = ComPortBase; /* Initialize the port */ return KdpPortInitialize();

1 0

[janderwald] 44076: [KS] - Implement KsGenerateEvent
by janderwald＠svn.reactos.org 10 Nov '09

10 Nov '09

Author: janderwald Date: Tue Nov 10 11:50:57 2009 New Revision: 44076 URL: http://svn.reactos.org/svn/reactos?rev=44076&view=rev Log: [KS] - Implement KsGenerateEvent Modified: trunk/reactos/drivers/ksfilter/ks/event.c Modified: trunk/reactos/drivers/ksfilter/ks/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/event.… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/event.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/event.c [iso-8859-1] Tue Nov 10 11:50:57 2009 @@ -285,7 +285,7 @@ /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS @@ -293,8 +293,38 @@ KsGenerateEvent( IN PKSEVENT_ENTRY EntryEvent) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + if (EntryEvent->NotificationType == KSEVENTF_EVENT_HANDLE || EntryEvent->NotificationType == KSEVENTF_EVENT_OBJECT) + { + // signal event + KeSetEvent(EntryEvent->Object, 0, FALSE); + } + else if (EntryEvent->NotificationType == KSEVENTF_SEMAPHORE_HANDLE || EntryEvent->NotificationType == KSEVENTF_SEMAPHORE_OBJECT) + { + // release semaphore + KeReleaseSemaphore(EntryEvent->Object, 0, EntryEvent->SemaphoreAdjustment, FALSE); + } + else if (EntryEvent->NotificationType == KSEVENTF_DPC) + { + // queue dpc + KeInsertQueueDpc((PRKDPC)EntryEvent->Object, NULL, NULL); + } + else if (EntryEvent->NotificationType == KSEVENTF_WORKITEM) + { + // queue work item + ExQueueWorkItem((PWORK_QUEUE_ITEM)EntryEvent->Object, PtrToUlong(EntryEvent->BufferItem)); + } + else if (EntryEvent->NotificationType == KSEVENTF_KSWORKITEM) + { + // queue work item of ks worker + return KsQueueWorkItem((PKSWORKER)EntryEvent->Object, (PWORK_QUEUE_ITEM)EntryEvent->DpcItem); + } + else + { + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; + } + + return STATUS_SUCCESS; } /*

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs