Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[hyperion] 37623: modified base/shell/explorer/explorer.rbuild modified dll/win32/glu32/glu32.rbuild modified dll/win32/kernel32/kernel32.rbuild modified drivers/wdm/audio/backpln/portcls/portcls.rbuild modified ReactOS-generic.rbuild Set -Wno-non-virtual-dtor globally because we have no use for this warning and it only messes with COM interface definitions This alone disables a ton of spurious warnings modified tools/rbuild/backend/mingw/mingw.cpp modified tools/rbuild/backend/mingw/modulehandl

by hyperion＠svn.reactos.org

Author: hyperion Date: Mon Nov 24 13:29:13 2008 New Revision: 37623 URL: http://svn.reactos.org/svn/reactos?rev=37623&view=rev Log: modified base/shell/explorer/explorer.rbuild modified dll/win32/glu32/glu32.rbuild modified dll/win32/kernel32/kernel32.rbuild modified drivers/wdm/audio/backpln/portcls/portcls.rbuild modified ReactOS-generic.rbuild Set -Wno-non-virtual-dtor globally because we have no use for this warning and it only messes with COM interface definitions This alone disables a ton of spurious warnings modified tools/rbuild/backend/mingw/mingw.cpp modified tools/rbuild/backend/mingw/modulehandler.cpp modified tools/rbuild/backend/mingw/modulehandler.h Project-global compiler flags now actually work as intended Removed some dead code modified dll/directx/dxdiagn/container.c modified dll/directx/wine/d3d8/device.c modified dll/directx/wine/d3d9/device.c modified dll/win32/comdlg32/printdlg.c modified dll/win32/crypt32/chain.c modified dll/win32/crypt32/main.c modified dll/win32/crypt32/oid.c modified dll/win32/crypt32/protectdata.c modified dll/win32/crypt32/rootstore.c modified dll/win32/dbghelp/pe_module.c modified dll/win32/fusion/assembly.c modified dll/win32/gdiplus/font.c modified dll/win32/gdiplus/image.c modified dll/win32/icmp/icmp_main.c Get rid of warnings. Patch by Robin Geuze <r.geuze(a)chello.nl> Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/base/shell/explorer/explorer.rbuild trunk/reactos/dll/directx/dxdiagn/container.c trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/win32/comdlg32/printdlg.c trunk/reactos/dll/win32/crypt32/chain.c trunk/reactos/dll/win32/crypt32/main.c trunk/reactos/dll/win32/crypt32/oid.c trunk/reactos/dll/win32/crypt32/protectdata.c trunk/reactos/dll/win32/crypt32/rootstore.c trunk/reactos/dll/win32/dbghelp/pe_module.c trunk/reactos/dll/win32/fusion/assembly.c trunk/reactos/dll/win32/gdiplus/font.c trunk/reactos/dll/win32/gdiplus/image.c trunk/reactos/dll/win32/glu32/glu32.rbuild trunk/reactos/dll/win32/icmp/icmp_main.c trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Mon Nov 24 13:29:13 2008 @@ -119,4 +119,5 @@ <xi:include href="tools/tools.rbuild" /> </directory> + <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> </group> Modified: trunk/reactos/base/shell/explorer/explorer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] Mon Nov 24 13:29:13 2008 @@ -2,7 +2,6 @@ <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> <module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true" unicode="yes"> - <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <include base="explorer">.</include> <define name="WIN32" /> <define name="__WINDRES__" /> Modified: trunk/reactos/dll/directx/dxdiagn/container.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dxdiagn/contai… ============================================================================== --- trunk/reactos/dll/directx/dxdiagn/container.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dxdiagn/container.c [iso-8859-1] Mon Nov 24 13:29:13 2008 @@ -150,7 +150,7 @@ hr = IDxDiagContainerImpl_GetChildContainerInternal(pContainer, tmp, &pContainer); if (!SUCCEEDED(hr) || NULL == pContainer) goto on_error; - *cur++; /* go after '.' (just replaced by \0) */ + cur++; /* go after '.' (just replaced by \0) */ tmp = cur; cur = strchrW(tmp, '.'); } Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/device.c [iso-8859-1] Mon Nov 24 13:29:13 2008 @@ -1817,7 +1817,7 @@ } shader = This->shader_handles[pVertexShader - (VS_HIGHESTFIXEDFXF + 1)]; - hr = IWineD3DVertexShader_GetFunction(shader->wineD3DVertexShader, pData, pSizeOfData); + hr = IWineD3DVertexShader_GetFunction(shader->wineD3DVertexShader, pData, (UINT*)pSizeOfData); LeaveCriticalSection(&d3d8_cs); return hr; } @@ -2024,7 +2024,7 @@ } shader = This->shader_handles[pPixelShader - (VS_HIGHESTFIXEDFXF + 1)]; - hr = IWineD3DPixelShader_GetFunction(shader->wineD3DPixelShader, pData, pSizeOfData); + hr = IWineD3DPixelShader_GetFunction(shader->wineD3DPixelShader, pData, (UINT*)pSizeOfData); LeaveCriticalSection(&d3d8_cs); return hr; } Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/device.c [iso-8859-1] Mon Nov 24 13:29:13 2008 @@ -277,11 +277,11 @@ surface_desc.Type = &type; surface_desc.Usage = &dummy_dword; surface_desc.Pool = &pool; - surface_desc.Size = &dummy_dword; - surface_desc.MultiSampleType = &dummy_dword; + surface_desc.Size = (UINT*)&dummy_dword; + surface_desc.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *)&dummy_dword; surface_desc.MultiSampleQuality = &dummy_dword; - surface_desc.Width = &dummy_dword; - surface_desc.Height = &dummy_dword; + surface_desc.Width = (UINT*)&dummy_dword; + surface_desc.Height = (UINT*)&dummy_dword; IWineD3DSurface_GetDesc((IWineD3DSurface *) resource, &surface_desc); break; @@ -291,10 +291,10 @@ volume_desc.Type = &type; volume_desc.Usage = &dummy_dword; volume_desc.Pool = &pool; - volume_desc.Size = &dummy_dword; - volume_desc.Width = &dummy_dword; - volume_desc.Height = &dummy_dword; - volume_desc.Depth = &dummy_dword; + volume_desc.Size = (UINT*)&dummy_dword; + volume_desc.Width = (UINT*)&dummy_dword; + volume_desc.Height = (UINT*)&dummy_dword; + volume_desc.Depth = (UINT*)&dummy_dword; IWineD3DVolume_GetDesc((IWineD3DVolume *) resource, &volume_desc); break; Modified: trunk/reactos/dll/win32/comdlg32/printdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/printdl… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/printdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/printdlg.c [iso-8859-1] Mon Nov 24 13:29:13 2008 @@ -1047,12 +1047,12 @@ { if(dpiX == Resolutions[i]) IsDefault = TRUE; - sprintf(buf, "%d dpi", Resolutions[i]); + sprintf(buf, "%d dpi", (int)Resolutions[i]); } else { if(dpiX == Resolutions[i] && dpiY == Resolutions[i+1]) IsDefault = TRUE; - sprintf(buf, "%d dpi x %d dpi", Resolutions[i], Resolutions[i+1]); + sprintf(buf, "%d dpi x %d dpi", (int)Resolutions[i], (int)Resolutions[i+1]); } Index = SendMessageA(hQuality, CB_ADDSTRING, 0, (LPARAM)buf); @@ -2471,15 +2471,15 @@ _c_size2strA(PageSetupDataA *pda,DWORD size,LPSTR strout) { strcpy(strout,"<undef>"); if (pda->dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS) { - sprintf(strout,"%d",(size)/100); + sprintf(strout,"%d",(int)(size)/100); return; } if (pda->dlga->Flags & PSD_INTHOUSANDTHSOFINCHES) { - sprintf(strout,"%din",(size)/1000); + sprintf(strout,"%din",(int)(size)/1000); return; } pda->dlga->Flags |= PSD_INHUNDREDTHSOFMILLIMETERS; - sprintf(strout,"%d",(size)/100); + sprintf(strout,"%d",(int)(size)/100); return; } static void Modified: trunk/reactos/dll/win32/crypt32/chain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/chain.c?… ============================================================================== --- trunk/reactos/dll/win32/crypt32/chain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/chain.c [iso-8859-1] Mon Nov 24 13:29:13 2008 @@ -205,9 +205,8 @@ config.cbSize = sizeof(config); CertCreateCertificateChainEngine(&config, &engine); - InterlockedCompareExchangePointer(&CRYPT_defaultChainEngine, engine, - NULL); - if (CRYPT_defaultChainEngine != engine) + HCERTCHAINENGINE Original = (HCERTCHAINENGINE)InterlockedCompareExchangePointer(&CRYPT_defaultChainEngine, engine, NULL); + if (CRYPT_defaultChainEngine == Original || CRYPT_defaultChainEngine != engine) CertFreeCertificateChainEngine(engine); } return CRYPT_defaultChainEngine; Modified: trunk/reactos/dll/win32/crypt32/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/crypt32/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/main.c [iso-8859-1] Mon Nov 24 13:29:13 2008 @@ -64,9 +64,9 @@ CryptAcquireContextW(&prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); - InterlockedCompareExchangePointer((PVOID *)&hDefProv, (PVOID)prov, - NULL); - if (hDefProv != prov) + HCRYPTPROV Original = (HCRYPTPROV)InterlockedCompareExchangePointer((PVOID *)&hDefProv, (PVOID)prov, + NULL);//ugly hax to satisfy GCC + if (Original == hDefProv || hDefProv != prov) CryptReleaseContext(prov, 0); } return hDefProv; Modified: trunk/reactos/dll/win32/crypt32/oid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/oid.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/oid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/oid.c [iso-8859-1] Mon Nov 24 13:29:13 2008 @@ -157,7 +157,7 @@ LPCSTR pszOID) { static const char szEncodingTypeFmt[] = - "Software\\Microsoft\\Cryptography\\OID\\EncodingType %d\\%s\\%s"; + "Software\\Microsoft\\Cryptography\\OID\\EncodingType %u\\%s\\%s"; UINT len; char numericOID[7]; /* enough for "#65535" */ const char *oid; @@ -185,7 +185,7 @@ szKey = CryptMemAlloc(len); if (szKey) sprintf(szKey, szEncodingTypeFmt, - GET_CERT_ENCODING_TYPE(dwEncodingType), pszFuncName, oid); + (unsigned int)GET_CERT_ENCODING_TYPE(dwEncodingType), pszFuncName, oid); return szKey; } Modified: trunk/reactos/dll/win32/crypt32/protectdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/protectd… ============================================================================== --- trunk/reactos/dll/win32/crypt32/protectdata.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/protectdata.c [iso-8859-1] Mon Nov 24 13:29:13 2008 @@ -404,7 +404,7 @@ } /* cipher_alg */ - if (!unserialize_dword(ptr,&index,size,&pInfo->cipher_alg)) + if (!unserialize_dword(ptr,&index,size,(DWORD*)&pInfo->cipher_alg)) { ERR("reading cipher_alg failed!\n"); return FALSE; @@ -433,7 +433,7 @@ } /* hash_alg */ - if (!unserialize_dword(ptr,&index,size,&pInfo->hash_alg)) + if (!unserialize_dword(ptr,&index,size,(DWORD*)&pInfo->hash_alg)) { ERR("reading hash_alg failed!\n"); return FALSE; Modified: trunk/reactos/dll/win32/crypt32/rootstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/rootstor… ============================================================================== --- trunk/reactos/dll/win32/crypt32/rootstore.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/rootstore.c [iso-8859-1] Mon Nov 24 13:29:13 2008 @@ -314,7 +314,7 @@ static BOOL import_certs_from_dir(LPCSTR path, HCERTSTORE store) { BOOL ret = FALSE; - DIR *dir; + //DIR *dir; TRACE("(%s, %p)\n", debugstr_a(path), store); /* UNIX functions = bad for reactos @@ -752,9 +752,9 @@ { HCERTSTORE root = create_root_store(); - InterlockedCompareExchangePointer((PVOID *)&CRYPT_rootStore, root, + HCERTSTORE Original = (HCERTSTORE)InterlockedCompareExchangePointer((PVOID *)&CRYPT_rootStore, root, NULL); - if (CRYPT_rootStore != root) + if (CRYPT_rootStore == Original || CRYPT_rootStore != root) CertCloseStore(root, 0); } CertDuplicateStore(CRYPT_rootStore); Modified: trunk/reactos/dll/win32/dbghelp/pe_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/pe_modul… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/pe_module.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/pe_module.c [iso-8859-1] Mon Nov 24 13:29:13 2008 @@ -270,7 +270,7 @@ for (j = 0; j < exports->NumberOfNames; j++) if ((ordinals[j] == i) && names[j]) break; if (j < exports->NumberOfNames) continue; - snprintf(buffer, sizeof(buffer), "%d", i + exports->Base); + snprintf(buffer, sizeof(buffer), "%u", (unsigned int)(i + exports->Base)); symt_new_public(module, NULL, buffer, base + (DWORD)functions[i], 1, TRUE /* FIXME */, TRUE /* FIXME */); } Modified: trunk/reactos/dll/win32/fusion/assembly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/assembly.… ============================================================================== --- trunk/reactos/dll/win32/fusion/assembly.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/assembly.c [iso-8859-1] Mon Nov 24 13:29:13 2008 @@ -812,7 +812,7 @@ goto done; } - if (!VerQueryValueA(verdata, "\\", (LPVOID *)&ffi, &size)) + if (!VerQueryValueA(verdata, "\\", (LPVOID *)&ffi, (PUINT)&size)) { hr = HRESULT_FROM_WIN32(GetLastError()); goto done; Modified: trunk/reactos/dll/win32/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/font.c?r… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] Mon Nov 24 13:29:13 2008 @@ -486,7 +486,7 @@ HDC hdc = GetDC(0); BOOL ret = FALSE; - if(!EnumFontFamiliesW(hdc, name, is_font_installed_proc, (LPARAM)ntm)) + if(!EnumFontFamiliesW(hdc, name, (FONTENUMPROCW)is_font_installed_proc, (LPARAM)ntm)) ret = TRUE; ReleaseDC(0, hdc); Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Mon Nov 24 13:29:13 2008 @@ -244,7 +244,7 @@ { IStream* stream; HRESULT hr; - INT size; + LONG size; TRACE("%p, %p\n", image, cloneImage); @@ -1060,7 +1060,7 @@ encode_image_func* encode_image; LPVOID output; unsigned int output_size; - unsigned int dummy; + ULONG dummy; int i; old_hbmp = 0; Modified: trunk/reactos/dll/win32/glu32/glu32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/glu32.rbui… ============================================================================== --- trunk/reactos/dll/win32/glu32/glu32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/glu32.rbuild [iso-8859-1] Mon Nov 24 13:29:13 2008 @@ -9,7 +9,6 @@ <define name="RESOLVE_3D_TEXTURE_SUPPORT" /> <define name="BUILD_GL32" /> <define name="LIBRARYBUILD" /> - <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <library>ntdll</library> <library>opengl32</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/icmp/icmp_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/icmp/icmp_main.c… ============================================================================== --- trunk/reactos/dll/win32/icmp/icmp_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/icmp/icmp_main.c [iso-8859-1] Mon Nov 24 13:29:13 2008 @@ -201,7 +201,7 @@ ) { icmp_t* icp=(icmp_t*)IcmpHandle; - unsigned char* reqbuf; + char* reqbuf; int reqsize; struct icmp_echo_reply* ier; @@ -214,7 +214,7 @@ struct timeval timeout; DWORD send_time,recv_time; struct sockaddr_in addr; - unsigned int addrlen; + int addrlen; unsigned short id,seq,cksum; int res; @@ -257,7 +257,7 @@ if (RequestOptions!=NULL) { int val; if (icp->default_opts.OptionsSize==IP_OPTS_UNKNOWN) { - unsigned int len; + int len; /* Before we mess with the options, get the default values */ len=sizeof(val); getsockopt(icp->sid,IPPROTO_IP,IP_TTL,(char *)&val,&len); Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Mon Nov 24 13:29:13 2008 @@ -125,7 +125,6 @@ <compilerflag compiler="cpp">-fno-exceptions</compilerflag> <compilerflag compiler="cpp">-fno-rtti</compilerflag> - <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <directory name="misc"> <file>icustubs.cpp</file> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] Mon Nov 24 13:29:13 2008 @@ -7,7 +7,6 @@ <linkerflag>-fno-exceptions</linkerflag> <linkerflag>-fno-rtti</linkerflag> --> - <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <importlibrary definition="portcls.spec" /> <define name="_NTDDK_" /> Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Mon Nov 24 13:29:13 2008 @@ -392,7 +392,7 @@ if ( data.includes.size () > 0 ) fprintf ( fMakefile, - "PROJECT_CFLAGS %s %s\n", + "PROJECT_CINCLUDES %s %s\n", assignmentOperation, MingwModuleHandler::GenerateGccIncludeParametersFromVector ( data.includes ).c_str ()); @@ -529,15 +529,16 @@ GenerateGlobalCFlagsAndProperties ( "=", ProjectNode.non_if_data ); GenerateProjectGccOptions ( "=", ProjectNode.non_if_data ); - fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CFLAGS) $(PROJECT_CDEFINES)\n" ); - fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CFLAGS) $(PROJECT_CDEFINES)\n" ); + fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CINCLUDES) $(PROJECT_CDEFINES)\n" ); + fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CINCLUDES) $(PROJECT_CDEFINES)\n" ); fprintf ( fMakefile, "PROJECT_LFLAGS := '$(shell ${TARGET_CC} -print-libgcc-file-name)' %s\n", GenerateProjectLFLAGS ().c_str () ); fprintf ( fMakefile, "PROJECT_LPPFLAGS := '$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)' '$(shell ${TARGET_CPP} -print-file-name=libgcc.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)'\n" ); - fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" ); + fprintf ( fMakefile, "PROJECT_GCCOPTIONS += -Wall\n" ); fprintf ( fMakefile, "ifneq ($(OARCH),)\n" ); - fprintf ( fMakefile, "PROJECT_CFLAGS += -march=$(OARCH)\n" ); + fprintf ( fMakefile, "PROJECT_GCCOPTIONS += -march=$(OARCH)\n" ); fprintf ( fMakefile, "endif\n" ); - fprintf ( fMakefile, "PROJECT_CFLAGS += $(PROJECT_GCCOPTIONS)\n" ); + fprintf ( fMakefile, "PROJECT_CFLAGS = $(PROJECT_GCCOPTIONS) $(PROJECT_GCC_CFLAGS)\n" ); + fprintf ( fMakefile, "PROJECT_CXXFLAGS = $(PROJECT_GCCOPTIONS) $(PROJECT_GCC_CXXFLAGS)\n" ); fprintf ( fMakefile, "\n" ); } Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Mon Nov 24 13:29:13 2008 @@ -752,7 +752,7 @@ { fprintf ( fMakefile, "# MACROS\n" ); GenerateMacro ( assignmentOperation, - cflagsMacro, + commonflagsMacro, data, &used_defs, true ); @@ -1118,7 +1118,7 @@ "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h -p -P $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(source)\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" - "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", + "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -fno-unit-at-a-time -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.o", @@ -1141,12 +1141,12 @@ Rule gppRule ( "$(source): ${$(module_name)_precondition}\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" - "\t${gpp} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", + "\t${gpp} -o $@ $($(module_name)_CXXFLAGS)$(compiler_flags) -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); Rule gppHostRule ( "$(source): ${$(module_name)_precondition}\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" - "\t${host_gpp} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", + "\t${host_gpp} -o $@ $($(module_name)_CXXFLAGS)$(compiler_flags) -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); Rule emptyRule ( "", NULL ); @@ -1658,7 +1658,7 @@ "\t%s -o %s %s %s -g %s\n\n", module.cplusplus ? cppc.c_str() : cc.c_str(), backend->GetFullName ( *pchFilename ).c_str(), - cflagsMacro.c_str(), + module.cplusplus ? cxxflagsMacro.c_str() : cflagsMacro.c_str(), GenerateCompilerParametersFromVector ( module.non_if_data.compilerFlags, module.cplusplus ? CompilerTypeCPP : CompilerTypeCC ).c_str(), backend->GetFullName ( baseHeaderFile ).c_str() ); delete pchFilename; @@ -1709,13 +1709,6 @@ fprintf ( fMakefile, "\n" ); return archiveFilename; -} - -string -MingwModuleHandler::GetCFlagsMacro () const -{ - return ssprintf ( "$(%s_CFLAGS)", - module.name.c_str () ); } /*static*/ string @@ -1847,7 +1840,9 @@ fprintf ( fMakefile, "# OTHER MACROS\n" ); + commonflagsMacro = ssprintf ("%s_COMMONFLAGS", module.name.c_str ()); cflagsMacro = ssprintf ("%s_CFLAGS", module.name.c_str ()); + cxxflagsMacro = ssprintf ("%s_CXXFLAGS", module.name.c_str ()); nasmflagsMacro = ssprintf ("%s_NASMFLAGS", module.name.c_str ()); windresflagsMacro = ssprintf ("%s_RCFLAGS", module.name.c_str ()); widlflagsMacro = ssprintf ("%s_WIDLFLAGS", module.name.c_str ()); @@ -1890,10 +1885,10 @@ fprintf ( fMakefile, "\n" ); } - string globalCflags = ""; + string globalCflags = " "; + globalCflags += ssprintf ("$(%s)", commonflagsMacro.c_str ()); if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse ) { - globalCflags += " $(PROJECT_CFLAGS)"; if ( module.dynamicCRT ) globalCflags += " -D_DLL -D__USE_CRTIMP"; } @@ -1930,7 +1925,13 @@ fMakefile, "%s +=%s\n", cflagsMacro.c_str (), - globalCflags.c_str () ); + (" $(PROJECT_CFLAGS)" + globalCflags).c_str () ); + + fprintf ( + fMakefile, + "%s +=%s\n", + cxxflagsMacro.c_str (), + (" $(PROJECT_CXXFLAGS)" + globalCflags).c_str () ); if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse ) { @@ -1972,6 +1973,10 @@ "%s += %s\n\n", cflagsMacro.c_str (), cflags ); + fprintf ( fMakefile, + "%s += %s\n\n", + cxxflagsMacro.c_str (), + cflags ); } const char* nasmflags = ModuleHandlerInformations[module.type].nasmflags; @@ -1997,12 +2002,17 @@ fprintf ( fMakefile, "%s += -Wno-main\n\n", cflagsMacro.c_str () ); + fprintf ( fMakefile, + "%s += -Wno-main\n\n", + cxxflagsMacro.c_str () ); } fprintf ( fMakefile, "\n\n" ); // future references to the macros will be to get their values + commonflagsMacro = ssprintf ("$(%s)", commonflagsMacro.c_str ()); cflagsMacro = ssprintf ("$(%s)", cflagsMacro.c_str ()); + cxxflagsMacro = ssprintf ("$(%s)", cxxflagsMacro.c_str ()); nasmflagsMacro = ssprintf ("$(%s)", nasmflagsMacro.c_str ()); widlflagsMacro = ssprintf ("$(%s)", widlflagsMacro.c_str ()); } Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] Mon Nov 24 13:29:13 2008 @@ -98,7 +98,6 @@ const Module& module ) const; std::string GetPreconditionDependenciesName () const; - std::string GetCFlagsMacro () const; static std::string GetObjectsMacro ( const Module& ); std::string GetLinkingDependenciesMacro () const; std::string GetLibsMacro () const; @@ -172,7 +171,9 @@ public: const Module& module; string_list clean_files; + std::string commonflagsMacro; std::string cflagsMacro; + std::string cxxflagsMacro; std::string nasmflagsMacro; std::string windresflagsMacro; std::string widlflagsMacro;

15 years, 10 months

[gschneider] 37622: - Add copyright information I forgot, update paths

by gschneider＠svn.reactos.org

Author: gschneider Date: Mon Nov 24 13:27:30 2008 New Revision: 37622 URL: http://svn.reactos.org/svn/reactos?rev=37622&view=rev Log: - Add copyright information I forgot, update paths Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c trunk/reactos/dll/win32/advapi32/sec/sid.c Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] Mon Nov 24 13:27:30 2008 @@ -1,7 +1,12 @@ /* * COPYRIGHT: See COPYING in the top level directory + * WINE COPYRIGHT: + * Copyright 1999, 2000 Juergen Schmied <juergen.schmied(a)debitel.net> + * Copyright 2003 CodeWeavers Inc. (Ulrich Czekalla) + * Copyright 2006 Robert Reif + * * PROJECT: ReactOS system libraries - * FILE: lib/advapi32/sec/misc.c + * FILE: dll/win32/advapi32/sec/misc.c * PURPOSE: Miscellaneous security functions (some ported from Wine) */ Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Mon Nov 24 13:27:30 2008 @@ -3,10 +3,11 @@ * WINE COPYRIGHT: * Copyright 1999, 2000 Juergen Schmied <juergen.schmied(a)debitel.net> * Copyright 2003 CodeWeavers Inc. (Ulrich Czekalla) + * Copyright 2006 Robert Reif * Copyright 2006 Hervé Poussineau * * PROJECT: ReactOS system libraries - * FILE: lib/advapi32/sec/sid.c + * FILE: dll/win32/advapi32/sec/sid.c * PURPOSE: Security ID functions */

15 years, 10 months

[dreimer] 37621: More updates for the new updater. A info command, some more comments and user select options.

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Nov 24 12:55:55 2008 New Revision: 37621 URL: http://svn.reactos.org/svn/reactos?rev=37621&view=rev Log: More updates for the new updater. A info command, some more comments and user select options. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Mon Nov 24 12:55:55 2008 @@ -238,6 +238,7 @@ "" " reset - Removes the Updates Cache. Not recommended." " nr X - Re/Installs Update Nr X." + " info X - Shows info about Update Nr X." " status - Shows the recent status of available, non installed updates." exit } Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] Mon Nov 24 12:55:55 2008 @@ -244,6 +244,7 @@ echo. echo reset - Removes the Updates Cache. Not recommended. echo nr X - Re/Installs Update Nr X. + echo info X - Shows info about Update Nr X. echo status - Shows the recent status of available, non installed updates. goto :EOC ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Mon Nov 24 12:55:55 2008 @@ -18,6 +18,12 @@ :: title Updating... +:: +:: Save the recent dir to cd back there at the end. +:: +set _ROSBE_OPATH=%~dp0 +set _ROSBE_OPATH=%_ROSBE_OPATH:~0,-1% + cd /d %_ROSBE_BASEDIR% :: @@ -26,7 +32,7 @@ set _ROSBE_URL=http://mitglied.lycos.de/reimerdaniel/rosbe :: -::First check for a new Updater +:: First check for a new Updater :: setlocal enabledelayedexpansion for %%F in (update.cmd) do set _ROSBE_UPDDATE=%%~tF @@ -37,19 +43,11 @@ echo Updater got updated and needs to be restarted. goto :EOC ) -for %%F in (updcheckproc.cmd) do set _ROSBE_UPDDATE=%%~tF -"Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/update.cmd 1> NUL 2> NUL -for %%F in (updcheckproc.cmd) do set _ROSBE_UPDDATE2=%%~tF -if !_ROSBE_UPDDATE! NEQ !_ROSBE_UPDDATE2! ( - cls - echo Updater got updated and needs to be restarted. - goto :EOC -) endlocal -set _ROSBE_OPATH=%~dp0 -set _ROSBE_OPATH=%_ROSBE_OPATH:~0,-1% - +:: +:: Get to the Updates Subfolder. +:: if not exist "Updates" mkdir Updates 1> NUL 2> NUL cd Updates @@ -85,6 +83,11 @@ if /i "%1" == "nr" ( set _ROSBE_STATCOUNT=%2 call :UPDCHECK + goto :EOC +) +if /i "%1" == "info" ( + set _ROSBE_STATCOUNT=%2 + call :UPDINFO goto :EOC ) if /i "%1" == "status" ( @@ -123,9 +126,25 @@ cd.. goto :EOF +:UPDINFO + +cd tmp +if not exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt 1> NUL 2> NUL + if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( + type "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" + ) else ( + echo ERROR: This Update does not seem to exist or the Internet connection is not working correctly. + goto :EOF + ) +) +cd.. +del /F /Q tmp\*.* 1> NUL 2> NUL +goto :EOF + :UPDFIN -del /F /Q tmp\*.* +del /F /Q tmp\*.* 1> NUL 2> NUL if not "%_ROSBE_UPDATES%" == "" ( echo Following Updates available: %_ROSBE_UPDATES% ) else ( @@ -157,12 +176,16 @@ goto :EOF ) ) else if /i "!YESNO!"=="no" ( - del "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" 1> NUL 2> NUL + echo Do you want to be asked again to install this update? + set /p YESNO="(yes), (no)" + if /i "!YESNO!"=="yes" ( + del "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" 1> NUL 2> NUL + ) goto :EOF ) endlocal ) else ( - if not "_ROSBE_MULTIUPD" == "1" ( + if not "%_ROSBE_MULTIUPD%" == "1" ( echo ERROR: This Update does not seem to exist or the Internet connection is not working correctly. goto :EOF )

15 years, 10 months

[gschneider] 37620: - Move slightly changed PS_ALTERNATE and PS_INSIDEFRAME checks from win32k to gdi32 - Don't restrict the width of PS_SOLID pens - Fixes 25 gdi32 pen winetests - Pen types left tbd: PS_NULL (problems in GetObject and ExtCreatePen) and PS_ALTNATE (EngLineTo/StrokePath does not support bitmap pens)

by gschneider＠svn.reactos.org

Author: gschneider Date: Mon Nov 24 12:40:46 2008 New Revision: 37620 URL: http://svn.reactos.org/svn/reactos?rev=37620&view=rev Log: - Move slightly changed PS_ALTERNATE and PS_INSIDEFRAME checks from win32k to gdi32 - Don't restrict the width of PS_SOLID pens - Fixes 25 gdi32 pen winetests - Pen types left tbd: PS_NULL (problems in GetObject and ExtCreatePen) and PS_ALTNATE (EngLineTo/StrokePath does not support bitmap pens) Modified: trunk/reactos/dll/win32/gdi32/objects/brush.c trunk/reactos/subsystems/win32/win32k/objects/pen.c Modified: trunk/reactos/dll/win32/gdi32/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/br… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/brush.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/brush.c [iso-8859-1] Mon Nov 24 12:40:46 2008 @@ -29,6 +29,18 @@ SetLastError(ERROR_INVALID_PARAMETER); return 0; } + } + else if ((dwPenStyle & PS_STYLE_MASK) == PS_INSIDEFRAME && + (dwPenStyle & PS_TYPE_MASK) != PS_GEOMETRIC) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + else if ((dwPenStyle & PS_STYLE_MASK) == PS_ALTERNATE && + (dwPenStyle & PS_TYPE_MASK) != PS_COSMETIC) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; } else { Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] Mon Nov 24 12:40:46 2008 @@ -79,7 +79,7 @@ hPen = PenObject->BaseObject.hHmgr; // If nWidth is zero, the pen is a single pixel wide, regardless of the current transformation. - if ((bOldStylePen) && (!dwWidth)) dwWidth = 1; + if ((bOldStylePen) && (!dwWidth) && (dwPenStyle & PS_STYLE_MASK) != PS_SOLID) dwWidth = 1; PenObject->ptPenWidth.x = dwWidth; PenObject->ptPenWidth.y = 0; @@ -108,8 +108,6 @@ break; case PS_ALTERNATE: - /* PS_ALTERNATE is applicable only for cosmetic pens */ - if ((dwPenStyle & PS_TYPE_MASK) == PS_GEOMETRIC) goto ExitCleanup; PenObject->flAttrs |= GDIBRUSH_IS_BITMAP; PenObject->hbmPattern = IntGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternAlternate); break; @@ -135,9 +133,6 @@ break; case PS_INSIDEFRAME: - /* FIXME: does it need some additional work? */ - /* PS_INSIDEFRAME is applicable only for geometric pens */ - if ((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC) goto ExitCleanup; PenObject->flAttrs |= (GDIBRUSH_IS_SOLID|GDIBRUSH_IS_INSIDEFRAME); break;

15 years, 10 months

[janderwald] 37619: - Fix heap corruption and memory leak - patch by Daniel Zimmermann - CID 707 - bug 3905

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Nov 24 12:05:51 2008 New Revision: 37619 URL: http://svn.reactos.org/svn/reactos?rev=37619&view=rev Log: - Fix heap corruption and memory leak - patch by Daniel Zimmermann - CID 707 - bug 3905 Modified: trunk/reactos/dll/cpl/sysdm/startrec.c Modified: trunk/reactos/dll/cpl/sysdm/startrec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/startrec.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] Mon Nov 24 12:05:51 2008 @@ -62,7 +62,7 @@ /* get Path to freeldr.ini or boot.ini */ *szSystemDrive = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); - if (szSystemDrive != NULL) + if (*szSystemDrive != NULL) { dwBufSize = GetEnvironmentVariableW(L"SystemDrive", *szSystemDrive, MAX_PATH); if (dwBufSize > MAX_PATH) @@ -83,15 +83,15 @@ else if (dwBufSize == 0) { FailGetSysDrive: - HeapFree(GetProcessHeap(), 0, szSystemDrive); + HeapFree(GetProcessHeap(), 0, *szSystemDrive); *szSystemDrive = NULL; - return FALSE; + return 0; } return dwBufSize; } - return FALSE; + return 0; } static PBOOTRECORD @@ -454,7 +454,7 @@ HINF hInf; dwBufSize = GetSystemDrive(&szSystemDrive); - if (!dwBufSize) + if (dwBufSize == 0) return FALSE; wcscpy(pStartInfo->szFreeldrIni, szSystemDrive); @@ -462,6 +462,8 @@ if (PathFileExistsW(pStartInfo->szFreeldrIni)) { + /* free resource previously allocated by GetSystemDrive() */ + HeapFree(GetProcessHeap(), 0, szSystemDrive); /* freeldr.ini exists */ hInf = SetupOpenInfFileW(pStartInfo->szFreeldrIni, NULL, @@ -481,6 +483,9 @@ /* try load boot.ini settings */ wcscpy(pStartInfo->szFreeldrIni, szSystemDrive); wcscat(pStartInfo->szFreeldrIni, L"\\boot.ini"); + + /* free resource previously allocated by GetSystemDrive() */ + HeapFree(GetProcessHeap(), 0, szSystemDrive); if (PathFileExistsW(pStartInfo->szFreeldrIni)) {

15 years, 10 months

[janderwald] 37618: - Store settings of SPI_SETMOUSEBUTTONSWAP in registry - bug 2443

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Nov 24 11:57:17 2008 New Revision: 37618 URL: http://svn.reactos.org/svn/reactos?rev=37618&view=rev Log: - Store settings of SPI_SETMOUSEBUTTONSWAP in registry - bug 2443 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Mon Nov 24 11:57:17 2008 @@ -44,6 +44,40 @@ RtlCopyMemory(font, &DefaultFont, sizeof(LOGFONTW)); } } + +VOID +IntWriteSystemParametersSettings(PUNICODE_STRING SubKeyName, PUNICODE_STRING KeyName, ULONG Type, PVOID Data, ULONG DataSize) +{ + UNICODE_STRING KeyPath; + NTSTATUS Status; + HANDLE CurrentUserKey, KeyHandle; + OBJECT_ATTRIBUTES KeyAttributes, ObjectAttributes; + + /* Get a handle to the current users settings */ + Status = RtlFormatCurrentUserKeyPath(&KeyPath); + if(!NT_SUCCESS(Status)) + return; + + InitializeObjectAttributes(&ObjectAttributes, &KeyPath, OBJ_CASE_INSENSITIVE, NULL, NULL); + /* Open the HKCU key */ + Status = ZwOpenKey(&CurrentUserKey, KEY_WRITE, &ObjectAttributes); + RtlFreeUnicodeString(&KeyPath); + if(!NT_SUCCESS(Status)) + return; + + + /* Open up the settings to read the values */ + InitializeObjectAttributes(&KeyAttributes, SubKeyName, OBJ_CASE_INSENSITIVE, CurrentUserKey, NULL); + Status = ZwOpenKey(&KeyHandle, KEY_WRITE, &KeyAttributes); + ZwClose(CurrentUserKey); + + if (NT_SUCCESS(Status)) + { + ZwSetValueKey(KeyHandle, KeyName, 0, Type, Data, DataSize); + ZwClose(KeyHandle); + } +} + ULONG FASTCALL @@ -260,9 +294,17 @@ CurInfo->MouseHoverHeight = uiParam; break; case SPI_SETMOUSEBUTTONSWAP: - CurInfo = IntGetSysCursorInfo(WinStaObject); - CurInfo->SwapButtons = uiParam; - break; + { + UNICODE_STRING SubKeyName = RTL_CONSTANT_STRING(L"Control Panel\\Mouse"); + UNICODE_STRING SwapMouseButtons = RTL_CONSTANT_STRING(L"SwapMouseButtons"); + WCHAR szBuffer[10]; + + swprintf(szBuffer, L"%u", uiParam); + CurInfo = IntGetSysCursorInfo(WinStaObject); + CurInfo->SwapButtons = uiParam; + IntWriteSystemParametersSettings(&SubKeyName, &SwapMouseButtons, REG_SZ, szBuffer, (wcslen(szBuffer)+1) * sizeof(WCHAR)); + break; + } case SPI_SETMOUSE: CurInfo = IntGetSysCursorInfo(WinStaObject); CurInfo->CursorAccelerationInfo = *(PCURSORACCELERATION_INFO)pvParam;

15 years, 10 months

[dgoette] 37617: * implemented list of depencies * some minor bugfixes

by dgoette＠svn.reactos.org

Author: dgoette Date: Mon Nov 24 10:12:48 2008 New Revision: 37617 URL: http://svn.reactos.org/svn/reactos?rev=37617&view=rev Log: * implemented list of depencies * some minor bugfixes Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Export_HTML.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Log.class.php Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js [iso-8859-1] Mon Nov 24 10:12:48 2008 @@ -1061,6 +1061,10 @@ function bshowhistory(did, drid) { makeRequest('?page=data_out&d_f=text&d_u=mef&d_fl=showhistory&d_id='+did+'&d_r_id='+drid, 'mef', 'frmedittagsc2', 'html', 'GET', ''); + } + + function bshowdepencies(did, drid) { + makeRequest('?page=data_out&d_f=text&d_u=mef&d_fl=showdepencies&d_id='+did+'&d_r_id='+drid, 'mef', 'frmedittagsc2', 'html', 'GET', ''); } function balterfields(did, drid, dusr) { Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php [iso-8859-1] Mon Nov 24 10:12:48 2008 @@ -504,7 +504,7 @@ $stmt->bindParam('id',$data_id,PDO::PARAM_INT); $stmt->execute(); - Log::writeMedium('data-name changed: '.$data['data_name'].' => '.$data_name.Log::prepareInfo($data_id, $rev_id).'{altersecurityfields}'); + Log::writeMedium('data-name changed: '.$data['data_name'].' => '.$data_name.Log::prepareInfo($data_id).'{altersecurityfields}'); if ($update_links == true) { if ($data_type == '') { @@ -558,7 +558,7 @@ } } // while - Log::writeMedium('data-interlinks updated due data-name change'.Log::prepareInfo($data_id, $rev_id).'{altersecurityfields}'); + Log::writeMedium('data-interlinks updated due data-name change'.Log::prepareInfo($data_id).'{altersecurityfields}'); } } // end data_name changes @@ -567,7 +567,7 @@ $stmt->bindParam('type_new',$data_type,PDO::PARAM_STR); $stmt->bindParam('data_id',$data_id,PDO::PARAM_INT); $stmt->execute(); - Log::writeMedium('data-type changed: '.$data['data_type'].' => '.$data_type.Log::prepareInfo($data_id, $rev_id).'{altersecurityfields}'); + Log::writeMedium('data-type changed: '.$data['data_type'].' => '.$data_type.Log::prepareInfo($data_id).'{altersecurityfields}'); } // end data_type changes if ($data_acl != '' && $data_acl != $data['data_acl']) { @@ -575,7 +575,7 @@ $stmt->bindParam('acl_new',$data_acl); $stmt->bindParam('data_id',$data_id); $stmt->execute(); - Log::writeMedium('data-acl changed: '.$data['data_acl'].' => '.$data_acl.Log::prepareInfo($data_id, $rev_id).'{altersecurityfields}'); + Log::writeMedium('data-acl changed: '.$data['data_acl'].' => '.$data_acl.Log::prepareInfo($data_id).'{altersecurityfields}'); } // end data_acl changes } // end of member function getCookieDomain Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php [iso-8859-1] Mon Nov 24 10:12:48 2008 @@ -32,6 +32,7 @@ const HISTORY = 2; const SECURITY = 3; const ENTRY = 4; + const DEPENCIES= 5; // types of new entries const SINGLE = 0; @@ -104,6 +105,11 @@ $this->showEntryDetails(self::HISTORY); break; + // show Depencies + case 'showdepencies': + $this->showEntryDetails(self::DEPENCIES); + break; + // show Field details case 'alterfields': $this->showEntryDetails(self::FIELDS); @@ -616,7 +622,7 @@ else { echo '<span class="detailmenu" onclick="'."bshowtag(".$this->data_id.",".$this->rev_id.",'a','b', '".$thisuser->id()."')".'">Metadata</span>'; } - echo " | "; + echo ' | '; // History if ($mode == self::HISTORY) { @@ -625,10 +631,19 @@ else { echo '<span class="detailmenu" onclick="'."bshowhistory(".$this->data_id.",".$this->rev_id.",'a','b', '".$thisuser->id()."')".'">History</span>'; } + echo ' | '; + + // Depencies + if ($mode == self::DEPENCIES) { + echo '<strong>Depencies</strong>'; + } + else { + echo '<span class="detailmenu" onclick="'."bshowdepencies(".$this->data_id.",".$this->rev_id.", '".$thisuser->id()."')".'">Depencies</span>'; + } // allowed only for someone with "add" rights if (Security::hasRight($this->data_id, 'add')) { - echo " | "; + echo ' | '; // Fields if ($mode == self::FIELDS) { @@ -637,7 +652,7 @@ else { echo '<span class="detailmenu" onclick="'."balterfields(".$this->data_id.",".$this->rev_id.", '".$thisuser->id()."')".'">Fields</span>'; } - echo " | "; + echo ' | '; if ($mode == self::ENTRY) { echo '<strong>Entry</strong>'; @@ -649,8 +664,9 @@ // allowed only for related super administrators if ($thisuser->isMemberOfGroup('ros_sadmin') || (Security::hasRight($this->data_id, 'add') && $thisuser->isMemberOfGroup('ros_admin'))) { - echo " | "; - + echo ' | '; + + // Security if ($mode == self::SECURITY) { echo '<strong>Security</strong>'; } @@ -658,6 +674,7 @@ echo '<span class="detailmenu" onclick="'."bshowsecurity(".$this->data_id.",".$this->rev_id.", '".$thisuser->id()."')".'">Security</span>'; } } + echo_strip(' </div> </div>'); @@ -669,6 +686,9 @@ break; case self::HISTORY: $this->showEntryDetailsHistory(); + break; + case self::DEPENCIES: + $this->showEntryDepencies($this->data_id); break; case self::SECURITY: $this->showEntryDetailsSecurity(); @@ -814,6 +834,64 @@ echo '</ul>'; } + /** + * + * + * @access private + */ + private function showEntryDepencies( $data_id ) + { + $stmt=DBConnection::getInstance()->prepare("SELECT data_name,data_type FROM data_ WHERE data_id = :data_id LIMIT 1"); + $stmt->bindParam('data_id',$data_id,PDO::PARAM_INT); + $stmt->execute(); + $data = $stmt->fetchOnce(PDO::FETCH_ASSOC); + + // get Data type + switch ($data['data_type']) { + case 'template': + $type_short = 'templ'; + break; + case 'content': + $type_short = 'cont'; + break; + case 'script': + $type_short = 'inc'; + break; + default: + echo '----this should not happen.<br />'; + var_dump($data); + return; + break; + } + + echo_strip(' + <br /> + <div class="frmeditheadline">Data Depencies</div> + <br />'); + + // search for depencies + $stmt=DBConnection::getInstance()->prepare("SELECT d.data_name, d.data_type, r.data_id, r.rev_id, r.rev_language FROM data_ d JOIN data_revision r ON r.data_id = d.data_id JOIN data_text t ON r.rev_id = t.data_rev_id WHERE t.text_content LIKE :content_phrase AND r.rev_version > 0 ORDER BY r.rev_language, d.data_name, d.data_type"); + $stmt->bindValue('content_phrase','%[#'.$type_short.'_'.$data['data_name'].']%',PDO::PARAM_STR); + $stmt->execute(); + + $last_language = null; + + // handle Depencies + while ($depency = $stmt->fetch(PDO::FETCH_ASSOC)) { + if ($depency['rev_language'] != $last_language) { + if ($last_language !== null) { + echo '</ul>'; + } + + echo '<h3>'.$depency['rev_language'].'</h3><ul>'; + $last_language = $depency['rev_language']; + } + + echo '<li>'.$depency['data_name'].' ('.$depency['data_type'].')</li>'; + } + echo '</ul>'; + } + /** * @@ -863,7 +941,7 @@ <br /> <br /> <button type="button" id="beditsavefields" onclick="'."editsavesecuritychanges('".$this->data_id."','".$this->rev_id."')".'">Save Changes</button>   - <button type="button" id="beditclear" onclick="'."bshowsecurity(".$this->data_id.",".$this->rev_id.", '".$thisuser->id()."')".'">Clear</button>'); + <button type="button" id="beditclear" onclick="'."bshowsecurity(".$this->data_id.",".$this->rev_id.", '".ThisUser::getInstance()->id()."')".'">Clear</button>'); } @@ -931,7 +1009,7 @@ </span> <br /><br /><br /> <button type="button" id="beditsavefields" onclick="'."editsavefieldchanges('".$this->data_id."','".$this->rev_id."')".'">Save Changes</button>   - <button type="button" id="beditclear" onclick="'."balterfields(".$this->data_id.",".$this->rev_id.", '".$thisuser->id()."')".'">Clear</button>'); + <button type="button" id="beditclear" onclick="'."balterfields(".$this->data_id.",".$this->rev_id.", '".ThisUser::getInstance()->id()."')".'">Clear</button>'); } @@ -992,7 +1070,7 @@ <br /> <br /> <button type="button" id="beditsaveentry" onclick="editsaveentrychanges('.$this->data_id.','.$this->rev_id.')">Save Changes</button>   - <button type="button" id="beditclear" onclick="'."bshowentry(".$this->data_id.",".$this->rev_id.", '".$thisuser->id()."')".'">Clear</button>'); + <button type="button" id="beditclear" onclick="'."bshowentry(".$this->data_id.",".$this->rev_id.", '".ThisUser::getInstance()->id()."')".'">Clear</button>'); } Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Export_HTML.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Export_HTML.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Export_HTML.class.php [iso-8859-1] Mon Nov 24 10:12:48 2008 @@ -139,7 +139,7 @@ while ($lang = $stmt->fetch(PDO::FETCH_ASSOC)) { // display language - echo '<p><b><u>'.$lang['lang_name'].'</u></b></p>'; + echo '<h3 style="text-decoration:underlien;>'.$lang['lang_name'].'</h3>'; // switch sql statement by generation mode if ($mode == 'single') { @@ -193,11 +193,11 @@ $html_content = $this->processTextByName($page['data_name'], $lang['lang_id'], $content['dynamic_num'], 'output'); // write content to filename, if possible - $fh = @fopen($destination_folder.$file_name, "w"); - if ($fh!==false){ + $fh = @fopen($destination_folder.$file_name, 'w'); + if ($fh !== false){ flock($fh,2); fputs($fh,$html_content); - fputs($fh,"\n\n'); + fputs($fh,''); flock($fh,3); fclose($fh); @@ -317,7 +317,7 @@ $page = $results[1]; } - $this->processText($page['rev_id'], $output_type); + return $this->processText($page['rev_id'], $output_type); } @@ -399,7 +399,7 @@ $stmt->execute(); $user_name = $stmt->fetchColumn(); $content = str_replace('[#roscms_user]', $user_name, $content); // account that generate - $content = str_replace("[#roscms_inc_author]", $user_name, $content); // account that changed the include text + $content = str_replace('[#roscms_inc_author]', $user_name, $content); // account that changed the include text // page version $content = str_replace('[#roscms_page_version]', $page['rev_version'], $content); @@ -495,7 +495,7 @@ $page_link = $roscms_intern_webserver_roscms.'?page=data_out&d_f=page&d_u=show&d_val=index&d_val2='.$this->lang.'&d_val3='; } else { - $page_link = $roscms_intern_webserver_roscms."?page=data_out&d_f=page&d_u=show&d_val=".$page_name_with_num."&d_val2=".$this->lang."&d_val3=".$dynamic_num; + $page_link = $roscms_intern_webserver_roscms.'?page=data_out&d_f=page&d_u=show&d_val='.$page_name_with_num.'&d_val2='.$this->lang.'&d_val3='.$dynamic_num; } if ($mode == 'edit') { @@ -518,7 +518,7 @@ } // get page link - if ($g_link_page_name == '') { + if ($page_name == '') { $page_link = $roscms_intern_webserver_pages.$this->lang.'/404.html'; } else{ Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Log.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Log.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Log.class.php [iso-8859-1] Mon Nov 24 10:12:48 2008 @@ -42,7 +42,7 @@ * @return * @access public */ - public static function prepareInfo( $data_id, $rev_id ) + public static function prepareInfo( $data_id, $rev_id = 'unknown' ) { return ' [dataid: '.$data_id.'; revid: '.$rev_id.'; userid: '.ThisUser::getInstance()->id().'; security: '.Security::rightsOverview($data_id).'] '; } // end of member function prepare_info

15 years, 10 months

[hyperion] 37616: modified ntoskrnl/ex/sysinfo.c MaxSystemInfoClass is now much larger than the size of the CallQS table: use the actual size of the table in range checks to prevent an overrun Fixes CID 527, CID 528

by hyperion＠svn.reactos.org

Author: hyperion Date: Mon Nov 24 07:47:44 2008 New Revision: 37616 URL: http://svn.reactos.org/svn/reactos?rev=37616&view=rev Log: modified ntoskrnl/ex/sysinfo.c MaxSystemInfoClass is now much larger than the size of the CallQS table: use the actual size of the table in range checks to prevent an overrun Fixes CID 527, CID 528 Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Mon Nov 24 07:47:44 2008 @@ -1794,6 +1794,9 @@ SI_QX(SystemSessionProcessesInformation) }; +C_ASSERT(SystemBasicInformation == 0); +#define MIN_SYSTEM_INFO_CLASS (SystemBasicInformation) +#define MAX_SYSTEM_INFO_CLASS (sizeof(CallQS) / sizeof(CallQS[0])) /* * @implemented @@ -1825,7 +1828,7 @@ /* * Check the request is valid. */ - if (SystemInformationClass >= MaxSystemInfoClass) + if (SystemInformationClass >= MAX_SYSTEM_INFO_CLASS) { _SEH2_YIELD(return STATUS_INVALID_INFO_CLASS); } @@ -1892,8 +1895,8 @@ /* * Check the request is valid. */ - if ( (SystemInformationClass >= SystemBasicInformation) - && (SystemInformationClass < MaxSystemInfoClass) + if ( (SystemInformationClass >= MIN_SYSTEM_INFO_CLASS) + && (SystemInformationClass < MAX_SYSTEM_INFO_CLASS) ) { if (NULL != CallQS [SystemInformationClass].Set)

15 years, 10 months

[hyperion] 37615: Everything Migrate ntoskrnl to PSEH 2.0. The code should speak for itself modified ntoskrnl/ex/atom.c _SEH_LEAVE was used improperly in NtQueryInformationAtom. As a free bonus, the upgrade to PSEH 2.0 (and to _SEH2_LEAVE) fixes the potential bug modified ntoskrnl/fsrtl/fastio.c Corrected exception filter logic modified ntoskrnl/include/internal/ex.h Goodbye _SEH_ExSystemExceptionFilter, you won't be missed modified ntoskrnl/include/internal/ntoskrnl.h Don't FORCEINLINE function

by hyperion＠svn.reactos.org

Author: hyperion Date: Mon Nov 24 07:40:26 2008 New Revision: 37615 URL: http://svn.reactos.org/svn/reactos?rev=37615&view=rev Log: Everything Migrate ntoskrnl to PSEH 2.0. The code should speak for itself modified ntoskrnl/ex/atom.c _SEH_LEAVE was used improperly in NtQueryInformationAtom. As a free bonus, the upgrade to PSEH 2.0 (and to _SEH2_LEAVE) fixes the potential bug modified ntoskrnl/fsrtl/fastio.c Corrected exception filter logic modified ntoskrnl/include/internal/ex.h Goodbye _SEH_ExSystemExceptionFilter, you won't be missed modified ntoskrnl/include/internal/ntoskrnl.h Don't FORCEINLINE functions that use SEH, it's bad form and the compiler doesn't like modified ntoskrnl/ke/i386/usercall.c Dispatch the correct EXCEPTION_RECORD in case of exception inside KiInitializeUserApc modified ntoskrnl/ke/powerpc/exp.c Removed bogus, unused SEH code modified ntoskrnl/ntoskrnl-generic.rbuild Sources using PSEH 2.0 must be compiled with -fno-unit-at-a-time due to a GCC bug. See also http://gcc.gnu.org/bugzilla/show_bug.cgi?id=17982 and http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054 Apparently, -fno-unit-at-a-time makes GCC crash when using precompiled headers. Disable precompiled headers for ntoskrnl Modified: trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/config/ntapi.c trunk/reactos/ntoskrnl/dbgk/dbgkobj.c trunk/reactos/ntoskrnl/ex/atom.c trunk/reactos/ntoskrnl/ex/event.c trunk/reactos/ntoskrnl/ex/evtpair.c trunk/reactos/ntoskrnl/ex/harderr.c trunk/reactos/ntoskrnl/ex/locale.c trunk/reactos/ntoskrnl/ex/mutant.c trunk/reactos/ntoskrnl/ex/profile.c trunk/reactos/ntoskrnl/ex/sem.c trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/ex/time.c trunk/reactos/ntoskrnl/ex/timer.c trunk/reactos/ntoskrnl/ex/uuid.c trunk/reactos/ntoskrnl/fsrtl/fastio.c trunk/reactos/ntoskrnl/include/internal/ex.h trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/include/ntoskrnl.h trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/io/iomgr/iocomp.c trunk/reactos/ntoskrnl/io/iomgr/iofunc.c trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c trunk/reactos/ntoskrnl/ke/except.c trunk/reactos/ntoskrnl/ke/i386/exp.c trunk/reactos/ntoskrnl/ke/i386/usercall.c trunk/reactos/ntoskrnl/ke/powerpc/exp.c trunk/reactos/ntoskrnl/ke/thrdobj.c trunk/reactos/ntoskrnl/ke/wait.c trunk/reactos/ntoskrnl/lpc/reply.c trunk/reactos/ntoskrnl/lpc/send.c trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/pagefile.c trunk/reactos/ntoskrnl/mm/pool.c trunk/reactos/ntoskrnl/mm/procsup.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/mm/sysldr.c trunk/reactos/ntoskrnl/mm/virtual.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild trunk/reactos/ntoskrnl/ob/obdir.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/oblink.c trunk/reactos/ntoskrnl/ob/obsecure.c trunk/reactos/ntoskrnl/ob/obwait.c trunk/reactos/ntoskrnl/ps/debug.c trunk/reactos/ntoskrnl/ps/job.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/query.c trunk/reactos/ntoskrnl/ps/security.c trunk/reactos/ntoskrnl/ps/state.c trunk/reactos/ntoskrnl/ps/thread.c trunk/reactos/ntoskrnl/ps/win32.c trunk/reactos/ntoskrnl/rtl/libsupp.c trunk/reactos/ntoskrnl/se/acl.c trunk/reactos/ntoskrnl/se/priv.c trunk/reactos/ntoskrnl/se/sd.c trunk/reactos/ntoskrnl/se/sid.c trunk/reactos/ntoskrnl/se/token.c trunk/reactos/ntoskrnl/vdm/vdmmain.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkobj.c?re… Modified: trunk/reactos/ntoskrnl/ex/atom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/atom.c?rev=376… Modified: trunk/reactos/ntoskrnl/ex/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/event.c?rev=37… Modified: trunk/reactos/ntoskrnl/ex/evtpair.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/evtpair.c?rev=… Modified: trunk/reactos/ntoskrnl/ex/harderr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/harderr.c?rev=… Modified: trunk/reactos/ntoskrnl/ex/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/locale.c?rev=3… Modified: trunk/reactos/ntoskrnl/ex/mutant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/mutant.c?rev=3… Modified: trunk/reactos/ntoskrnl/ex/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/profile.c?rev=… Modified: trunk/reactos/ntoskrnl/ex/sem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sem.c?rev=3761… Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… Modified: trunk/reactos/ntoskrnl/ex/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/time.c?rev=376… Modified: trunk/reactos/ntoskrnl/ex/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/timer.c?rev=37… Modified: trunk/reactos/ntoskrnl/ex/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/uuid.c?rev=376… Modified: trunk/reactos/ntoskrnl/fsrtl/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/fastio.c?re… Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… Modified: trunk/reactos/ntoskrnl/io/iomgr/iocomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iocomp.c… Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… Modified: trunk/reactos/ntoskrnl/ke/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/except.c?rev=3… Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… Modified: trunk/reactos/ntoskrnl/ke/i386/usercall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/usercall.… Modified: trunk/reactos/ntoskrnl/ke/powerpc/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/exp.c?… Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=376… Modified: trunk/reactos/ntoskrnl/lpc/reply.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/reply.c?rev=3… Modified: trunk/reactos/ntoskrnl/lpc/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/send.c?rev=37… Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… Modified: trunk/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?rev=376… Modified: trunk/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=3… Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… Modified: trunk/reactos/ntoskrnl/ob/obdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obdir.c?rev=37… Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=3… Modified: trunk/reactos/ntoskrnl/ob/oblink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblink.c?rev=3… Modified: trunk/reactos/ntoskrnl/ob/obsecure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obsecure.c?rev… Modified: trunk/reactos/ntoskrnl/ob/obwait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obwait.c?rev=3… Modified: trunk/reactos/ntoskrnl/ps/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/debug.c?rev=37… Modified: trunk/reactos/ntoskrnl/ps/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/job.c?rev=3761… Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=37… Modified: trunk/reactos/ntoskrnl/ps/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/security.c?rev… Modified: trunk/reactos/ntoskrnl/ps/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/state.c?rev=37… Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=3… Modified: trunk/reactos/ntoskrnl/ps/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/win32.c?rev=37… Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… Modified: trunk/reactos/ntoskrnl/se/acl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/acl.c?rev=3761… Modified: trunk/reactos/ntoskrnl/se/priv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/priv.c?rev=376… Modified: trunk/reactos/ntoskrnl/se/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sd.c?rev=37615… Modified: trunk/reactos/ntoskrnl/se/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sid.c?rev=3761… Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=37… Modified: trunk/reactos/ntoskrnl/vdm/vdmmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/vdm/vdmmain.c?rev…

15 years, 10 months

[hyperion] 37614: modified include/psdk/rpc.h Implemented RPC exception handling macros with PSEH 2.0 modified base/services/rpcss/rpcss.rbuild modified dll/win32/rpcrt4/rpcrt4.rbuild RPC proxy stubs now depend on pseh. We should really add pseh as a link dependency automatically in rbuild, but, eh modified tools/rbuild/backend/mingw/modulehandler.cpp Compile RPC proxy stubs with -fno-unit-at-a-time due to a GCC bug. See also http://gcc.gnu.org/bugzilla/show_bug.cgi?id=17982 and http://gcc.gnu.o

by hyperion＠svn.reactos.org

Author: hyperion Date: Mon Nov 24 07:05:40 2008 New Revision: 37614 URL: http://svn.reactos.org/svn/reactos?rev=37614&view=rev Log: modified include/psdk/rpc.h Implemented RPC exception handling macros with PSEH 2.0 modified base/services/rpcss/rpcss.rbuild modified dll/win32/rpcrt4/rpcrt4.rbuild RPC proxy stubs now depend on pseh. We should really add pseh as a link dependency automatically in rbuild, but, eh modified tools/rbuild/backend/mingw/modulehandler.cpp Compile RPC proxy stubs with -fno-unit-at-a-time due to a GCC bug. See also http://gcc.gnu.org/bugzilla/show_bug.cgi?id=17982 and http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054 Modified: trunk/reactos/base/services/rpcss/rpcss.rbuild trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild trunk/reactos/include/psdk/rpc.h trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/base/services/rpcss/rpcss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss.… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/rpcss.rbuild [iso-8859-1] Mon Nov 24 07:05:40 2008 @@ -9,6 +9,7 @@ <library>rpcrt4</library> <library>kernel32</library> <library>advapi32</library> + <library>pseh</library> <file>epmp.c</file> <file>irotp.c</file> <file>rpcss_main.c</file> Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.rb… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1] Mon Nov 24 07:05:40 2008 @@ -17,6 +17,7 @@ <library>iphlpapi</library> <library>ws2_32</library> <library>ntdll</library> + <library>pseh</library> <file>cproxy.c</file> <file>cpsf.c</file> <file>cstub.c</file> Modified: trunk/reactos/include/psdk/rpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpc.h?rev=376… ============================================================================== --- trunk/reactos/include/psdk/rpc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/rpc.h [iso-8859-1] Mon Nov 24 07:05:40 2008 @@ -12,10 +12,7 @@ #endif #ifdef __GNUC__ - #ifndef _SEH_NO_NATIVE_NLG - /* FIXME ReactOS SEH support, we need remove this when gcc support native seh */ - #include <libs/pseh/pseh.h> - #endif +#include <pseh/pseh2.h> #endif #ifndef __RPC_H__ @@ -137,33 +134,14 @@ #define RpcExceptionCode() GetExceptionCode() #define RpcAbnormalTermination() AbnormalTermination() #else - /* FIXME ReactOS SEH support, we need remove this when gcc support native seh */ - - #ifdef _SEH_NO_NATIVE_NLG - /* hack for _SEH_NO_NATIVE_NLG */ - #define RpcTryExcept if (1) { - #define RpcExcept(expr) } else { - #define RpcEndExcept } - #define RpcTryFinally - #define RpcFinally - #define RpcEndFinally - #define RpcExceptionCode() 0 - #else - #define RpcTryExcept _SEH_TRY { - #define RpcExcept(expr) } _SEH_HANDLE { \ - if (expr) \ - { - #define RpcEndExcept } \ - } \ - _SEH_END; - - #define RpcTryFinally - #define RpcFinally - #define RpcEndFinally - #define RpcExceptionCode() _SEH_GetExceptionCode() - - /* #define RpcAbnormalTermination() abort() */ - #endif + #define RpcTryExcept _SEH2_TRY + #define RpcExcept(expr) _SEH2_EXCEPT((expr)) + #define RpcEndExcept _SEH2_END; + #define RpcTryFinally _SEH2_TRY + #define RpcFinally _SEH2_FINALLY + #define RpcEndFinally _SEH2_END; + #define RpcExceptionCode() _SEH2_GetExceptionCode() + #define RpcAbnormalTermination() (_SEH2_GetExceptionCode() != 0) #endif #endif Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Mon Nov 24 07:05:40 2008 @@ -1096,7 +1096,7 @@ "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h -s -S $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c $(source)\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" - "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", + "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -fno-unit-at-a-time -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.o", @@ -1107,7 +1107,7 @@ "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h -c -C $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c $(source)\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" - "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", + "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -fno-unit-at-a-time -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.o",

15 years, 10 months

← Newer
1
...
14
15
16
17
18
19
20
...
66
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 November 2008