Fix default locale for Windows, VC project files, and ippeveprinter issues.

Author: michaelrsweet

cups/langprintf.c

@@ -370,7 +370,26 @@ cups_lang_default(void)
 
     // See if the locale has been set; if it is still "C" or "POSIX", use the
     // environment to get the default...
-#  ifdef LC_MESSAGES
+#  ifdef _WIN32
+    WCHAR	wlocname[32];		// Locale name as wide chars
+    char	locname[32];		// Locale name
+
+    if (GetUserDefaultLocaleName(wlocname, sizeof(wlocname)) > 0)
+    {
+      size_t  i;			// Looping var
+
+      for (i = 0; i < (sizeof(locname) / sizeof(locname[0]) - 1); i ++)
+        locname[i] = (char)wlocname[i];
+
+      locname[i] = '\0';
+      lang       = locname;
+    }
+    else
+    {
+      lang = "en";
+    }
+
+#  elif defined(LC_MESSAGES)
     lang = setlocale(LC_MESSAGES, NULL);
 #  else
     lang = setlocale(LC_ALL, NULL);

pdfio

@@ -3849,6 +3849,7 @@ ippfile_attr_cb(
     "job-settable-attributes-supported",
     "job-sheets-default",
     "job-sheets-supported",
+    "max-page-ranges-supported",
     "media-col-supported",
     "multiple-document-handling-supported",
     "multiple-document-jobs-supported",
@@ -3863,6 +3864,8 @@ ippfile_attr_cb(
     "notify-max-events-supported",
     "notify-pull-method-supported",
     "operations-supported",
+    "overrides-supported",
+    "page-ranges-supported",
     "pdl-override-supported",
     "preferred-attributes-supported",
     "printer-alert",
@@ -4344,6 +4347,10 @@ load_legacy_attributes(
   // finishings-supported
   ippAddInteger(attrs, IPP_TAG_PRINTER, IPP_TAG_ENUM, "finishings-supported", IPP_FINISHINGS_NONE);
 
+  // max-page-ranges-supported
+  if (!ippFindAttribute(attrs, "max-page-ranges-supported", IPP_TAG_ZERO) && cupsArrayFind(docformats, (void *)"application/pdf"))
+    ippAddInteger(attrs, IPP_TAG_PRINTER, IPP_TAG_INTEGER, "max-page-ranges-supported", 1);
+
   // media-bottom-margin-supported
   if (ppm_color > 0)
     ippAddIntegers(attrs, IPP_TAG_PRINTER, IPP_TAG_INTEGER, "media-bottom-margin-supported", (int)(sizeof(media_bottom_margin_supported) / sizeof(media_bottom_margin_supported[0])), media_bottom_margin_supported);
@@ -6208,15 +6215,23 @@ register_printer(
   if (!cupsDNSSDServiceAdd(printer->services, "_http._tcp,_printer", /*domain*/NULL, printer->hostname, (uint16_t)printer->port, num_txt, txt))
     goto error;
 
+  // Commit it...
+  if (!cupsDNSSDServicePublish(printer->services))
+    goto error;
+
+  fprintf(stderr, "Registered printer '%s' for discovery using DNS-SD.\n", printer->dnssd_name);
+
   cupsFreeOptions(num_txt, txt);
 
-  // Commit it...
-  return (cupsDNSSDServicePublish(printer->services));
+  return (true);
 
   // If we get here there was a problem...
   error:
 
+  fprintf(stderr, "Unable to register printer '%s' for discovery using DNS-SD: %s\n", printer->dnssd_name, cupsGetErrorString());
+
   cupsFreeOptions(num_txt, txt);
+
   return (false);
 }
 

tools/ippeveprinter.c

@@ -107,9 +107,6 @@
     <ClCompile Include="..\tools\ippeveprinter.c" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="dnssdstub.vcxproj">
-      <Project>{c0899b3a-43e7-4bc3-a785-659e1fd2ea83}</Project>
-    </ProjectReference>
     <ProjectReference Include="libcups3.vcxproj">
       <Project>{cb4aa6f2-3e84-45be-b505-95cd375e8be3}</Project>
     </ProjectReference>

vcnet/ippeveprinter.vcxproj

@@ -6,7 +6,7 @@
     <LocalDebuggerEnvironment>CUPS_DEBUG_LOG=-;CUPS_DEBUG_LEVEL=9;CUPS_DEBUG_FILTER=sspi</LocalDebuggerEnvironment>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LocalDebuggerCommandArguments>-vvv -p 8631 -n localhost Test</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-vvv -p 8631 Test</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
 </Project>

vcnet/ippeveprinter.vcxproj.user

@@ -105,9 +105,6 @@
     <ClCompile Include="..\tools\ippfind.c" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="dnssdstub.vcxproj">
-      <Project>{c0899b3a-43e7-4bc3-a785-659e1fd2ea83}</Project>
-    </ProjectReference>
     <ProjectReference Include="libcups3.vcxproj">
       <Project>{cb4aa6f2-3e84-45be-b505-95cd375e8be3}</Project>
     </ProjectReference>

vcnet/ippfind.vcxproj

@@ -71,7 +71,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>bcrypt.lib;ws2_32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>bcrypt.lib;ws2_32.lib;advapi32.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)libcups3.dll</OutputFile>
       <ModuleDefinitionFile>..\cups\libcups3.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -95,7 +95,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>bcrypt.lib;ws2_32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>bcrypt.lib;ws2_32.lib;advapi32.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)libcups3.dll</OutputFile>
       <ModuleDefinitionFile>..\cups\libcups3.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>