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
1=== modified file 'openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp'
2--- openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp 2009-09-13 15:14:45 +0000
3+++ openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp 2009-09-23 20:40:19 +0000
4@@ -27,6 +27,7 @@
5 #include <sys/stat.h>
6 #include "pptviewlib.h"
7
8+
9 // Because of the callbacks used by SetWindowsHookEx, the memory used needs to be
10 // sharable across processes (the callbacks are done from a different process)
11 // Therefore use data_seg with RWS memory.
12@@ -310,9 +311,10 @@
13 LRESULT lresult;
14
15 DEBUG("GetPPTViewerPath: start\n");
16- if(RegOpenKeyEx(HKEY_CLASSES_ROOT, "Applications\\PPTVIEW.EXE\\shell\\open\\command", 0, KEY_READ, &hkey)!=ERROR_SUCCESS)
17- if(RegOpenKeyEx(HKEY_CLASSES_ROOT, "Applications\\PPTVIEW.EXE\\shell\\Show\\command", 0, KEY_READ, &hkey)!=ERROR_SUCCESS)
18- return FALSE;
19+ if(RegOpenKeyEx(HKEY_CLASSES_ROOT, "PowerPointViewer.Show.12\\shell\\Show\\command", 0, KEY_READ, &hkey)!=ERROR_SUCCESS)
20+ if(RegOpenKeyEx(HKEY_CLASSES_ROOT, "Applications\\PPTVIEW.EXE\\shell\\open\\command", 0, KEY_READ, &hkey)!=ERROR_SUCCESS)
21+ if(RegOpenKeyEx(HKEY_CLASSES_ROOT, "Applications\\PPTVIEW.EXE\\shell\\Show\\command", 0, KEY_READ, &hkey)!=ERROR_SUCCESS)
22+ return FALSE;
23 dwtype = REG_SZ;
24 dwsize = (DWORD)strsize;
25 lresult = RegQueryValueEx(hkey, NULL, NULL, &dwtype, (LPBYTE)pptviewerpath, &dwsize );
26
27=== modified file 'openlp/plugins/presentations/lib/pptviewlib/pptviewlib.dll'
28Binary 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
29=== modified file 'openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h'
30--- openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h 2009-09-13 15:14:45 +0000
31+++ openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h 2009-09-23 20:40:19 +0000
32@@ -51,4 +51,4 @@
33 char filename[MAX_PATH];
34 char previewpath[MAX_PATH];
35 PPTVIEWSTATE state;
36-};
37\ No newline at end of file
38+};
39
40=== modified file 'openlp/plugins/presentations/lib/pptviewlib/pptviewlib.vcproj'
41--- openlp/plugins/presentations/lib/pptviewlib/pptviewlib.vcproj 2009-09-13 15:14:45 +0000
42+++ openlp/plugins/presentations/lib/pptviewlib/pptviewlib.vcproj 2009-09-23 20:40:19 +0000
43@@ -1,203 +1,202 @@
44-<?xml version="1.0" encoding="Windows-1252"?>
45-<VisualStudioProject
46- ProjectType="Visual C++"
47- Version="9.00"
48- Name="pptviewlib"
49- ProjectGUID="{04CC20D1-DC5A-4189-8181-4011E3C21DCF}"
50- RootNamespace="pptviewlib"
51- Keyword="Win32Proj"
52- TargetFrameworkVersion="196613"
53- >
54- <Platforms>
55- <Platform
56- Name="Win32"
57- />
58- </Platforms>
59- <ToolFiles>
60- </ToolFiles>
61- <Configurations>
62- <Configuration
63- Name="Debug|Win32"
64- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
65- IntermediateDirectory="$(ConfigurationName)"
66- ConfigurationType="2"
67- CharacterSet="2"
68- >
69- <Tool
70- Name="VCPreBuildEventTool"
71- />
72- <Tool
73- Name="VCCustomBuildTool"
74- />
75- <Tool
76- Name="VCXMLDataGeneratorTool"
77- />
78- <Tool
79- Name="VCWebServiceProxyGeneratorTool"
80- />
81- <Tool
82- Name="VCMIDLTool"
83- />
84- <Tool
85- Name="VCCLCompilerTool"
86- Optimization="0"
87- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PPTVIEWLIB_EXPORTS"
88- MinimalRebuild="true"
89- BasicRuntimeChecks="3"
90- RuntimeLibrary="3"
91- UsePrecompiledHeader="0"
92- WarningLevel="3"
93- DebugInformationFormat="4"
94- />
95- <Tool
96- Name="VCManagedResourceCompilerTool"
97- />
98- <Tool
99- Name="VCResourceCompilerTool"
100- />
101- <Tool
102- Name="VCPreLinkEventTool"
103- />
104- <Tool
105- Name="VCLinkerTool"
106- LinkIncremental="2"
107- ModuleDefinitionFile=""
108- GenerateDebugInformation="true"
109- SubSystem="2"
110- TargetMachine="1"
111- />
112- <Tool
113- Name="VCALinkTool"
114- />
115- <Tool
116- Name="VCManifestTool"
117- />
118- <Tool
119- Name="VCXDCMakeTool"
120- />
121- <Tool
122- Name="VCBscMakeTool"
123- />
124- <Tool
125- Name="VCFxCopTool"
126- />
127- <Tool
128- Name="VCAppVerifierTool"
129- />
130- <Tool
131- Name="VCPostBuildEventTool"
132- />
133- </Configuration>
134- <Configuration
135- Name="Release|Win32"
136- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
137- IntermediateDirectory="$(ConfigurationName)"
138- ConfigurationType="2"
139- CharacterSet="1"
140- WholeProgramOptimization="1"
141- >
142- <Tool
143- Name="VCPreBuildEventTool"
144- />
145- <Tool
146- Name="VCCustomBuildTool"
147- />
148- <Tool
149- Name="VCXMLDataGeneratorTool"
150- />
151- <Tool
152- Name="VCWebServiceProxyGeneratorTool"
153- />
154- <Tool
155- Name="VCMIDLTool"
156- />
157- <Tool
158- Name="VCCLCompilerTool"
159- Optimization="2"
160- EnableIntrinsicFunctions="true"
161- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PPTVIEWLIB_EXPORTS"
162- RuntimeLibrary="2"
163- EnableFunctionLevelLinking="true"
164- UsePrecompiledHeader="2"
165- WarningLevel="3"
166- DebugInformationFormat="3"
167- />
168- <Tool
169- Name="VCManagedResourceCompilerTool"
170- />
171- <Tool
172- Name="VCResourceCompilerTool"
173- />
174- <Tool
175- Name="VCPreLinkEventTool"
176- />
177- <Tool
178- Name="VCLinkerTool"
179- LinkIncremental="1"
180- ModuleDefinitionFile="pptviewlib.def"
181- GenerateDebugInformation="true"
182- SubSystem="2"
183- OptimizeReferences="2"
184- EnableCOMDATFolding="2"
185- TargetMachine="1"
186- />
187- <Tool
188- Name="VCALinkTool"
189- />
190- <Tool
191- Name="VCManifestTool"
192- />
193- <Tool
194- Name="VCXDCMakeTool"
195- />
196- <Tool
197- Name="VCBscMakeTool"
198- />
199- <Tool
200- Name="VCFxCopTool"
201- />
202- <Tool
203- Name="VCAppVerifierTool"
204- />
205- <Tool
206- Name="VCPostBuildEventTool"
207- />
208- </Configuration>
209- </Configurations>
210- <References>
211- </References>
212- <Files>
213- <Filter
214- Name="Source Files"
215- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
216- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
217- >
218- <File
219- RelativePath=".\pptviewlib.cpp"
220- >
221- </File>
222- <File
223- RelativePath=".\README.TXT"
224- >
225- </File>
226- </Filter>
227- <Filter
228- Name="Header Files"
229- Filter="h;hpp;hxx;hm;inl;inc;xsd"
230- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
231- >
232- <File
233- RelativePath=".\pptviewlib.h"
234- >
235- </File>
236- </Filter>
237- <Filter
238- Name="Resource Files"
239- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
240- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
241- >
242- </Filter>
243- </Files>
244- <Globals>
245- </Globals>
246-</VisualStudioProject>
247+<?xml version="1.0" encoding="Windows-1252"?>
248+<VisualStudioProject
249+ ProjectType="Visual C++"
250+ Version="9.00"
251+ Name="pptviewlib"
252+ ProjectGUID="{04CC20D1-DC5A-4189-8181-4011E3C21DCF}"
253+ RootNamespace="pptviewlib"
254+ Keyword="Win32Proj"
255+ TargetFrameworkVersion="196613"
256+ >
257+ <Platforms>
258+ <Platform
259+ Name="Win32"
260+ />
261+ </Platforms>
262+ <ToolFiles>
263+ </ToolFiles>
264+ <Configurations>
265+ <Configuration
266+ Name="Debug|Win32"
267+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
268+ IntermediateDirectory="$(ConfigurationName)"
269+ ConfigurationType="2"
270+ CharacterSet="2"
271+ >
272+ <Tool
273+ Name="VCPreBuildEventTool"
274+ />
275+ <Tool
276+ Name="VCCustomBuildTool"
277+ />
278+ <Tool
279+ Name="VCXMLDataGeneratorTool"
280+ />
281+ <Tool
282+ Name="VCWebServiceProxyGeneratorTool"
283+ />
284+ <Tool
285+ Name="VCMIDLTool"
286+ />
287+ <Tool
288+ Name="VCCLCompilerTool"
289+ Optimization="0"
290+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PPTVIEWLIB_EXPORTS"
291+ MinimalRebuild="true"
292+ BasicRuntimeChecks="3"
293+ RuntimeLibrary="3"
294+ UsePrecompiledHeader="0"
295+ WarningLevel="3"
296+ DebugInformationFormat="4"
297+ />
298+ <Tool
299+ Name="VCManagedResourceCompilerTool"
300+ />
301+ <Tool
302+ Name="VCResourceCompilerTool"
303+ />
304+ <Tool
305+ Name="VCPreLinkEventTool"
306+ />
307+ <Tool
308+ Name="VCLinkerTool"
309+ LinkIncremental="2"
310+ ModuleDefinitionFile=""
311+ GenerateDebugInformation="true"
312+ SubSystem="2"
313+ TargetMachine="1"
314+ />
315+ <Tool
316+ Name="VCALinkTool"
317+ />
318+ <Tool
319+ Name="VCManifestTool"
320+ />
321+ <Tool
322+ Name="VCXDCMakeTool"
323+ />
324+ <Tool
325+ Name="VCBscMakeTool"
326+ />
327+ <Tool
328+ Name="VCFxCopTool"
329+ />
330+ <Tool
331+ Name="VCAppVerifierTool"
332+ />
333+ <Tool
334+ Name="VCPostBuildEventTool"
335+ />
336+ </Configuration>
337+ <Configuration
338+ Name="Release|Win32"
339+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
340+ IntermediateDirectory="$(ConfigurationName)"
341+ ConfigurationType="2"
342+ CharacterSet="2"
343+ WholeProgramOptimization="1"
344+ >
345+ <Tool
346+ Name="VCPreBuildEventTool"
347+ />
348+ <Tool
349+ Name="VCCustomBuildTool"
350+ />
351+ <Tool
352+ Name="VCXMLDataGeneratorTool"
353+ />
354+ <Tool
355+ Name="VCWebServiceProxyGeneratorTool"
356+ />
357+ <Tool
358+ Name="VCMIDLTool"
359+ />
360+ <Tool
361+ Name="VCCLCompilerTool"
362+ Optimization="2"
363+ EnableIntrinsicFunctions="true"
364+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PPTVIEWLIB_EXPORTS"
365+ RuntimeLibrary="2"
366+ EnableFunctionLevelLinking="true"
367+ UsePrecompiledHeader="0"
368+ WarningLevel="3"
369+ DebugInformationFormat="3"
370+ />
371+ <Tool
372+ Name="VCManagedResourceCompilerTool"
373+ />
374+ <Tool
375+ Name="VCResourceCompilerTool"
376+ />
377+ <Tool
378+ Name="VCPreLinkEventTool"
379+ />
380+ <Tool
381+ Name="VCLinkerTool"
382+ LinkIncremental="1"
383+ GenerateDebugInformation="true"
384+ SubSystem="2"
385+ OptimizeReferences="2"
386+ EnableCOMDATFolding="2"
387+ TargetMachine="1"
388+ />
389+ <Tool
390+ Name="VCALinkTool"
391+ />
392+ <Tool
393+ Name="VCManifestTool"
394+ />
395+ <Tool
396+ Name="VCXDCMakeTool"
397+ />
398+ <Tool
399+ Name="VCBscMakeTool"
400+ />
401+ <Tool
402+ Name="VCFxCopTool"
403+ />
404+ <Tool
405+ Name="VCAppVerifierTool"
406+ />
407+ <Tool
408+ Name="VCPostBuildEventTool"
409+ />
410+ </Configuration>
411+ </Configurations>
412+ <References>
413+ </References>
414+ <Files>
415+ <Filter
416+ Name="Source Files"
417+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
418+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
419+ >
420+ <File
421+ RelativePath=".\pptviewlib.cpp"
422+ >
423+ </File>
424+ <File
425+ RelativePath=".\README.TXT"
426+ >
427+ </File>
428+ </Filter>
429+ <Filter
430+ Name="Header Files"
431+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
432+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
433+ >
434+ <File
435+ RelativePath=".\pptviewlib.h"
436+ >
437+ </File>
438+ </Filter>
439+ <Filter
440+ Name="Resource Files"
441+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
442+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
443+ >
444+ </Filter>
445+ </Files>
446+ <Globals>
447+ </Globals>
448+</VisualStudioProject>