PATCH: sane.ds fixes
Marcus Meissner
marcus at jet.franken.de
Tue May 2 15:32:31 CDT 2006
Hi,
This fixes a typo and a DWORD / -1 mismatch in sane.ds.
Ciao, Marcus
Changelog:
Fixed typo in HAV(E)_SANE, and use LONG for
a function that can get -1 as argument.
diff -ru dlls/sane.ds/sane_i.h dlls/sane.ds/sane_i.h
--- dlls/sane.ds/sane_i.h 2006-04-29 12:08:15.000000000 +0200
+++ dlls/sane.ds/sane_i.h 2006-05-02 21:56:10.000000000 +0200
@@ -212,6 +212,6 @@
/* UI function */
BOOL DoScannerUI();
-HWND ScanningDialogBox(HWND dialog, DWORD progress);
+HWND ScanningDialogBox(HWND dialog, LONG progress);
#endif
diff -ru dlls/sane.ds/sane_main.c ../wine/dlls/sane.ds/sane_main.c
--- dlls/sane.ds/sane_main.c 2006-04-29 12:16:49.000000000 +0200
+++ ../wine/dlls/sane.ds/sane_main.c 2006-05-02 21:56:10.000000000 +0200
@@ -50,7 +50,8 @@
break;
}
case DLL_PROCESS_DETACH:
-#ifdef HAV_SANE
+#ifdef HAVE_SANE
+ FIXME("calling sane_Exit()\n");
sane_exit ();
#endif
SANE_instance = NULL;
diff -ru dlls/sane.ds/ui.c ../wine/dlls/sane.ds/ui.c
--- dlls/sane.ds/ui.c 2006-04-29 12:08:10.000000000 +0200
+++ ../wine/dlls/sane.ds/ui.c 2006-05-02 21:56:10.000000000 +0200
@@ -1038,7 +1038,7 @@
return FALSE;
}
-HWND ScanningDialogBox(HWND dialog, DWORD progress)
+HWND ScanningDialogBox(HWND dialog, LONG progress)
{
if (!dialog)
dialog = CreateDialogW(SANE_instance,
More information about the wine-patches
mailing list