OpenLP

Merge lp:~j-corwin/openlp/presentations into lp:openlp

  1. presentations
  2. Merge into trunk
Proposed by Jonathan Corwin
Status: Merged
Merged at revision: not available
Proposed branch: lp:~j-corwin/openlp/presentations
Merge into: lp:openlp
Diff against target: None lines
To merge this branch: bzr merge lp:~j-corwin/openlp/presentations
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Tim Bentley Approve
Review via email: mp+12310@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jonathan Corwin (j-corwin) wrote :

Powerpoint viewer changes. Fix support for PPT Viewer 2007, and build "release" version with free Visual C++ Express 2008

Revision history for this message
Tim Bentley (trb143) wrote :

Totally meaningful!
Approved

review: Approve
Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

We don't have C++ coding standards, so I unfortunately don't have grounds to moan about your coding style :-P

review: Approve
lp:~j-corwin/openlp/presentations updated
566. By Jonathan Corwin

Merge from lp:~j-corwin/openlp/presentations

Revision history for this message
Jonathan Corwin (j-corwin) wrote :

I pushed some more incomplete changes after my original merge request, since I was expecting the "merge" to only merge the revision I'd requested and not later ones on the same branch.
However it seems this is not the case, and my later incomplete changes ended up merged in trunk.

This appears to have broken things on Linux. I do apologise, and I will attempt to sort out the mess tonight if no-one beats me to it!

Diff calculation failed

Calculating the branch diff failed. You can manually schedule an update if required.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp'
--- openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp 2009-09-13 15:14:45 +0000
+++ openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp 2009-09-23 20:40:19 +0000
@@ -27,6 +27,7 @@
27#include <sys/stat.h>27#include <sys/stat.h>
28#include "pptviewlib.h"28#include "pptviewlib.h"
2929
30
30// Because of the callbacks used by SetWindowsHookEx, the memory used needs to be31// Because of the callbacks used by SetWindowsHookEx, the memory used needs to be
31// sharable across processes (the callbacks are done from a different process)32// sharable across processes (the callbacks are done from a different process)
32// Therefore use data_seg with RWS memory.33// Therefore use data_seg with RWS memory.
@@ -310,9 +311,10 @@
310 LRESULT lresult;311 LRESULT lresult;
311312
312 DEBUG("GetPPTViewerPath: start\n");313 DEBUG("GetPPTViewerPath: start\n");
313 if(RegOpenKeyEx(HKEY_CLASSES_ROOT, "Applications\\PPTVIEW.EXE\\shell\\open\\command", 0, KEY_READ, &hkey)!=ERROR_SUCCESS)314 if(RegOpenKeyEx(HKEY_CLASSES_ROOT, "PowerPointViewer.Show.12\\shell\\Show\\command", 0, KEY_READ, &hkey)!=ERROR_SUCCESS)
314 if(RegOpenKeyEx(HKEY_CLASSES_ROOT, "Applications\\PPTVIEW.EXE\\shell\\Show\\command", 0, KEY_READ, &hkey)!=ERROR_SUCCESS)315 if(RegOpenKeyEx(HKEY_CLASSES_ROOT, "Applications\\PPTVIEW.EXE\\shell\\open\\command", 0, KEY_READ, &hkey)!=ERROR_SUCCESS)
315 return FALSE; 316 if(RegOpenKeyEx(HKEY_CLASSES_ROOT, "Applications\\PPTVIEW.EXE\\shell\\Show\\command", 0, KEY_READ, &hkey)!=ERROR_SUCCESS)
317 return FALSE;
316 dwtype = REG_SZ;318 dwtype = REG_SZ;
317 dwsize = (DWORD)strsize;319 dwsize = (DWORD)strsize;
318 lresult = RegQueryValueEx(hkey, NULL, NULL, &dwtype, (LPBYTE)pptviewerpath, &dwsize );320 lresult = RegQueryValueEx(hkey, NULL, NULL, &dwtype, (LPBYTE)pptviewerpath, &dwsize );
319321
=== modified file 'openlp/plugins/presentations/lib/pptviewlib/pptviewlib.dll'
320Binary files openlp/plugins/presentations/lib/pptviewlib/pptviewlib.dll 2008-12-10 20:40:18 +0000 and openlp/plugins/presentations/lib/pptviewlib/pptviewlib.dll 2009-09-23 20:40:19 +0000 differ322Binary files openlp/plugins/presentations/lib/pptviewlib/pptviewlib.dll 2008-12-10 20:40:18 +0000 and openlp/plugins/presentations/lib/pptviewlib/pptviewlib.dll 2009-09-23 20:40:19 +0000 differ
=== modified file 'openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h'
--- openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h 2009-09-13 15:14:45 +0000
+++ openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h 2009-09-23 20:40:19 +0000
@@ -51,4 +51,4 @@
51 char filename[MAX_PATH];51 char filename[MAX_PATH];
52 char previewpath[MAX_PATH];52 char previewpath[MAX_PATH];
53 PPTVIEWSTATE state;53 PPTVIEWSTATE state;
54};
55\ No newline at end of file54\ No newline at end of file
55};
5656
=== modified file 'openlp/plugins/presentations/lib/pptviewlib/pptviewlib.vcproj'
--- openlp/plugins/presentations/lib/pptviewlib/pptviewlib.vcproj 2009-09-13 15:14:45 +0000
+++ openlp/plugins/presentations/lib/pptviewlib/pptviewlib.vcproj 2009-09-23 20:40:19 +0000
@@ -1,203 +1,202 @@
1<?xml version="1.0" encoding="Windows-1252"?>1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject2<VisualStudioProject
3 ProjectType="Visual C++"3 ProjectType="Visual C++"
4 Version="9.00"4 Version="9.00"
5 Name="pptviewlib"5 Name="pptviewlib"
6 ProjectGUID="{04CC20D1-DC5A-4189-8181-4011E3C21DCF}"6 ProjectGUID="{04CC20D1-DC5A-4189-8181-4011E3C21DCF}"
7 RootNamespace="pptviewlib"7 RootNamespace="pptviewlib"
8 Keyword="Win32Proj"8 Keyword="Win32Proj"
9 TargetFrameworkVersion="196613"9 TargetFrameworkVersion="196613"
10 >10 >
11 <Platforms>11 <Platforms>
12 <Platform12 <Platform
13 Name="Win32"13 Name="Win32"
14 />14 />
15 </Platforms>15 </Platforms>
16 <ToolFiles>16 <ToolFiles>
17 </ToolFiles>17 </ToolFiles>
18 <Configurations>18 <Configurations>
19 <Configuration19 <Configuration
20 Name="Debug|Win32"20 Name="Debug|Win32"
21 OutputDirectory="$(SolutionDir)$(ConfigurationName)"21 OutputDirectory="$(SolutionDir)$(ConfigurationName)"
22 IntermediateDirectory="$(ConfigurationName)"22 IntermediateDirectory="$(ConfigurationName)"
23 ConfigurationType="2"23 ConfigurationType="2"
24 CharacterSet="2"24 CharacterSet="2"
25 >25 >
26 <Tool26 <Tool
27 Name="VCPreBuildEventTool"27 Name="VCPreBuildEventTool"
28 />28 />
29 <Tool29 <Tool
30 Name="VCCustomBuildTool"30 Name="VCCustomBuildTool"
31 />31 />
32 <Tool32 <Tool
33 Name="VCXMLDataGeneratorTool"33 Name="VCXMLDataGeneratorTool"
34 />34 />
35 <Tool35 <Tool
36 Name="VCWebServiceProxyGeneratorTool"36 Name="VCWebServiceProxyGeneratorTool"
37 />37 />
38 <Tool38 <Tool
39 Name="VCMIDLTool"39 Name="VCMIDLTool"
40 />40 />
41 <Tool41 <Tool
42 Name="VCCLCompilerTool"42 Name="VCCLCompilerTool"
43 Optimization="0"43 Optimization="0"
44 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PPTVIEWLIB_EXPORTS"44 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PPTVIEWLIB_EXPORTS"
45 MinimalRebuild="true"45 MinimalRebuild="true"
46 BasicRuntimeChecks="3"46 BasicRuntimeChecks="3"
47 RuntimeLibrary="3"47 RuntimeLibrary="3"
48 UsePrecompiledHeader="0"48 UsePrecompiledHeader="0"
49 WarningLevel="3"49 WarningLevel="3"
50 DebugInformationFormat="4"50 DebugInformationFormat="4"
51 />51 />
52 <Tool52 <Tool
53 Name="VCManagedResourceCompilerTool"53 Name="VCManagedResourceCompilerTool"
54 />54 />
55 <Tool55 <Tool
56 Name="VCResourceCompilerTool"56 Name="VCResourceCompilerTool"
57 />57 />
58 <Tool58 <Tool
59 Name="VCPreLinkEventTool"59 Name="VCPreLinkEventTool"
60 />60 />
61 <Tool61 <Tool
62 Name="VCLinkerTool"62 Name="VCLinkerTool"
63 LinkIncremental="2"63 LinkIncremental="2"
64 ModuleDefinitionFile=""64 ModuleDefinitionFile=""
65 GenerateDebugInformation="true"65 GenerateDebugInformation="true"
66 SubSystem="2"66 SubSystem="2"
67 TargetMachine="1"67 TargetMachine="1"
68 />68 />
69 <Tool69 <Tool
70 Name="VCALinkTool"70 Name="VCALinkTool"
71 />71 />
72 <Tool72 <Tool
73 Name="VCManifestTool"73 Name="VCManifestTool"
74 />74 />
75 <Tool75 <Tool
76 Name="VCXDCMakeTool"76 Name="VCXDCMakeTool"
77 />77 />
78 <Tool78 <Tool
79 Name="VCBscMakeTool"79 Name="VCBscMakeTool"
80 />80 />
81 <Tool81 <Tool
82 Name="VCFxCopTool"82 Name="VCFxCopTool"
83 />83 />
84 <Tool84 <Tool
85 Name="VCAppVerifierTool"85 Name="VCAppVerifierTool"
86 />86 />
87 <Tool87 <Tool
88 Name="VCPostBuildEventTool"88 Name="VCPostBuildEventTool"
89 />89 />
90 </Configuration>90 </Configuration>
91 <Configuration91 <Configuration
92 Name="Release|Win32"92 Name="Release|Win32"
93 OutputDirectory="$(SolutionDir)$(ConfigurationName)"93 OutputDirectory="$(SolutionDir)$(ConfigurationName)"
94 IntermediateDirectory="$(ConfigurationName)"94 IntermediateDirectory="$(ConfigurationName)"
95 ConfigurationType="2"95 ConfigurationType="2"
96 CharacterSet="1"96 CharacterSet="2"
97 WholeProgramOptimization="1"97 WholeProgramOptimization="1"
98 >98 >
99 <Tool99 <Tool
100 Name="VCPreBuildEventTool"100 Name="VCPreBuildEventTool"
101 />101 />
102 <Tool102 <Tool
103 Name="VCCustomBuildTool"103 Name="VCCustomBuildTool"
104 />104 />
105 <Tool105 <Tool
106 Name="VCXMLDataGeneratorTool"106 Name="VCXMLDataGeneratorTool"
107 />107 />
108 <Tool108 <Tool
109 Name="VCWebServiceProxyGeneratorTool"109 Name="VCWebServiceProxyGeneratorTool"
110 />110 />
111 <Tool111 <Tool
112 Name="VCMIDLTool"112 Name="VCMIDLTool"
113 />113 />
114 <Tool114 <Tool
115 Name="VCCLCompilerTool"115 Name="VCCLCompilerTool"
116 Optimization="2"116 Optimization="2"
117 EnableIntrinsicFunctions="true"117 EnableIntrinsicFunctions="true"
118 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PPTVIEWLIB_EXPORTS"118 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PPTVIEWLIB_EXPORTS"
119 RuntimeLibrary="2"119 RuntimeLibrary="2"
120 EnableFunctionLevelLinking="true"120 EnableFunctionLevelLinking="true"
121 UsePrecompiledHeader="2"121 UsePrecompiledHeader="0"
122 WarningLevel="3"122 WarningLevel="3"
123 DebugInformationFormat="3"123 DebugInformationFormat="3"
124 />124 />
125 <Tool125 <Tool
126 Name="VCManagedResourceCompilerTool"126 Name="VCManagedResourceCompilerTool"
127 />127 />
128 <Tool128 <Tool
129 Name="VCResourceCompilerTool"129 Name="VCResourceCompilerTool"
130 />130 />
131 <Tool131 <Tool
132 Name="VCPreLinkEventTool"132 Name="VCPreLinkEventTool"
133 />133 />
134 <Tool134 <Tool
135 Name="VCLinkerTool"135 Name="VCLinkerTool"
136 LinkIncremental="1"136 LinkIncremental="1"
137 ModuleDefinitionFile="pptviewlib.def"137 GenerateDebugInformation="true"
138 GenerateDebugInformation="true"138 SubSystem="2"
139 SubSystem="2"139 OptimizeReferences="2"
140 OptimizeReferences="2"140 EnableCOMDATFolding="2"
141 EnableCOMDATFolding="2"141 TargetMachine="1"
142 TargetMachine="1"142 />
143 />143 <Tool
144 <Tool144 Name="VCALinkTool"
145 Name="VCALinkTool"145 />
146 />146 <Tool
147 <Tool147 Name="VCManifestTool"
148 Name="VCManifestTool"148 />
149 />149 <Tool
150 <Tool150 Name="VCXDCMakeTool"
151 Name="VCXDCMakeTool"151 />
152 />152 <Tool
153 <Tool153 Name="VCBscMakeTool"
154 Name="VCBscMakeTool"154 />
155 />155 <Tool
156 <Tool156 Name="VCFxCopTool"
157 Name="VCFxCopTool"157 />
158 />158 <Tool
159 <Tool159 Name="VCAppVerifierTool"
160 Name="VCAppVerifierTool"160 />
161 />161 <Tool
162 <Tool162 Name="VCPostBuildEventTool"
163 Name="VCPostBuildEventTool"163 />
164 />164 </Configuration>
165 </Configuration>165 </Configurations>
166 </Configurations>166 <References>
167 <References>167 </References>
168 </References>168 <Files>
169 <Files>169 <Filter
170 <Filter170 Name="Source Files"
171 Name="Source Files"171 Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
172 Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"172 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
173 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"173 >
174 >174 <File
175 <File175 RelativePath=".\pptviewlib.cpp"
176 RelativePath=".\pptviewlib.cpp"176 >
177 >177 </File>
178 </File>178 <File
179 <File179 RelativePath=".\README.TXT"
180 RelativePath=".\README.TXT"180 >
181 >181 </File>
182 </File>182 </Filter>
183 </Filter>183 <Filter
184 <Filter184 Name="Header Files"
185 Name="Header Files"185 Filter="h;hpp;hxx;hm;inl;inc;xsd"
186 Filter="h;hpp;hxx;hm;inl;inc;xsd"186 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
187 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"187 >
188 >188 <File
189 <File189 RelativePath=".\pptviewlib.h"
190 RelativePath=".\pptviewlib.h"190 >
191 >191 </File>
192 </File>192 </Filter>
193 </Filter>193 <Filter
194 <Filter194 Name="Resource Files"
195 Name="Resource Files"195 Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
196 Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"196 UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
197 UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"197 >
198 >198 </Filter>
199 </Filter>199 </Files>
200 </Files>200 <Globals>
201 <Globals>201 </Globals>
202 </Globals>202</VisualStudioProject>
203</VisualStudioProject>