[Spice-commits] 6 commits - Makefile.am spice-vdagent.wxs.in vdagent/display_configuration.cpp vdagent/file_xfer.h vdagent/image.cpp vdagent/vdagent.vcproj
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon May 28 13:45:57 UTC 2018
Makefile.am | 5 +----
spice-vdagent.wxs.in | 4 ----
vdagent/display_configuration.cpp | 2 +-
vdagent/file_xfer.h | 4 ++--
vdagent/image.cpp | 4 ++++
vdagent/vdagent.vcproj | 28 ++++++++++++++++++++--------
6 files changed, 28 insertions(+), 19 deletions(-)
New commits:
commit 0de788aa6175fa6035b9f79a7dcfda8b98cd1e6f
Author: Frediano Ziglio <fziglio at redhat.com>
Date: Fri May 25 19:41:26 2018 +0100
file_xfer: Remove FileXferTask structure alignment
There's no reason beside losing performances to align
that structure, is not passed as binary data.
Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
Acked-by: Christophe Fergeau <cfergeau at redhat.com>
diff --git a/vdagent/file_xfer.h b/vdagent/file_xfer.h
index 25cd5c2..029d0e7 100644
--- a/vdagent/file_xfer.h
+++ b/vdagent/file_xfer.h
@@ -21,7 +21,7 @@
#include <map>
#include "vdcommon.h"
-typedef struct ALIGN_VC FileXferTask {
+typedef struct FileXferTask {
FileXferTask(HANDLE _handle, uint64_t _size, const TCHAR* _name):
handle(_handle), size(_size), pos(0) {
// FIXME: should raise an error if name is too long..
@@ -36,7 +36,7 @@ typedef struct ALIGN_VC FileXferTask {
TCHAR name[MAX_PATH];
void cancel();
-} ALIGN_GCC FileXferTask;
+} FileXferTask;
typedef std::map<uint32_t, FileXferTask*> FileXferTasks;
commit d4a4fb28ea0c057428ef1f28bc689b8d0f085dc6
Author: Frediano Ziglio <fziglio at redhat.com>
Date: Mon May 28 09:20:41 2018 +0100
msi: Do not generate deps.txt
There's no reason to tell the package installed on the build system
used.
Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
Acked-by: Christophe Fergeau <cfergeau at redhat.com>
diff --git a/Makefile.am b/Makefile.am
index 62640f2..3020824 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -100,15 +100,12 @@ test_log_win_SOURCES = \
common/test-log.cpp \
$(NULL)
-deps.txt:
- $(AM_V_GEN)rpm -qa | grep $(host_os) | sort | unix2dos > $@
-
MANUFACTURER = The Spice Project
EXTRA_DIST += spice-vdagent.wxs.in
CONFIG_STATUS_DEPENDENCIES = spice-vdagent.wxs.in
-spice-vdagent-$(WIXL_ARCH)-$(VERSION)$(BUILDID).msi: spice-vdagent.wxs deps.txt all
+spice-vdagent-$(WIXL_ARCH)-$(VERSION)$(BUILDID).msi: spice-vdagent.wxs all
$(AM_V_GEN)DESTDIR=`mktemp -d`&& \
make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null && \
MANUFACTURER="$(MANUFACTURER)" wixl -D SourceDir=$(prefix) \
diff --git a/spice-vdagent.wxs.in b/spice-vdagent.wxs.in
index 452f995..7432ca9 100644
--- a/spice-vdagent.wxs.in
+++ b/spice-vdagent.wxs.in
@@ -61,9 +61,6 @@
Wait="yes"/>
</Component>
</Directory>
- <Component Id="CDepsTxt" Guid="*">
- <File Id='depstxt' Name='deps.txt' DiskId='1' Source='deps.txt' KeyPath='yes'/>
- </Component>
</Directory>
</Directory>
</Directory>
@@ -71,7 +68,6 @@
<Feature Id="Complete" Level="1">
<ComponentRef Id="CSpiceAgent"/>
<ComponentRef Id="CSpiceService"/>
- <ComponentRef Id="CDepsTxt"/>
</Feature>
</Product>
commit 022c56ac6ae2f7f9a082b81e44872d48aace35b2
Author: Frediano Ziglio <fziglio at redhat.com>
Date: Sat May 26 07:50:53 2018 +0100
Avoid unused variable warning
Currently happens using Visual Studio 2015.
Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
Acked-by: Christophe Fergeau <cfergeau at redhat.com>
diff --git a/vdagent/display_configuration.cpp b/vdagent/display_configuration.cpp
index 6e7624b..cdbbe23 100644
--- a/vdagent/display_configuration.cpp
+++ b/vdagent/display_configuration.cpp
@@ -259,7 +259,7 @@ DisplayConfig* DisplayConfig::create_config()
try {
new_interface = new WDDMInterface();
}
- catch (std::exception& e) {
+ catch (std::exception&) {
new_interface = new XPDMInterface();
}
return new_interface;
commit 1982d50375e4f3fdf5d5ca5e497328743af4e559
Author: Frediano Ziglio <fziglio at redhat.com>
Date: Sat May 26 07:51:59 2018 +0100
Fix minor compiler compatibility
Ensure std::min is declared including directly algorithm header.
Undefine possible min and max macros, some Windows headers define them.
Currently happens using Visual Studio 2015.
Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
Acked-by: Christophe Fergeau <cfergeau at redhat.com>
diff --git a/vdagent/image.cpp b/vdagent/image.cpp
index 1b21b53..c0bcdb5 100644
--- a/vdagent/image.cpp
+++ b/vdagent/image.cpp
@@ -18,11 +18,15 @@
#include <spice/macros.h>
#include <memory>
#include <vector>
+#include <algorithm>
#include "vdcommon.h"
#include "image.h"
#include "imagepng.h"
+#undef max
+#undef min
+
static ImageCoder *get_coder(uint32_t vdagent_type)
{
switch (vdagent_type) {
commit b15a8806390153748594937f321c192181f9000f
Author: Frediano Ziglio <fziglio at redhat.com>
Date: Fri May 25 19:47:32 2018 +0100
vcproj: Add some missing files
Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
Acked-by: Christophe Fergeau <cfergeau at redhat.com>
diff --git a/vdagent/vdagent.vcproj b/vdagent/vdagent.vcproj
index f830b0f..376ddd4 100644
--- a/vdagent/vdagent.vcproj
+++ b/vdagent/vdagent.vcproj
@@ -350,6 +350,10 @@
>
</File>
<File
+ RelativePath=".\display_configuration.cpp"
+ >
+ </File>
+ <File
RelativePath=".\display_setting.cpp"
>
</File>
@@ -358,6 +362,14 @@
>
</File>
<File
+ RelativePath=".\image.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\imagepng.cpp"
+ >
+ </File>
+ <File
RelativePath=".\vdagent.cpp"
>
</File>
commit 9a929bd24ade5e25b33afd43509ff04acf4352a0
Author: Frediano Ziglio <fziglio at redhat.com>
Date: Fri May 25 19:47:20 2018 +0100
vcproj: Remove reference to CxImage
Not used anymore.
Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
Acked-by: Christophe Fergeau <cfergeau at redhat.com>
diff --git a/vdagent/vdagent.vcproj b/vdagent/vdagent.vcproj
index f9f4228..f830b0f 100644
--- a/vdagent/vdagent.vcproj
+++ b/vdagent/vdagent.vcproj
@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\common;$(SPICE_PROTOCOL_DIR);$(SPICE_LIBS)\include\CxImage"
+ AdditionalIncludeDirectories="..\common;$(SPICE_PROTOCOL_DIR)"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS,_WIN32_WINNT=0x0501"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -65,7 +65,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="Version.lib zlibwapiD.lib png_d.lib cximage_d.lib wtsapi32.lib"
+ AdditionalDependencies="Version.lib zlibwapiD.lib png_d.lib wtsapi32.lib"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(SPICE_LIBS)\lib""
GenerateDebugInformation="true"
@@ -122,7 +122,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\common;$(SPICE_PROTOCOL_DIR);$(SPICE_LIBS)\include\CxImage"
+ AdditionalIncludeDirectories="..\common;$(SPICE_PROTOCOL_DIR)"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS,_WIN32_WINNT=0x0501"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -143,7 +143,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="Version.lib zlibwapiD.lib png_d.lib cximage_d.lib wtsapi32.lib"
+ AdditionalDependencies="Version.lib zlibwapiD.lib png_d.lib wtsapi32.lib"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(SPICE_LIBS)\lib64""
IgnoreDefaultLibraryNames=""
@@ -200,7 +200,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\common;$(SPICE_PROTOCOL_DIR);$(SPICE_LIBS)\include\CxImage"
+ AdditionalIncludeDirectories="..\common;$(SPICE_PROTOCOL_DIR)"
AdditionalUsingDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS,_WIN32_WINNT=0x0501"
RuntimeLibrary="0"
@@ -220,7 +220,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="Version.lib zlibwapi.lib png.lib cximage.lib wtsapi32.lib"
+ AdditionalDependencies="Version.lib zlibwapi.lib png.lib wtsapi32.lib"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(SPICE_LIBS)\lib""
GenerateDebugInformation="true"
@@ -279,7 +279,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\common;$(SPICE_PROTOCOL_DIR);$(SPICE_LIBS)\include\CxImage"
+ AdditionalIncludeDirectories="..\common;$(SPICE_PROTOCOL_DIR)"
AdditionalUsingDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS,_WIN32_WINNT=0x0501"
RuntimeLibrary="0"
@@ -299,7 +299,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="Version.lib zlibwapi.lib png.lib cximage.lib wtsapi32.lib"
+ AdditionalDependencies="Version.lib zlibwapi.lib png.lib wtsapi32.lib"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(SPICE_LIBS)\lib64""
GenerateDebugInformation="true"
More information about the Spice-commits
mailing list