Detlef Riekenberg : winspool: Powerpoint XP expect a valid pointer on Win9x .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 449fa0d204a8a4e537a78117b2d6893e6b146b19
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=449fa0d204a8a4e537a78117b2...

Author: Detlef Riekenberg 
Date:   Fri Aug 24 20:05:57 2007 +0200

winspool: Powerpoint XP expect a valid pointer on Win9x.

---

dlls/winspool.drv/info.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c
index 44c41a1..3a76bbf 100644
--- a/dlls/winspool.drv/info.c
+++ b/dlls/winspool.drv/info.c
@@ -4591,6 +4591,15 @@ static BOOL WINSPOOL_GetDriverInfoFromReg(
         if (di) di->pDependentFiles = (LPWSTR)strPtr;
         strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL;
     }
+    else if (GetVersion() & 0x80000000) {
+        /* Powerpoint XP expects that pDependentFiles is always valid on win9x */
+        size = 2 * ((unicode) ? sizeof(WCHAR) : 1);
+        *pcbNeeded += size;
+        if ((*pcbNeeded <= cbBuf) && strPtr) ZeroMemory(strPtr, size);
+
+        if (di) di->pDependentFiles = (LPWSTR)strPtr;
+        strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL;
+    }

/* .pMonitorName is the optional Language Monitor */
     if (WINSPOOL_GetStringFromReg(hkeyDriver, MonitorW, strPtr, 0, &size, unicode)) {