Huw Davies : winspool: Set the printer location from the cups printer-location option.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 69ff2636b4a6e0aa5b21dabd8853dc47f550be49
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=69ff2636b4a6e0aa5b21dabd88...

Author: Huw Davies <huw(a)codeweavers.com>
Date:   Fri Jun 15 12:53:55 2012 +0100

winspool: Set the printer location from the cups printer-location option.

---

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

diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c
index e27d007..d1afe56 100644
--- a/dlls/winspool.drv/info.c
+++ b/dlls/winspool.drv/info.c
@@ -867,7 +867,7 @@ static BOOL CUPS_LoadPrinters(void)
             pi2.pPrintProcessor = WinPrintW;
             pi2.pDriverName     = nameW;
             pi2.pComment        = get_cups_option( "printer-info", dests[i].num_options, dests[i].options );
-            pi2.pLocation       = emptyStringW;
+            pi2.pLocation       = get_cups_option( "printer-location", dests[i].num_options, dests[i].options );
             pi2.pPortName       = port;
             pi2.pParameters     = emptyStringW;
             pi2.pShareName      = emptyStringW;
@@ -879,6 +879,7 @@ static BOOL CUPS_LoadPrinters(void)
                 ERR( "printer '%s' not added by AddPrinter (error %d)\n", debugstr_w(nameW), GetLastError() );
 
             HeapFree( GetProcessHeap(), 0, pi2.pComment );
+            HeapFree( GetProcessHeap(), 0, pi2.pLocation );
         }
         HeapFree( GetProcessHeap(), 0, port );