diff --git a/docs/rh-log.txt b/docs/rh-log.txt index fac70c939e..669f1ab0f8 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,3 +1,9 @@ +November 22, 2006 +- Added a manifest with a trustinfo section to updaterevision.exe so that + the build process can run uninterrupted under Vista. +- Fixed: DIRECT3DCREATE9FUNC needs WINAPI added to its prototype so that it + works properly in release build, which defaults to __fastcall. + November 20, 2006 - Fixed: Polyobjects are serialized before players, which means that a call to PO_MovePolyobj() from P_SerializePolyobjs() for a crushing polyobject diff --git a/src/win32/win32video.cpp b/src/win32/win32video.cpp index 4e07c7b114..e30e0b3706 100644 --- a/src/win32/win32video.cpp +++ b/src/win32/win32video.cpp @@ -72,7 +72,7 @@ IMPLEMENT_ABSTRACT_CLASS(BaseWinFB) -typedef IDirect3D9 *(*DIRECT3DCREATE9FUNC)(UINT SDKVersion); +typedef IDirect3D9 *(WINAPI *DIRECT3DCREATE9FUNC)(UINT SDKVersion); // PUBLIC FUNCTION PROTOTYPES ---------------------------------------------- diff --git a/tools/updaterevision/trustinfo.txt b/tools/updaterevision/trustinfo.txt new file mode 100644 index 0000000000..a3ae44f0e9 --- /dev/null +++ b/tools/updaterevision/trustinfo.txt @@ -0,0 +1,14 @@ + + + Update svnrevision.h for the ZDoom source build process. + + + + + + + + diff --git a/tools/updaterevision/updaterevision.vcproj b/tools/updaterevision/updaterevision.vcproj index 5e579c1899..d45998629e 100644 --- a/tools/updaterevision/updaterevision.vcproj +++ b/tools/updaterevision/updaterevision.vcproj @@ -71,6 +71,83 @@ + + + + + + + + + + + + + + + + + + + + @@ -148,82 +225,7 @@ /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/zdoom.vcproj b/zdoom.vcproj index cccf27e61d..bac3a5d484 100644 --- a/zdoom.vcproj +++ b/zdoom.vcproj @@ -1,7 +1,7 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2716,14 +2726,6 @@ GeneratePreprocessedFile="0" /> - - - @@ -2746,7 +2748,7 @@ /> - - - @@ -4805,6 +4797,16 @@ Outputs="$(IntDir)/$(InputName).obj" /> + + + @@ -4829,16 +4831,6 @@ Outputs="$(IntDir)/$(InputName).obj" /> - - - @@ -4849,6 +4841,16 @@ Outputs="$(IntDir)/$(InputName).obj" /> + + + @@ -4873,16 +4875,6 @@ Outputs="$(IntDir)\$(InputName).obj" /> - - - @@ -4893,6 +4885,16 @@ Outputs="$(IntDir)\$(InputName).obj" /> + + + @@ -4917,16 +4919,6 @@ Outputs="$(IntDir)\$(InputName).obj" /> - - - @@ -4937,6 +4929,16 @@ Outputs="$(IntDir)\$(InputName).obj" /> + + + @@ -4961,16 +4963,6 @@ Outputs="$(IntDir)\$(InputName).obj" /> - - - @@ -4981,6 +4973,16 @@ Outputs="$(IntDir)\$(InputName).obj" /> + + + @@ -5060,7 +5062,7 @@ /> + + + @@ -5395,14 +5405,6 @@ Outputs="$(IntDir)\$(InputName).obj" /> - - - - - - @@ -5633,6 +5627,14 @@ GeneratePreprocessedFile="0" /> + + + @@ -5654,7 +5656,7 @@ /> + + + @@ -9499,14 +9509,6 @@ AdditionalIncludeDirectories="src\win32;$(NoInherit)" /> - - - @@ -9681,7 +9683,7 @@ />