Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[turner] 20076: merge 20048

by turner＠svn.reactos.com

merge 20048 Modified: branches/ros-branch-0_2_9/reactos/lib/cpl/sysdm/environment.c _____ Modified: branches/ros-branch-0_2_9/reactos/lib/cpl/sysdm/environment.c --- branches/ros-branch-0_2_9/reactos/lib/cpl/sysdm/environment.c 2005-12-11 19:28:17 UTC (rev 20075) +++ branches/ros-branch-0_2_9/reactos/lib/cpl/sysdm/environment.c 2005-12-11 19:30:07 UTC (rev 20076) @@ -473,7 +473,71 @@ } } +VOID +SetAllVars(HWND hwndDlg, + INT iDlgItem) +{ + HWND hwndListView; + PVARIABLE_DATA VarData; + LV_ITEM lvi; + INT iItem; + HKEY hk; + DWORD Type = 0; + memset(&lvi, 0x00, sizeof(lvi)); + + /* Get the handle to the list box with all system vars in it */ + hwndListView = GetDlgItem(hwndDlg, iDlgItem); + /* first item is 0 */ + iItem = 0; + /* set up struct to retreive item */ + lvi.mask = LVIF_PARAM; + lvi.iItem = iItem; + + /* Open or create the key */ + if (RegCreateKeyEx((iDlgItem == IDC_SYSTEM_VARIABLE_LIST ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER), + (iDlgItem == IDC_SYSTEM_VARIABLE_LIST ? _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment") : _T("Environment")), + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE | KEY_READ, + NULL, + &hk, + NULL)) + { + return; + } + + /* loop through all system variables */ + while(ListView_GetItem(hwndListView, &lvi)) + { + /* Get the data in each item */ + VarData = (PVARIABLE_DATA)lvi.lParam; + if (VarData != NULL) + { + /* Get the type */ + RegQueryValueEx(hk,VarData->lpName,NULL,&Type,NULL,NULL); + + /* Set the new value */ + if (RegSetValueEx(hk, + VarData->lpName, + 0, + Type, + (LPBYTE) VarData->lpRawValue, + (DWORD) (_tcsclen(VarData->lpRawValue)* sizeof(TCHAR))+1)) + { + RegCloseKey(hk); + return; + } + } + /* Fill struct for next item */ + lvi.mask = LVIF_PARAM; + lvi.iItem = ++iItem; + } + + RegCloseKey(hk); +} + /* Environment dialog procedure */ INT_PTR CALLBACK EnvironmentDlgProc(HWND hwndDlg, @@ -515,7 +579,8 @@ return TRUE; case IDOK: - /* FIXME: Set environment variables in the registry */ + SetAllVars(hwndDlg, IDC_USER_VARIABLE_LIST); + SetAllVars(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); case IDCANCEL: ReleaseListViewItems(hwndDlg, IDC_USER_VARIABLE_LIST);

18 years, 9 months

[turner] 20075: merge 20051 / 20052

by turner＠svn.reactos.com

merge 20051 / 20052 Modified: branches/ros-branch-0_2_9/reactos/lib/kernel32/misc/errormsg.c _____ Modified: branches/ros-branch-0_2_9/reactos/lib/kernel32/misc/errormsg.c --- branches/ros-branch-0_2_9/reactos/lib/kernel32/misc/errormsg.c 2005-12-11 19:27:51 UTC (rev 20074) +++ branches/ros-branch-0_2_9/reactos/lib/kernel32/misc/errormsg.c 2005-12-11 19:28:17 UTC (rev 20075) @@ -177,6 +177,10 @@ if (dwFlags & FORMAT_MESSAGE_FROM_STRING) { from = HeapAlloc( GetProcessHeap(), 0, strlen((LPCSTR)lpSource)+1 ); + if (from == NULL) + { + return 0; + } strcpy( from, (LPCSTR)lpSource ); } else {

18 years, 9 months

[turner] 20074: merge 20053

by turner＠svn.reactos.com

merge 20053 Modified: branches/ros-branch-0_2_9/reactos/lib/kernel32/misc/dllmain.c _____ Modified: branches/ros-branch-0_2_9/reactos/lib/kernel32/misc/dllmain.c --- branches/ros-branch-0_2_9/reactos/lib/kernel32/misc/dllmain.c 2005-12-11 19:27:22 UTC (rev 20073) +++ branches/ros-branch-0_2_9/reactos/lib/kernel32/misc/dllmain.c 2005-12-11 19:27:51 UTC (rev 20074) @@ -348,6 +348,10 @@ SystemDirectory.Buffer = RtlAllocateHeap(hProcessHeap, 0, SystemDirectory.MaximumLength); + if(SystemDirectory.Buffer == NULL) + { + return FALSE; + } wcscpy(SystemDirectory.Buffer, WindowsDirectory.Buffer); wcscat(SystemDirectory.Buffer, L"\\System32");

18 years, 9 months

[turner] 20073: merge 20049

by turner＠svn.reactos.com

merge 20049 Modified: branches/ros-branch-0_2_9/reactos/lib/cpl/appwiz/En.rc _____ Modified: branches/ros-branch-0_2_9/reactos/lib/cpl/appwiz/En.rc --- branches/ros-branch-0_2_9/reactos/lib/cpl/appwiz/En.rc 2005-12-11 19:21:18 UTC (rev 20072) +++ branches/ros-branch-0_2_9/reactos/lib/cpl/appwiz/En.rc 2005-12-11 19:27:22 UTC (rev 20073) @@ -13,7 +13,7 @@ ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 LTEXT "The following Software can be automatically removed. To remove a program or to modify its installed components, select it from the list and click Add/Remove.",-1,36,72,PROPSHEETWIDTH-48,32 LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP - PUSHBUTTON "Add/&Remove", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 + PUSHBUTTON "Modify/&Remove", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 END IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT

18 years, 9 months

[weiden] 20072: define and use __w64 for MSVC (if not using PSDK/DDK)

by weiden＠svn.reactos.com

define and use __w64 for MSVC (if not using PSDK/DDK) Modified: trunk/reactos/w32api/include/basetsd.h _____ Modified: trunk/reactos/w32api/include/basetsd.h --- trunk/reactos/w32api/include/basetsd.h 2005-12-11 18:29:27 UTC (rev 20071) +++ trunk/reactos/w32api/include/basetsd.h 2005-12-11 19:21:18 UTC (rev 20072) @@ -4,6 +4,14 @@ #pragma GCC system_header #endif +#ifndef _W64 +#if defined(_MSC_VER) && !defined(MIDL_PASS) && _MSC_VER >= 1300 +#define _W64 __w64 +#else +#define _W64 +#endif +#endif + #ifdef __GNUC__ #ifndef __int64 #define __int64 long long @@ -56,11 +64,11 @@ typedef unsigned int UINT32, *PUINT32; #if defined(_WIN64) -typedef __int64 INT_PTR, *PINT_PTR; -typedef unsigned __int64 UINT_PTR, *PUINT_PTR; -typedef __int64 LONG_PTR, *PLONG_PTR; -typedef unsigned __int64 ULONG_PTR, *PULONG_PTR; -typedef unsigned __int64 HANDLE_PTR; +typedef _W64 __int64 INT_PTR, *PINT_PTR; +typedef _W64 unsigned __int64 UINT_PTR, *PUINT_PTR; +typedef _W64 __int64 LONG_PTR, *PLONG_PTR; +typedef _W64 unsigned __int64 ULONG_PTR, *PULONG_PTR; +typedef _W64 unsigned __int64 HANDLE_PTR; typedef unsigned int UHALF_PTR, *PUHALF_PTR; typedef int HALF_PTR, *PHALF_PTR; @@ -94,18 +102,18 @@ #endif /* 0_ */ #else /* !_WIN64 */ -typedef int INT_PTR, *PINT_PTR; -typedef unsigned int UINT_PTR, *PUINT_PTR; -typedef long LONG_PTR, *PLONG_PTR; -typedef unsigned long ULONG_PTR, *PULONG_PTR; +typedef _W64 int INT_PTR, *PINT_PTR; +typedef _W64 unsigned int UINT_PTR, *PUINT_PTR; +typedef _W64 long LONG_PTR, *PLONG_PTR; +typedef _W64 unsigned long ULONG_PTR, *PULONG_PTR; typedef unsigned short UHALF_PTR, *PUHALF_PTR; typedef short HALF_PTR, *PHALF_PTR; -typedef unsigned long HANDLE_PTR; +typedef _W64 unsigned long HANDLE_PTR; #endif /* !_WIN64 */ -typedef ULONG_PTR SIZE_T, *PSIZE_T; -typedef LONG_PTR SSIZE_T, *PSSIZE_T; -typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR; +typedef _W64 ULONG_PTR SIZE_T, *PSIZE_T; +typedef _W64 LONG_PTR SSIZE_T, *PSSIZE_T; +typedef _W64 ULONG_PTR DWORD_PTR, *PDWORD_PTR; typedef __int64 LONG64, *PLONG64; typedef __int64 INT64, *PINT64; typedef unsigned __int64 ULONG64, *PULONG64;

18 years, 9 months

[sgasiorek] 20071: Remove dot at the end of filename without extension

by sgasiorek＠svn.reactos.com

Remove dot at the end of filename without extension Modified: trunk/reactos/drivers/fs/cdfs/misc.c _____ Modified: trunk/reactos/drivers/fs/cdfs/misc.c --- trunk/reactos/drivers/fs/cdfs/misc.c 2005-12-11 17:53:49 UTC (rev 20070) +++ trunk/reactos/drivers/fs/cdfs/misc.c 2005-12-11 18:29:27 UTC (rev 20071) @@ -50,6 +50,11 @@ if (t[i+1] == 0 && t[i] == ';') break; } + if ((i>2)&&(t[i-2] == '.')) + { + t[i-2] = 0; + t[i-1] = 0; + } t[i] = 0; t[i+1] = 0; }

18 years, 9 months

[greatlrd] 20070: complete the sync with wine 0.9.2

by greatlrd＠svn.reactos.com

complete the sync with wine 0.9.2 Modified: trunk/reactos/lib/dxdiagn/container.c Modified: trunk/reactos/lib/dxdiagn/dxdiag_main.c Modified: trunk/reactos/lib/dxdiagn/dxdiagn.spec Modified: trunk/reactos/lib/dxdiagn/dxdiagn.xml _____ Modified: trunk/reactos/lib/dxdiagn/container.c --- trunk/reactos/lib/dxdiagn/container.c 2005-12-11 17:51:36 UTC (rev 20069) +++ trunk/reactos/lib/dxdiagn/container.c 2005-12-11 17:53:49 UTC (rev 20070) @@ -44,18 +44,28 @@ ULONG WINAPI IDxDiagContainerImpl_AddRef(PDXDIAGCONTAINER iface) { IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; - TRACE("(%p) : AddRef from %ld\n", This, This->ref); - return ++(This->ref); + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(ref before=%lu)\n", This, refCount - 1); + + DXDIAGN_LockModule(); + + return refCount; } ULONG WINAPI IDxDiagContainerImpl_Release(PDXDIAGCONTAINER iface) { IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; - ULONG ref = --This->ref; - TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); - if (ref == 0) { + ULONG refCount = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(ref before=%lu)\n", This, refCount + 1); + + if (!refCount) { HeapFree(GetProcessHeap(), 0, This); } - return ref; + + DXDIAGN_UnlockModule(); + + return refCount; } /* IDxDiagContainer Interface follow: */ @@ -70,9 +80,9 @@ } HRESULT WINAPI IDxDiagContainerImpl_EnumChildContainerNames(PDXDIAGCONTAINER iface, DWORD dwIndex, LPWSTR pwszContainer, DWORD cchContainer) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; IDxDiagContainerImpl_SubContainer* p = NULL; DWORD i = 0; - IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; TRACE("(%p, %lu, %s, %lu)\n", iface, dwIndex, debugstr_w(pwszContainer), cchContainer); @@ -98,9 +108,28 @@ return E_INVALIDARG; } +HRESULT WINAPI IDxDiagContainerImpl_GetChildContainerInternal(PDXDIAGCONTAINER iface, LPCWSTR pwszContainer, IDxDiagContainer** ppInstance) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + IDxDiagContainerImpl_SubContainer* p = NULL; + + p = This->subContainers; + while (NULL != p) { + if (0 == lstrcmpW(p->contName, pwszContainer)) { + *ppInstance = (PDXDIAGCONTAINER)p->pCont; + return S_OK; + } + p = p->next; + } + return E_INVALIDARG; +} + HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(PDXDIAGCONTAINER iface, LPCWSTR pwszContainer, IDxDiagContainer** ppInstance) { - IDxDiagContainerImpl_SubContainer* p = NULL; IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + IDxDiagContainer* pContainer = NULL; + LPWSTR tmp, orig_tmp; + INT tmp_len; + WCHAR* cur; + HRESULT hr = E_INVALIDARG; FIXME("(%p, %s, %p)\n", iface, debugstr_w(pwszContainer), ppInstance); @@ -108,38 +137,161 @@ return E_INVALIDARG; } - p = This->subContainers; + pContainer = (PDXDIAGCONTAINER) This; + + tmp_len = strlenW(pwszContainer) + 1; + orig_tmp = tmp = HeapAlloc(GetProcessHeap(), 0, tmp_len * sizeof(WCHAR)); + if (NULL == tmp) return E_FAIL; + lstrcpynW(tmp, pwszContainer, tmp_len); + + cur = strchrW(tmp, '.'); + while (NULL != cur) { + *cur = '\0'; /* cut tmp string to '.' */ + hr = IDxDiagContainerImpl_GetChildContainerInternal(pContainer, tmp, &pContainer); + if (!SUCCEEDED(hr) || NULL == pContainer) + goto on_error; + *cur++; /* go after '.' (just replaced by \0) */ + tmp = cur; + cur = strchrW(tmp, '.'); + } + + hr = IDxDiagContainerImpl_GetChildContainerInternal(pContainer, tmp, ppInstance); + if (SUCCEEDED(hr)) { + IDxDiagContainerImpl_AddRef((PDXDIAGCONTAINER)*ppInstance); + } + +on_error: + HeapFree(GetProcessHeap(), 0, orig_tmp); + return hr; +} + +HRESULT WINAPI IDxDiagContainerImpl_GetNumberOfProps(PDXDIAGCONTAINER iface, DWORD* pdwCount) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + TRACE("(%p)\n", iface); + if (NULL == pdwCount) { + return E_INVALIDARG; + } + *pdwCount = This->nProperties; + return S_OK; +} + +HRESULT WINAPI IDxDiagContainerImpl_EnumPropNames(PDXDIAGCONTAINER iface, DWORD dwIndex, LPWSTR pwszPropName, DWORD cchPropName) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + IDxDiagContainerImpl_Property* p = NULL; + DWORD i = 0; + + FIXME("(%p, %lu, %s, %lu)\n", iface, dwIndex, debugstr_w(pwszPropName), cchPropName); + + if (NULL == pwszPropName) { + return E_INVALIDARG; + } + if (256 > cchPropName) { + return DXDIAG_E_INSUFFICIENT_BUFFER; + } + + p = This->properties; while (NULL != p) { - if (0 == lstrcmpW(p->contName, pwszContainer)) { - IDxDiagContainerImpl_QueryInterface((PDXDIAGCONTAINER)p, &IID_IDxDiagContainer, (void**) ppInstance); + if (dwIndex == i) { + if (cchPropName <= lstrlenW(p->vName)) { + return DXDIAG_E_INSUFFICIENT_BUFFER; + } + lstrcpynW(pwszPropName, p->vName, cchPropName); return S_OK; } p = p->next; - } - + ++i; + } return E_INVALIDARG; } -HRESULT WINAPI IDxDiagContainerImpl_GetNumberOfProps(PDXDIAGCONTAINER iface, DWORD* pdwCount) { - /* IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; */ - FIXME("(%p, %p): stub\n", iface, pdwCount); +HRESULT WINAPI IDxDiagContainerImpl_GetProp(PDXDIAGCONTAINER iface, LPCWSTR pwszPropName, VARIANT* pvarProp) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + IDxDiagContainerImpl_Property* p = NULL; + FIXME("(%p, %s, %p)\n", iface, debugstr_w(pwszPropName), pvarProp); + + if (NULL == pvarProp || NULL == pwszPropName) { + return E_INVALIDARG; + } + + p = This->properties; + while (NULL != p) { + if (0 == lstrcmpW(p->vName, pwszPropName)) { + VariantCopy(pvarProp, &p->v); + return S_OK; + } + p = p->next; + } return S_OK; } -HRESULT WINAPI IDxDiagContainerImpl_EnumPropNames(PDXDIAGCONTAINER iface, DWORD dwIndex, LPWSTR pwszPropName, DWORD cchPropName) { - /* IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; */ - FIXME("(%p, %lu, %s, %lu): stub\n", iface, dwIndex, debugstr_w(pwszPropName), cchPropName); +HRESULT WINAPI IDxDiagContainerImpl_AddProp(PDXDIAGCONTAINER iface, LPCWSTR pwszPropName, VARIANT* pVarProp) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + IDxDiagContainerImpl_Property* p = NULL; + IDxDiagContainerImpl_Property* pNew = NULL; + + FIXME("(%p, %s, %p)\n", iface, debugstr_w(pwszPropName), pVarProp); + + if (NULL == pVarProp || NULL == pwszPropName) { + return E_INVALIDARG; + } + + pNew = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDxDiagContainerImpl_Property)); + if (NULL == pNew) { + return E_OUTOFMEMORY; + } + VariantInit(&pNew->v); + VariantCopy(&pNew->v, pVarProp); + pNew->vName = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (lstrlenW(pwszPropName) + 1) * sizeof(WCHAR)); + lstrcpyW(pNew->vName, pwszPropName); + pNew->next = NULL; + + p = This->properties; + if (NULL == p) { + This->properties = pNew; + } else { + while (NULL != p->next) { + p = p->next; + } + p->next = pNew; + } + ++This->nProperties; return S_OK; } -HRESULT WINAPI IDxDiagContainerImpl_GetProp(PDXDIAGCONTAINER iface, LPCWSTR pwszPropName, VARIANT* pvarProp) { - /* IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; */ - FIXME("(%p, %s, %p): stub\n", iface, debugstr_w(pwszPropName), pvarProp); +HRESULT WINAPI IDxDiagContainerImpl_AddChildContainer(PDXDIAGCONTAINER iface, LPCWSTR pszContName, PDXDIAGCONTAINER pSubCont) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + IDxDiagContainerImpl_SubContainer* p = NULL; + IDxDiagContainerImpl_SubContainer* pNew = NULL; + + FIXME("(%p, %s, %p)\n", iface, debugstr_w(pszContName), pSubCont); + + if (NULL == pSubCont || NULL == pszContName) { + return E_INVALIDARG; + } + + pNew = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDxDiagContainerImpl_SubContainer)); + if (NULL == pNew) { + return E_OUTOFMEMORY; + } + pNew->pCont = pSubCont; + pNew->contName = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (lstrlenW(pszContName) + 1) * sizeof(WCHAR)); + lstrcpyW(pNew->contName, pszContName); + pNew->next = NULL; + + p = This->subContainers; + if (NULL == p) { + This->subContainers = pNew; + } else { + while (NULL != p->next) { + p = p->next; + } + p->next = pNew; + } + ++This->nSubContainers; return S_OK; } - -IDxDiagContainerVtbl DxDiagContainer_Vtbl = +static const IDxDiagContainerVtbl DxDiagContainer_Vtbl = { IDxDiagContainerImpl_QueryInterface, IDxDiagContainerImpl_AddRef, @@ -167,4 +319,3 @@ container->ref = 0; /* will be inited with QueryInterface */ return IDxDiagContainerImpl_QueryInterface((PDXDIAGCONTAINER)container, riid, ppobj); } - _____ Modified: trunk/reactos/lib/dxdiagn/dxdiag_main.c --- trunk/reactos/lib/dxdiagn/dxdiag_main.c 2005-12-11 17:51:36 UTC (rev 20069) +++ trunk/reactos/lib/dxdiagn/dxdiag_main.c 2005-12-11 17:53:49 UTC (rev 20070) @@ -25,6 +25,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); +LONG DXDIAGN_refCount = 0; + /* At process attach */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -39,45 +41,50 @@ * DXDiag ClassFactory */ typedef struct { - /* IUnknown fields */ - IClassFactoryVtbl *lpVtbl; - DWORD ref; + const IClassFactoryVtbl *lpVtbl; REFCLSID rclsid; HRESULT (*pfnCreateInstanceFactory)(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); } IClassFactoryImpl; static HRESULT WINAPI DXDiagCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + + if (ppobj == NULL) return E_POINTER; - FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj); return E_NOINTERFACE; } static ULONG WINAPI DXDiagCF_AddRef(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - return InterlockedIncrement(&This->ref); + DXDIAGN_LockModule(); + + return 2; /* non-heap based object */ } static ULONG WINAPI DXDiagCF_Release(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - /* static class, won't be freed */ - return InterlockedDecrement(&This->ref); + DXDIAGN_UnlockModule(); + + return 1; /* non-heap based object */ } static HRESULT WINAPI DXDiagCF_CreateInstance(LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj) { IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); - TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); return This->pfnCreateInstanceFactory(iface, pOuter, riid, ppobj); } static HRESULT WINAPI DXDiagCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - FIXME("(%p)->(%d),stub!\n",This,dolock); + TRACE("(%d)\n", dolock); + + if (dolock) + DXDIAGN_LockModule(); + else + DXDIAGN_UnlockModule(); + return S_OK; } -static IClassFactoryVtbl DXDiagCF_Vtbl = { +static const IClassFactoryVtbl DXDiagCF_Vtbl = { DXDiagCF_QueryInterface, DXDiagCF_AddRef, DXDiagCF_Release, @@ -86,8 +93,8 @@ }; static IClassFactoryImpl DXDiag_CFS[] = { - { &DXDiagCF_Vtbl, 1, &CLSID_DxDiagProvider, DXDiag_CreateDXDiagProvider }, - { NULL, 0, NULL, NULL } + { &DXDiagCF_Vtbl, &CLSID_DxDiagProvider, DXDiag_CreateDXDiagProvider }, + { NULL, NULL, NULL } }; /*********************************************************************** @@ -95,7 +102,7 @@ */ HRESULT WINAPI DllCanUnloadNow(void) { - return S_FALSE; + return DXDIAGN_refCount != 0 ? S_FALSE : S_OK; } /*********************************************************************** _____ Modified: trunk/reactos/lib/dxdiagn/dxdiagn.spec --- trunk/reactos/lib/dxdiagn/dxdiagn.spec 2005-12-11 17:51:36 UTC (rev 20069) +++ trunk/reactos/lib/dxdiagn/dxdiagn.spec 2005-12-11 17:53:49 UTC (rev 20070) @@ -1,4 +1,4 @@ -@ stdcall -private DllCanUnloadNow() DllCanUnloadNow -@ stdcall -private DllGetClassObject(ptr ptr ptr) DllGetClassObject -@ stdcall -private DllRegisterServer() DllRegisterServer -@ stdcall -private DllUnregisterServer() DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() _____ Modified: trunk/reactos/lib/dxdiagn/dxdiagn.xml --- trunk/reactos/lib/dxdiagn/dxdiagn.xml 2005-12-11 17:51:36 UTC (rev 20069) +++ trunk/reactos/lib/dxdiagn/dxdiagn.xml 2005-12-11 17:53:49 UTC (rev 20070) @@ -17,6 +17,7 @@ <library>user32</library> <library>advapi32</library> <library>ole32</library> + <library>oleaut32</library> <library>dxguid</library> <library>strmiids</library> <file>container.c</file>

18 years, 9 months

[greatlrd] 20069: dshow header not completet. but egnuth be in use.

by greatlrd＠svn.reactos.com

dshow header not completet. but egnuth be in use. Added: trunk/reactos/w32api/include/DShow.h _____ Added: trunk/reactos/w32api/include/DShow.h --- trunk/reactos/w32api/include/DShow.h 2005-12-11 17:43:10 UTC (rev 20068) +++ trunk/reactos/w32api/include/DShow.h 2005-12-11 17:51:36 UTC (rev 20069) @@ -0,0 +1,51 @@ + +#ifndef __DSHOW_INCLUDED__ +#define __DSHOW_INCLUDED__ + +#if __GNUC__ >= 3 +#pragma GCC system_header +#endif + +#if _MSC_VER>=1100 +#define AM_NOVTABLE __declspec(novtable) +#else +#define AM_NOVTABLE +#endif + + +#include <windows.h> +#include <windowsx.h> +#include <olectl.h> +#include <ddraw.h> +#include <mmsystem.h> + +#ifndef NUMELMS + #define NUMELMS(aa) (sizeof(aa)/sizeof((aa)[0])) +#endif + +#include <strmif.h> +#include <amvideo.h> +#include <amaudio.h> +//#include <control.h> +#include <evcode.h> +#include <uuids.h> +#include <errors.h> +#include <edevdefs.h> +#include <audevcod.h> +#include <dvdevcod.h> + +#ifndef OATRUE +#define OATRUE (-1) +#endif +#ifndef OAFALSE +#define OAFALSE (0) +#endif + + +#ifndef InterlockedExchangePointer +#define InterlockedExchangePointer(Target, Value) \ + (PVOID)InterlockedExchange((PLONG)(Target), (LONG)(Value)) +#endif + + +#endif Property changes on: trunk/reactos/w32api/include/DShow.h ___________________________________________________________________ Name: svn:eol-style + native

18 years, 9 months

[greatlrd] 20068: solv one of dxdiagn sync problem part 3

by greatlrd＠svn.reactos.com

solv one of dxdiagn sync problem part 3 Modified: trunk/reactos/w32api/include/dsound.h _____ Modified: trunk/reactos/w32api/include/dsound.h --- trunk/reactos/w32api/include/dsound.h 2005-12-11 17:02:07 UTC (rev 20067) +++ trunk/reactos/w32api/include/dsound.h 2005-12-11 17:43:10 UTC (rev 20068) @@ -19,6 +19,10 @@ #ifndef __WINE_DSOUND_H #define __WINE_DSOUND_H +#if __GNUC__ >= 3 +#pragma GCC system_header +#endif + #ifndef DIRECTSOUND_VERSION #define DIRECTSOUND_VERSION 0x0900 #endif

18 years, 9 months

[hbirr] 20067: Allocate a tem buffer for the module names in LdrpQueryModuleInformation, because it isn't possible to call RtlUnicodeStringToAnsiString if the irql is raised to DPC_LEVEL.

by hbirr＠svn.reactos.com

Allocate a tem buffer for the module names in LdrpQueryModuleInformation, because it isn't possible to call RtlUnicodeStringToAnsiString if the irql is raised to DPC_LEVEL. Modified: trunk/reactos/ntoskrnl/ldr/loader.c _____ Modified: trunk/reactos/ntoskrnl/ldr/loader.c --- trunk/reactos/ntoskrnl/ldr/loader.c 2005-12-11 16:46:40 UTC (rev 20066) +++ trunk/reactos/ntoskrnl/ldr/loader.c 2005-12-11 17:02:07 UTC (rev 20067) @@ -394,6 +394,9 @@ ANSI_STRING AnsiName; PCHAR p; KIRQL Irql; + PUNICODE_STRING UnicodeName; + ULONG tmpBufferSize = 0; + PWCHAR tmpNameBuffer; KeAcquireSpinLock(&ModuleListLock,&Irql); @@ -402,6 +405,8 @@ while (current_entry != (&ModuleListHead)) { ModuleCount++; + current = CONTAINING_RECORD(current_entry,LDR_DATA_TABLE_ENTRY,InLoadOrderModuleLi st); + tmpBufferSize += current->FullDllName.Length + sizeof(WCHAR) + sizeof(UNICODE_STRING); current_entry = current_entry->Flink; } @@ -414,6 +419,15 @@ return(STATUS_INFO_LENGTH_MISMATCH); } + /* allocate a temp buffer to store the module names */ + UnicodeName = ExAllocatePool(NonPagedPool, tmpBufferSize); + if (UnicodeName == NULL) + { + KeReleaseSpinLock(&ModuleListLock, Irql); + return STATUS_INSUFFICIENT_RESOURCES; + } + tmpNameBuffer = (PWCHAR)((ULONG_PTR)UnicodeName + ModuleCount * sizeof(UNICODE_STRING)); + /* fill the buffer */ memset(Buffer, '=', Size); @@ -434,13 +448,25 @@ Smi->Module[ModuleCount].Index = (USHORT)ModuleCount; Smi->Module[ModuleCount].NameLength = 0; Smi->Module[ModuleCount].LoadCount = 0; /* FIXME */ + UnicodeName[ModuleCount].Buffer = tmpNameBuffer; + UnicodeName[ModuleCount].MaximumLength = current->FullDllName.Length + sizeof(WCHAR); + tmpNameBuffer += UnicodeName[ModuleCount].MaximumLength / sizeof(WCHAR); + RtlCopyUnicodeString(&UnicodeName[ModuleCount], &current->FullDllName); + ModuleCount++; + current_entry = current_entry->Flink; + } + + KeReleaseSpinLock(&ModuleListLock, Irql); + + for (ModuleCount = 0; ModuleCount < Smi->Count; ModuleCount++) + { AnsiName.Length = 0; - AnsiName.MaximumLength = 256; + AnsiName.MaximumLength = 255; AnsiName.Buffer = Smi->Module[ModuleCount].ImageName; - RtlUnicodeStringToAnsiString(&AnsiName, - &current->FullDllName, - FALSE); + RtlUnicodeStringToAnsiString(&AnsiName, &UnicodeName[ModuleCount], FALSE); + AnsiName.Buffer[AnsiName.Length] = 0; + Smi->Module[ModuleCount].NameLength = AnsiName.Length; p = strrchr(AnsiName.Buffer, '\\'); if (p == NULL) @@ -452,12 +478,9 @@ p++; Smi->Module[ModuleCount].PathLength = p - AnsiName.Buffer; } - - ModuleCount++; - current_entry = current_entry->Flink; } - KeReleaseSpinLock(&ModuleListLock, Irql); + ExFreePool(UnicodeName); return(STATUS_SUCCESS); }

18 years, 9 months

← Newer
1
...
40
41
42
43
44
45
46
...
71
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 December 2005