Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hyperion] 37629: Supersedes r37623 with fixes for cross compilation 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.
by hyperion＠svn.reactos.org 25 Nov '08

25 Nov '08

Author: hyperion Date: Tue Nov 25 07:44:30 2008 New Revision: 37629 URL: http://svn.reactos.org/svn/reactos?rev=37629&view=rev Log: Supersedes r37623 with fixes for cross compilation 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] Tue Nov 25 07:44:30 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] Tue Nov 25 07:44:30 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] Tue Nov 25 07:44:30 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] Tue Nov 25 07:44:30 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] Tue Nov 25 07:44:30 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] Tue Nov 25 07:44:30 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] Tue Nov 25 07:44:30 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] Tue Nov 25 07:44:30 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] Tue Nov 25 07:44:30 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] Tue Nov 25 07:44:30 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] Tue Nov 25 07:44:30 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] Tue Nov 25 07:44:30 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] Tue Nov 25 07:44:30 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] Tue Nov 25 07:44:30 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] Tue Nov 25 07:44:30 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] Tue Nov 25 07:44:30 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] Tue Nov 25 07:44:30 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] Tue Nov 25 07:44:30 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] Tue Nov 25 07:44:30 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] Tue Nov 25 07:44:30 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] Tue Nov 25 07:44:30 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"; } @@ -1926,14 +1921,20 @@ // (TODO: Move to version-specific once this bug is fixed in GCC) globalCflags += " -fno-optimize-sibling-calls"; - fprintf ( - fMakefile, - "%s +=%s\n", - cflagsMacro.c_str (), - globalCflags.c_str () ); - if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse ) { + fprintf ( + fMakefile, + "%s +=%s\n", + cflagsMacro.c_str (), + (" $(PROJECT_CFLAGS)" + globalCflags).c_str () ); + + fprintf ( + fMakefile, + "%s +=%s\n", + cxxflagsMacro.c_str (), + (" $(PROJECT_CXXFLAGS)" + globalCflags).c_str () ); + fprintf ( fMakefile, "%s += $(PROJECT_RCFLAGS)\n", @@ -1955,6 +1956,18 @@ { fprintf ( fMakefile, + "%s +=%s\n", + cflagsMacro.c_str (), + globalCflags.c_str () ); + + fprintf ( + fMakefile, + "%s +=%s\n", + cxxflagsMacro.c_str (), + globalCflags.c_str () ); + + fprintf ( + fMakefile, "%s_LFLAGS += $(HOST_LFLAGS)\n", module.name.c_str () ); } @@ -1972,6 +1985,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 +2014,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] Tue Nov 25 07:44:30 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;

1 0

[gschneider] 37628: - Check parameters before allocating memory - Patch by Daniel Zimmermann, <netzimme AT aim DOT com> - Fixes possible memory leaks pointed out by CID 605, bug #3910
by gschneider＠svn.reactos.org 25 Nov '08

25 Nov '08

Author: gschneider Date: Tue Nov 25 06:53:21 2008 New Revision: 37628 URL: http://svn.reactos.org/svn/reactos?rev=37628&view=rev Log: - Check parameters before allocating memory - Patch by Daniel Zimmermann, <netzimme AT aim DOT com> - Fixes possible memory leaks pointed out by CID 605, bug #3910 Modified: trunk/reactos/lib/sdk/crt/time/strftime.c Modified: trunk/reactos/lib/sdk/crt/time/strftime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/strftime.… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/strftime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/strftime.c [iso-8859-1] Tue Nov 25 06:53:21 2008 @@ -233,6 +233,8 @@ char *x; char *f; size_t i,j; + if ((gsize = maxsize) < 1) + return 0; x = malloc(maxsize); j = wcslen(format); f = malloc(j+1); @@ -240,8 +242,6 @@ f[i] = (char)*format; f[i] = 0; pt = x; - if ((gsize = maxsize) < 1) - return 0; if (_fmt(f, t)) { *pt = '\0'; free(f);

1 0

[dreimer] 37627: Fix some more small non prettinesses and bugs in update.cmd Move the Updates and Temp folder to Appdata. Now the commands status and info X even work with non Admin rights. The rest still needs them and ever will. Start PS Port of update.cmd. Not yet fully working and still more a clone of the cmd and not optimized. Will be done later.
by dreimer＠svn.reactos.org 25 Nov '08

25 Nov '08

Author: dreimer Date: Tue Nov 25 03:50:02 2008 New Revision: 37627 URL: http://svn.reactos.org/svn/reactos?rev=37627&view=rev Log: Fix some more small non prettinesses and bugs in update.cmd Move the Updates and Temp folder to Appdata. Now the commands status and info X even work with non Admin rights. The rest still needs them and ever will. Start PS Port of update.cmd. Not yet fully working and still more a clone of the cmd and not optimized. Will be done later. Added: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Added: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 (added) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] Tue Nov 25 03:50:02 2008 @@ -1,0 +1,210 @@ +# +# PROJECT: RosBE - ReactOS Build Environment for Windows +# LICENSE: GNU General Public License v2. (see LICENSE.txt) +# FILE: Root/update.ps1 +# PURPOSE: RosBE Updater. +# COPYRIGHT: Copyright 2008 Daniel Reimer <reimer.daniel(a)freenet.de> +# +# + +# +# Set Title +# +$host.ui.RawUI.WindowTitle = "Updating..." + +function EOC { + set-location "$_ROSBE_OPATH" + if ($_ROSBE_VERSION -ne $null) { + $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" + } + exit +} + +function UPDCHECK { + if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt") { + break + } + if (!(Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt")) { + IEX "'$_ROSBE_BASEDIR\Tools\wget.exe' -N --ignore-length --no-verbose $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt" + } + if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt") { + get-Content "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt" + "" + "Install?" + $YESNO = Read-Host "(yes), (no)" + if ($YESNO -eq "yes") { + if (!(Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z")) { + IEX "&'$_ROSBE_BASEDIR\Tools\wget.exe' -N --ignore-length --no-verbose $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z" + } + if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z") { + remove-item "$_ROSBE_VERSION-$_ROSBE_STATCOUNT\*.*" -force + IEX "&'$_ROSBE_BASEDIR\Tools\7z.exe' x '$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z'" + set-location "$_ROSBE_VERSION-$_ROSBE_STATCOUNT" + "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.ps1" + break + } else { + "ERROR: This Update does not seem to exist or the Internet connection is not working correctly." + break + } + } elseif ($YESNO -eq "no") { + "Do you want to be asked again to install this update?" + $YESNO = Read-Host "(yes), (no)" + if ($YESNO -eq "yes") { + remove-item "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt" -force + } + break + } + } else { + if ($_ROSBE_MULTIUPD -ne "1") { + "ERROR: This Update does not seem to exist or the Internet connection is not working correctly." + break + } + } +} + +function STATUS { + set-location tmp + if (!(Test-path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt")) { + IEX "&'$_ROSBE_BASEDIR\Tools\wget.exe' -N --ignore-length --no-verbose $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt" + if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt") { + $_ROSBE_UPDATES = "$_ROSBE_UPDATES $_ROSBE_STATCOUNT" + } + } + set-loaction .. +} + +function UPDINFO { + set-location tmp + if (!(Test-path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt")) { + IEX "&'$_ROSBE_BASEDIR\Tools\wget.exe' -N --ignore-length --no-verbose $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt" + if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt") { + get-content "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt" + } else { + "ERROR: This Update does not seem to exist or the Internet connection is not working correctly." + } + } + set-location .. + remove-item "tmp\*.*" -force +} + +function UPDFIN { + remove-item "tmp\*.*" -force + if ($_ROSBE_UPDATES -ne $null) { + "Following Updates available: $_ROSBE_UPDATES" + } else { + "RosBE is up to Date." + } + EOC +} + +# +# The Update Server. +# +$_ROSBE_URL = "http://mitglied.lycos.de/reimerdaniel/rosbe" + +# +# Save the recent dir to cd back there at the end. +# +$_ROSBE_OPATH = "$pwd" + +if (Test-Path "$_ROSBE_BASEDIR\Tools\7z.exe") { + set-location "$_ROSBE_BASEDIR\Tools" + IEX "& wget.exe -N --ignore-length --no-verbose $_ROSBE_URL/7z.exe" + set-location $_ROSBE_OPATH +} + +set-location $_ROSBE_BASEDIR + +# +# First check for a new Updater +# +$_ROSBE_UPDDATE = get-content update.ps1 +IEX "$'Tools\wget.exe' -N --ignore-length --no-verbose $_ROSBE_URL/update.ps1" +$_ROSBE_UPDDATE = get-content update.ps1 +if ($_ROSBE_UPDDATE -ne $_ROSBE_UPDDATE2) { + # clear-host + "Updater got updated and needs to be restarted." + EOC +} + +# +# Get to the Updates Subfolder. +# +if (!(Test-Path "$ENV:APPDATA\RosBE\Updates")) {New-Item -path "$ENV:APPDATA\RosBE" -name "Updates" -type directory} +set-location "$ENV:APPDATA\RosBE\Updates" + +# +# Parse the args. +# +if ("$args" -eq "") { + $_ROSBE_MULTIUPD = 1 + $_ROSBE_STATCOUNT = 1 + UPDCHECK + $_ROSBE_STATCOUNT += 1 + UPDCHECK + $_ROSBE_STATCOUNT += 1 + UPDCHECK + $_ROSBE_STATCOUNT += 1 + UPDCHECK + $_ROSBE_STATCOUNT += 1 + UPDCHECK + $_ROSBE_STATCOUNT += 1 + UPDCHECK + $_ROSBE_STATCOUNT += 1 + UPDCHECK + $_ROSBE_STATCOUNT += 1 + UPDCHECK + $_ROSBE_STATCOUNT += 1 + UPDCHECK + EOC +} +if ("$args" -eq "reset") { + remove-item "$ENV:APPDATA\RosBE\Updates\*.*" -force + remove-item "$ENV:APPDATA\RosBE\Updates\tmp\*.*" -force + EOC +} +if ("$args[0]" -eq "nr") { + $_ROSBE_STATCOUNT = $args[1] + UPDCHECK + EOC +} +if ("$args[0]" -eq "info") { + $_ROSBE_STATCOUNT = $args[1] + UPDINFO + EOC +} +if ("$args" -eq "status") { + if (!(test-path "tmp")) {New-Item -name "Updates" -type directory} + copy-item *.txt .\tmp\. + $_ROSBE_STATCOUNT = 1 + STATUS + $_ROSBE_STATCOUNT += 1 + STATUS + $_ROSBE_STATCOUNT += 1 + STATUS + $_ROSBE_STATCOUNT += 1 + STATUS + $_ROSBE_STATCOUNT += 1 + STATUS + $_ROSBE_STATCOUNT += 1 + STATUS + $_ROSBE_STATCOUNT += 1 + STATUS + $_ROSBE_STATCOUNT += 1 + STATUS + $_ROSBE_STATCOUNT += 1 + STATUS + UPDFIN +} +if ("$args" -ne "") { + "Unknown parameter specified. Try 'help update'." + EOC +} + +$_ROSBE_UPDFINISH = $null +$_ROSBE_OPATH = $null +$_ROSBE_UPDDATE = $null +$_ROSBE_UPDATES = $null +$_ROSBE_UPDDATE2 = $null +$_ROSBE_MULTIUPD = $null +$_ROSBE_STATCOUNT = $null Propchange: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Tue Nov 25 03:50:02 2008 @@ -1,10 +1,12 @@ *** XXX xxth, 200x - RosBE 1.3.1 Released -- Updated: The Update Utility now does not blindly sync the script files. It loads - complete Update Packs and installs them. (Daniel Reimer) -- Updated: The Powershell Port is now complete. (Daniel Reimer) +- Updated: The Update Utility now does not just blindly sync the script files. It + loads complete Update Packs, which can contain from a single script update up to + a fully new GCC Version and installs them if the User confirms it. (Daniel Reimer) +- Updated: The Powershell Port is now complete and privides the same features like + the Batch one, but in a way more powerful console window. (Daniel Reimer) - Fixed: Now config adds the ELF Parameter to the config file to and lets you modify - it. Without this param, build is broken. (Daniel Reimer) + it. Without this param, build was broken. (Daniel Reimer) - Modified: Changed the default values of config to the previous setting instead of the real default one if you don't type in anything for a setting. (Daniel Reimer) 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] Tue Nov 25 03:50:02 2008 @@ -19,17 +19,23 @@ title Updating... :: +:: The Update Server. +:: +set _ROSBE_URL=http://mitglied.lycos.de/reimerdaniel/rosbe + +:: :: Save the recent dir to cd back there at the end. :: set _ROSBE_OPATH=%~dp0 set _ROSBE_OPATH=%_ROSBE_OPATH:~0,-1% +if not exist "%_ROSBE_BASEDIR%\Tools\7z.exe" ( + cd /d "%_ROSBE_BASEDIR%\Tools" + wget.exe -N --ignore-length --no-verbose %_ROSBE_URL%/7z.exe 1> NUL 2> NUL + cd /d %_ROSBE_OPATH% +) + cd /d %_ROSBE_BASEDIR% - -:: -:: The Update Server. -:: -set _ROSBE_URL=http://mitglied.lycos.de/reimerdaniel/rosbe :: :: First check for a new Updater @@ -48,8 +54,8 @@ :: :: Get to the Updates Subfolder. :: -if not exist "Updates" mkdir Updates 1> NUL 2> NUL -cd Updates +if not exist "%APPDATA%\RosBE\Updates" mkdir "%APPDATA%\RosBE\Updates" 1> NUL 2> NUL +cd /d "%APPDATA%\RosBE\Updates" :: :: Parse the args. @@ -77,7 +83,8 @@ goto :EOC ) if /i "%1" == "reset" ( - del /F /Q "%_ROSBE_BASEDIR%\Updates\*.*" 1> NUL 2> NUL + del /F /Q "%APPDATA%\RosBE\Updates\*.*" 1> NUL 2> NUL + del /F /Q "%APPDATA%\RosBE\Updates\tmp\*.*" 1> NUL 2> NUL goto :EOC ) if /i "%1" == "nr" ( @@ -91,7 +98,7 @@ goto :EOC ) if /i "%1" == "status" ( - mkdir tmp 1> NUL 2> NUL + if not exist "tmp" mkdir tmp 1> NUL 2> NUL copy *.txt .\tmp\. 1> NUL 2> NUL set _ROSBE_STATCOUNT=1 call :STATUS @@ -112,6 +119,10 @@ set /a _ROSBE_STATCOUNT+=1 call :STATUS goto :UPDFIN +) +if not "%1" == "" ( + echo Unknown parameter specified. Try 'help update'. + goto :EOC ) :STATUS @@ -120,7 +131,7 @@ 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" ( - set _ROSBE_UPDATES=%_ROSBE_UPDATES% %_ROSBE_STATCOUNT% + set _ROSBE_UPDATES=%_ROSBE_UPDATES% %_ROSBE_STATCOUNT% ) ) cd.. @@ -171,6 +182,7 @@ "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.7z 1> NUL 2> NUL ) if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.7z" ( + del /F /Q "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%\*.*" 1>NUL 2>NUL "%_ROSBE_BASEDIR%\Tools\7z.exe" x "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.7z" cd "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%" call "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.cmd" @@ -198,7 +210,7 @@ :EOC -cd /d %_ROSBE_OPATH% +cd /d "%_ROSBE_OPATH%" if defined _ROSBE_VERSION ( title ReactOS Build Environment %_ROSBE_VERSION% )

1 0

[hyperion] 37626: Undo r37623 until cross compilation is fixed
by hyperion＠svn.reactos.org 24 Nov '08

24 Nov '08

Author: hyperion Date: Mon Nov 24 15:32:17 2008 New Revision: 37626 URL: http://svn.reactos.org/svn/reactos?rev=37626&view=rev Log: Undo r37623 until cross compilation is fixed 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 15:32:17 2008 @@ -119,5 +119,4 @@ <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 15:32:17 2008 @@ -2,6 +2,7 @@ <!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 15:32:17 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 15:32:17 2008 @@ -1817,7 +1817,7 @@ } shader = This->shader_handles[pVertexShader - (VS_HIGHESTFIXEDFXF + 1)]; - hr = IWineD3DVertexShader_GetFunction(shader->wineD3DVertexShader, pData, (UINT*)pSizeOfData); + hr = IWineD3DVertexShader_GetFunction(shader->wineD3DVertexShader, pData, pSizeOfData); LeaveCriticalSection(&d3d8_cs); return hr; } @@ -2024,7 +2024,7 @@ } shader = This->shader_handles[pPixelShader - (VS_HIGHESTFIXEDFXF + 1)]; - hr = IWineD3DPixelShader_GetFunction(shader->wineD3DPixelShader, pData, (UINT*)pSizeOfData); + hr = IWineD3DPixelShader_GetFunction(shader->wineD3DPixelShader, pData, 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 15:32:17 2008 @@ -277,11 +277,11 @@ surface_desc.Type = &type; surface_desc.Usage = &dummy_dword; surface_desc.Pool = &pool; - surface_desc.Size = (UINT*)&dummy_dword; - surface_desc.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *)&dummy_dword; + surface_desc.Size = &dummy_dword; + surface_desc.MultiSampleType = &dummy_dword; surface_desc.MultiSampleQuality = &dummy_dword; - surface_desc.Width = (UINT*)&dummy_dword; - surface_desc.Height = (UINT*)&dummy_dword; + surface_desc.Width = &dummy_dword; + surface_desc.Height = &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 = (UINT*)&dummy_dword; - volume_desc.Width = (UINT*)&dummy_dword; - volume_desc.Height = (UINT*)&dummy_dword; - volume_desc.Depth = (UINT*)&dummy_dword; + volume_desc.Size = &dummy_dword; + volume_desc.Width = &dummy_dword; + volume_desc.Height = &dummy_dword; + volume_desc.Depth = &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 15:32:17 2008 @@ -1047,12 +1047,12 @@ { if(dpiX == Resolutions[i]) IsDefault = TRUE; - sprintf(buf, "%d dpi", (int)Resolutions[i]); + sprintf(buf, "%d dpi", Resolutions[i]); } else { if(dpiX == Resolutions[i] && dpiY == Resolutions[i+1]) IsDefault = TRUE; - sprintf(buf, "%d dpi x %d dpi", (int)Resolutions[i], (int)Resolutions[i+1]); + sprintf(buf, "%d dpi x %d dpi", Resolutions[i], 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",(int)(size)/100); + sprintf(strout,"%d",(size)/100); return; } if (pda->dlga->Flags & PSD_INTHOUSANDTHSOFINCHES) { - sprintf(strout,"%din",(int)(size)/1000); + sprintf(strout,"%din",(size)/1000); return; } pda->dlga->Flags |= PSD_INHUNDREDTHSOFMILLIMETERS; - sprintf(strout,"%d",(int)(size)/100); + sprintf(strout,"%d",(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 15:32:17 2008 @@ -205,8 +205,9 @@ config.cbSize = sizeof(config); CertCreateCertificateChainEngine(&config, &engine); - HCERTCHAINENGINE Original = (HCERTCHAINENGINE)InterlockedCompareExchangePointer(&CRYPT_defaultChainEngine, engine, NULL); - if (CRYPT_defaultChainEngine == Original || CRYPT_defaultChainEngine != engine) + InterlockedCompareExchangePointer(&CRYPT_defaultChainEngine, engine, + NULL); + if (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 15:32:17 2008 @@ -64,9 +64,9 @@ CryptAcquireContextW(&prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); - HCRYPTPROV Original = (HCRYPTPROV)InterlockedCompareExchangePointer((PVOID *)&hDefProv, (PVOID)prov, - NULL);//ugly hax to satisfy GCC - if (Original == hDefProv || hDefProv != prov) + InterlockedCompareExchangePointer((PVOID *)&hDefProv, (PVOID)prov, + NULL); + if (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 15:32:17 2008 @@ -157,7 +157,7 @@ LPCSTR pszOID) { static const char szEncodingTypeFmt[] = - "Software\\Microsoft\\Cryptography\\OID\\EncodingType %u\\%s\\%s"; + "Software\\Microsoft\\Cryptography\\OID\\EncodingType %d\\%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, - (unsigned int)GET_CERT_ENCODING_TYPE(dwEncodingType), pszFuncName, oid); + 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 15:32:17 2008 @@ -404,7 +404,7 @@ } /* cipher_alg */ - if (!unserialize_dword(ptr,&index,size,(DWORD*)&pInfo->cipher_alg)) + if (!unserialize_dword(ptr,&index,size,&pInfo->cipher_alg)) { ERR("reading cipher_alg failed!\n"); return FALSE; @@ -433,7 +433,7 @@ } /* hash_alg */ - if (!unserialize_dword(ptr,&index,size,(DWORD*)&pInfo->hash_alg)) + if (!unserialize_dword(ptr,&index,size,&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 15:32:17 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(); - HCERTSTORE Original = (HCERTSTORE)InterlockedCompareExchangePointer((PVOID *)&CRYPT_rootStore, root, + InterlockedCompareExchangePointer((PVOID *)&CRYPT_rootStore, root, NULL); - if (CRYPT_rootStore == Original || CRYPT_rootStore != root) + if (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 15:32:17 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), "%u", (unsigned int)(i + exports->Base)); + snprintf(buffer, sizeof(buffer), "%d", 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 15:32:17 2008 @@ -812,7 +812,7 @@ goto done; } - if (!VerQueryValueA(verdata, "\\", (LPVOID *)&ffi, (PUINT)&size)) + if (!VerQueryValueA(verdata, "\\", (LPVOID *)&ffi, &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 15:32:17 2008 @@ -486,7 +486,7 @@ HDC hdc = GetDC(0); BOOL ret = FALSE; - if(!EnumFontFamiliesW(hdc, name, (FONTENUMPROCW)is_font_installed_proc, (LPARAM)ntm)) + if(!EnumFontFamiliesW(hdc, name, 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 15:32:17 2008 @@ -244,7 +244,7 @@ { IStream* stream; HRESULT hr; - LONG size; + INT size; TRACE("%p, %p\n", image, cloneImage); @@ -1060,7 +1060,7 @@ encode_image_func* encode_image; LPVOID output; unsigned int output_size; - ULONG dummy; + unsigned int 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 15:32:17 2008 @@ -9,6 +9,7 @@ <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 15:32:17 2008 @@ -201,7 +201,7 @@ ) { icmp_t* icp=(icmp_t*)IcmpHandle; - char* reqbuf; + unsigned 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; - int addrlen; + unsigned 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) { - int len; + unsigned 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 15:32:17 2008 @@ -125,6 +125,7 @@ <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 15:32:17 2008 @@ -7,6 +7,7 @@ <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 15:32:17 2008 @@ -392,7 +392,7 @@ if ( data.includes.size () > 0 ) fprintf ( fMakefile, - "PROJECT_CINCLUDES %s %s\n", + "PROJECT_CFLAGS %s %s\n", assignmentOperation, MingwModuleHandler::GenerateGccIncludeParametersFromVector ( data.includes ).c_str ()); @@ -529,16 +529,15 @@ GenerateGlobalCFlagsAndProperties ( "=", ProjectNode.non_if_data ); GenerateProjectGccOptions ( "=", ProjectNode.non_if_data ); - fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CINCLUDES) $(PROJECT_CDEFINES)\n" ); - fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CINCLUDES) $(PROJECT_CDEFINES)\n" ); + fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CFLAGS) $(PROJECT_CDEFINES)\n" ); + fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CFLAGS) $(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_GCCOPTIONS += -Wall\n" ); + fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" ); fprintf ( fMakefile, "ifneq ($(OARCH),)\n" ); - fprintf ( fMakefile, "PROJECT_GCCOPTIONS += -march=$(OARCH)\n" ); + fprintf ( fMakefile, "PROJECT_CFLAGS += -march=$(OARCH)\n" ); fprintf ( fMakefile, "endif\n" ); - fprintf ( fMakefile, "PROJECT_CFLAGS = $(PROJECT_GCCOPTIONS) $(PROJECT_GCC_CFLAGS)\n" ); - fprintf ( fMakefile, "PROJECT_CXXFLAGS = $(PROJECT_GCCOPTIONS) $(PROJECT_GCC_CXXFLAGS)\n" ); + fprintf ( fMakefile, "PROJECT_CFLAGS += $(PROJECT_GCCOPTIONS)\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 15:32:17 2008 @@ -752,7 +752,7 @@ { fprintf ( fMakefile, "# MACROS\n" ); GenerateMacro ( assignmentOperation, - commonflagsMacro, + cflagsMacro, 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) -fno-unit-at-a-time -c $<\n", + "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -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)_CXXFLAGS)$(compiler_flags) -c $<\n", + "\t${gpp} -o $@ $($(module_name)_CFLAGS)$(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)_CXXFLAGS)$(compiler_flags) -c $<\n", + "\t${host_gpp} -o $@ $($(module_name)_CFLAGS)$(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(), - module.cplusplus ? cxxflagsMacro.c_str() : cflagsMacro.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,6 +1709,13 @@ fprintf ( fMakefile, "\n" ); return archiveFilename; +} + +string +MingwModuleHandler::GetCFlagsMacro () const +{ + return ssprintf ( "$(%s_CFLAGS)", + module.name.c_str () ); } /*static*/ string @@ -1840,9 +1847,7 @@ 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 ()); @@ -1885,10 +1890,10 @@ fprintf ( fMakefile, "\n" ); } - string globalCflags = " "; - globalCflags += ssprintf ("$(%s)", commonflagsMacro.c_str ()); + string globalCflags = ""; if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse ) { + globalCflags += " $(PROJECT_CFLAGS)"; if ( module.dynamicCRT ) globalCflags += " -D_DLL -D__USE_CRTIMP"; } @@ -1925,13 +1930,7 @@ fMakefile, "%s +=%s\n", cflagsMacro.c_str (), - (" $(PROJECT_CFLAGS)" + globalCflags).c_str () ); - - fprintf ( - fMakefile, - "%s +=%s\n", - cxxflagsMacro.c_str (), - (" $(PROJECT_CXXFLAGS)" + globalCflags).c_str () ); + globalCflags.c_str () ); if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse ) { @@ -1973,10 +1972,6 @@ "%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; @@ -2002,17 +1997,12 @@ 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 15:32:17 2008 @@ -98,6 +98,7 @@ 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; @@ -171,9 +172,7 @@ 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;

1 0

[mkupfer] 37625: - don't calc the same values multiple times
by mkupfer＠svn.reactos.org 24 Nov '08

24 Nov '08

Author: mkupfer Date: Mon Nov 24 15:28:42 2008 New Revision: 37625 URL: http://svn.reactos.org/svn/reactos?rev=37625&view=rev Log: - don't calc the same values multiple times Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Mon Nov 24 15:28:42 2008 @@ -836,18 +836,15 @@ DPRINT ("SectorsPerTrack %d\n", DiskEntry->SectorsPerTrack); DPRINT ("BytesPerSector %d\n", DiskEntry->BytesPerSector); - DiskEntry->DiskSize = - DiskGeometry.Cylinders.QuadPart * - (ULONGLONG)DiskGeometry.TracksPerCylinder * + DiskEntry->TrackSize = (ULONGLONG)DiskGeometry.SectorsPerTrack * (ULONGLONG)DiskGeometry.BytesPerSector; DiskEntry->CylinderSize = (ULONGLONG)DiskGeometry.TracksPerCylinder * - (ULONGLONG)DiskGeometry.SectorsPerTrack * - (ULONGLONG)DiskGeometry.BytesPerSector; - DiskEntry->TrackSize = - (ULONGLONG)DiskGeometry.SectorsPerTrack * - (ULONGLONG)DiskGeometry.BytesPerSector; + DiskEntry->TrackSize; + DiskEntry->DiskSize = + DiskGeometry.Cylinders.QuadPart * + DiskEntry->CylinderSize; DiskEntry->DiskNumber = DiskNumber; DiskEntry->Port = ScsiAddress.PortNumber;

1 0

[dreimer] 37624: Now this should be complete. First two possible updates install correctly. Have fun with it.
by dreimer＠svn.reactos.org 24 Nov '08

24 Nov '08

Author: dreimer Date: Mon Nov 24 13:42:02 2008 New Revision: 37624 URL: http://svn.reactos.org/svn/reactos?rev=37624&view=rev Log: Now this should be complete. First two possible updates install correctly. Have fun with it. Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd 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 13:42:02 2008 @@ -154,6 +154,9 @@ :UPDCHECK +if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( + goto :EOF +) 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 ) @@ -171,6 +174,7 @@ "%_ROSBE_BASEDIR%\Tools\7z.exe" x "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.7z" cd "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%" call "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.cmd" + goto :EOF ) else ( echo ERROR: This Update does not seem to exist or the Internet connection is not working correctly. goto :EOF

1 0

[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 24 Nov '08

24 Nov '08

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;

1 0

[gschneider] 37622: - Add copyright information I forgot, update paths
by gschneider＠svn.reactos.org 24 Nov '08

24 Nov '08

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 */

1 0

[dreimer] 37621: More updates for the new updater. A info command, some more comments and user select options.
by dreimer＠svn.reactos.org 24 Nov '08

24 Nov '08

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 )

1 0

[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 24 Nov '08

24 Nov '08

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;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs