March 2009 - Wine-Commits - list.winehq.org

Huw Davies : gdi32/tests: Mark win9x behaviour as broken.
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: 240651e0c1cc864ba83a86054fb9da85cff34efb URL: http://source.winehq.org/git/wine.git/?a=commit;h=240651e0c1cc864ba83a86054… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 9 12:04:17 2009 +0000 gdi32/tests: Mark win9x behaviour as broken. --- dlls/gdi32/tests/bitmap.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 5fd11a9..b53d217 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -430,7 +430,9 @@ static void test_dib_bits_access( HBITMAP hdib, void *bits ) pbmi->bmiHeader.biCompression = BI_RGB; ret = SetDIBits( hdc, hdib, 0, 16, data, pbmi, DIB_RGB_COLORS ); - ok(ret == 16, "SetDIBits failed: expected 16 got %d\n", ret); + ok(ret == 16 || + broken(ret == 0), /* win9x */ + "SetDIBits failed: expected 16 got %d\n", ret); ok(VirtualQuery(bits, &info, sizeof(info)) == sizeof(info), "VirtualQuery failed\n");

1 0

Tony Wasserka : d3dx9: Add ID3DXSprite tests.
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: f9cf3ab1a0e10e078e81c99dabcb5d5145a369fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9cf3ab1a0e10e078e81c99da… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Sat Mar 7 10:07:54 2009 +0100 d3dx9: Add ID3DXSprite tests. --- dlls/d3dx9_36/tests/Makefile.in | 3 +- dlls/d3dx9_36/tests/core.c | 311 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 313 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9cf3ab1a0e10e078e81c…

1 0

Tony Wasserka : d3dx9: Add some definitions in d3dx9.h.
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: 0ed2c2c5e0d7a6466c5ec526a39314fdf92b6aae URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed2c2c5e0d7a6466c5ec526a… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Sun Mar 8 14:54:12 2009 +0100 d3dx9: Add some definitions in d3dx9.h. --- include/d3dx9.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/d3dx9.h b/include/d3dx9.h index 6b3bdf6..47d2830 100644 --- a/include/d3dx9.h +++ b/include/d3dx9.h @@ -21,6 +21,12 @@ #include <limits.h> +#define D3DX_DEFAULT ((UINT)-1) +#define D3DX_DEFAULT_NONPOW2 ((UINT)-2) +#define D3DX_DEFAULT_FLOAT FLT_MAX +#define D3DX_FROM_FILE ((UINT)-3) +#define D3DFMT_FROM_FILE ((D3DFORMAT)-3) + #include "d3d9.h" #include "d3dx9math.h" #include "d3dx9core.h"

1 0

Alexandre Julliard : dbghelp: Define _IMAGEHLP_SOURCE_.
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: 020b3b5bdc92f9e1c0afe99b1fe7f6dddca0b80b URL: http://source.winehq.org/git/wine.git/?a=commit;h=020b3b5bdc92f9e1c0afe99b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 9 13:26:57 2009 +0100 dbghelp: Define _IMAGEHLP_SOURCE_. --- dlls/dbghelp/Makefile.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in index c089d65..65dba5f 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dbghelp.dll IMPORTLIB = dbghelp +EXTRADEFS = -D_IMAGEHLP_SOURCE_ IMPORTS = psapi kernel32 ntdll DELAYIMPORTS = version

1 0

Mike Ruprecht : dbghelp: Define _IMAGEHLP64 in Win64.
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: e8515382bd19ea44f7d39c24804c1ce8cd5b29e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8515382bd19ea44f7d39c248… Author: Mike Ruprecht <cmaiku(a)gmail.com> Date: Fri Mar 6 17:04:09 2009 -0600 dbghelp: Define _IMAGEHLP64 in Win64. --- include/dbghelp.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/dbghelp.h b/include/dbghelp.h index 03898f2..6f9e880 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -25,6 +25,12 @@ extern "C" { #endif /* defined(__cplusplus) */ +#ifdef _WIN64 +#ifndef _IMAGEHLP64 +#define _IMAGEHLP64 +#endif +#endif + #define IMAGEAPI WINAPI #define DBHLPAPI IMAGEAPI

1 0

Jeremy White : twain_32: Remove obsolete README files.
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: 7a0a5c746fda38f6215053eef983088083ee9f0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a0a5c746fda38f6215053eef… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Fri Mar 6 10:53:56 2009 -0600 twain_32: Remove obsolete README files. --- dlls/twain_32/README | 54 ---------------- dlls/twain_32/TWAIN | 172 -------------------------------------------------- 2 files changed, 0 insertions(+), 226 deletions(-) diff --git a/dlls/twain_32/README b/dlls/twain_32/README deleted file mode 100644 index 0b75a36..0000000 --- a/dlls/twain_32/README +++ /dev/null @@ -1,54 +0,0 @@ ------ Old Corel README, probably outdated ---------------------------------- -1. INTRODUCTION - -This library (twain_32.dll) is an implementation of TWAIN API for providing image acquisition devices (scanner or digital camera) support. It uses SANE drivers as the backend and translates TWAIN API calls into SANE API calls. Unlike the twain32 library on Windows platform, it combines the Data Source Manager and Data Sources into a single library. Thus it is our responsiblity to provide a graphical user interface and capability negotiation, which usually are performed by data sources. - - -2. WHAT'S IMPLEMENTED - -- Functions that dispatch operations specified by the operation triplets to the corresponding function. - -- All the operation triplets related to the Data Source Manager are implemented. Appplication is able to enumerate data sources and open them. - -- The operation triplets that deal with the UI (such as DG_CONTROL/DAT_USERINTERFACE/MSG_ENABLEDS, MSG_DISABLEDS and MSG_ENABLEDSUIONLY) are partially implemented although it does not really do much. - -- The operation triplets that deal with native image transfers (DG_IMAGE/DAT_IMAGENATIVEXFER/MSG_GET) are also partially implemented. Still need to figure out how to convert the image data obtained from sane to the Windows DIB format. - -- Only the CAP_ICAPXFERMECH capability is implemented. - - -3. TO-DO - -- Image native transfer is not working correctly right now. It crashed the application due to the invalid DIB created. We need to fix this. - -- Implement other image transfer mode such as file transfer and memory transfer. - -- Support all required TWAIN capabilities that have not been implemented currently. There are a fixed number of capabilities specified by the TWAIN Specification. However, device capabilities are dynamic in SANE and there isn't a standard about the capability names. It would be difficult to negotiate capabilities in TWAIN given that we don't know what capabilities a SANE driver would provide. One possible solution to use a device configuration file to describe the mapping between capabilities supported by a SANE driver and those specified by TWAIN. -- Build a dynamic user interface that reflects the capabilities of different scanner devices. According to the TWAIN specification, each TWAIN driver need to provide its own user interface. However the SANE drivers do not have graphical frontends. Building a frontend for each SANE driver is a huge task. It is possible to have a dynamic frontend similar to xscanimage or xsane that works for all the devices. This is possibly the most difficult part. - -- check into legal issues regarding: - - TWAIN header file - - linking to SANE (maybe should dynamically link at run time?) - -- add autoconf rules for enabling based on whether sane is installed - -4. FILE LISTING - -twain32_main.c Functions to regconize operation tripets and dispatch - the requests to the corresponding functions. -dsm_ctrl.c Implementation of DG_CONTROL group operation triplets - destinated for source manager. -ds_ctrl.c Implementation of DG_CONTROL group operation triplets - destinated for data source. -ds_image.c Implementation of DG_IMAGE group operation triplets - destinated for data source. -ds_audio.c Implementation of DG_AUDIO group operation triplets - destinated for data source -capability.c Functions for negotiating capabilities -twain.h The original TWAIN header file -twain_i.h Header file for the internal twain functions - - --- -Shi Quan He -shiquan(a)cyberdude.com diff --git a/dlls/twain_32/TWAIN b/dlls/twain_32/TWAIN deleted file mode 100644 index b89f6be..0000000 --- a/dlls/twain_32/TWAIN +++ /dev/null @@ -1,172 +0,0 @@ -Requirements to be a TWAIN-Compliant Source -Requirements -TWAIN-compliant Sources must support the following: -Operations ----------- -DG_CONTROL / DAT_CAPABILITY / MSG_GET -DG_CONTROL / DAT_CAPABILITY / MSG_GETCURRENT -DG_CONTROL / DAT_CAPABILITY / MSG_GETDEFAULT -DG_CONTROL / DAT_CAPABILITY / MSG_RESET -DG_CONTROL / DAT_CAPABILITY / MSG_SET -DG_CONTROL / DAT_EVENT / MSG_PROCESSEVENT -DG_CONTROL / DAT_IDENTITY / MSG_GET -DG_CONTROL / DAT_IDENTITY / MSG_OPENDS -DG_CONTROL / DAT_IDENTITY / MSG_CLOSEDS -DG_CONTROL / DAT_PENDINGXFERS / MSG_ENDXFER -DG_CONTROL / DAT_PENDINGXFERS / MSG_GET -DG_CONTROL / DAT_PENDINGXFERS / MSG_RESET -DG_CONTROL / DAT_SETUPMEMXFER / MSG_GET -DG_CONTROL / DAT_STATUS / MSG_GET -DG_CONTROL / DAT_USERINTERFACE / MSG_DISABLEDS -DG_CONTROL / DAT_USERINTERFACE / MSG_ENABLEDS -DG_CONTROL / DAT_XFERGROUP / MSG_GET -DG_IMAGE / DAT_IMAGEINFO / MSG_GET -DG_IMAGE / DAT_IMAGELAYOUT / MSG_GET -DG_IMAGE / DAT_IMAGELAYOUT / MSG_GETDEFAULT -DG_IMAGE / DAT_IMAGELAYOUT / MSG_RESET -DG_IMAGE / DAT_IMAGELAYOUT / MSG_SET -DG_IMAGE / DAT_IMAGEMEMXFER / MSG_GET -DG_IMAGE / DAT_IMAGENATIVEXFER / MSG_GET - -Capabilities ------------- -Every Source must support all five DG_CONTROL / DAT_CAPABILITY operations on: -CAP_XFERCOUNT -Every Source must support DG_CONTROL / DAT_CAPABILITY MSG_GET on: -CAP_SUPPORTEDCAPS -CAP_UICONTROLLABLE -Sources that supply image information must support DG_CONTROL / DAT_CAPABILITY / -MSG_GET, MSG_GETCURRENT, MSG_GETDEFAULT on: -ICAP_COMPRESSION -ICAP_PLANARCHUNKY -ICAP_PHYSICALHEIGHT -ICAP_PHYSICALWIDTH -ICAP_PIXELFLAVOR -Sources that supply image information must support DG_CONTROL / DAT_CAPABILITY / -MSG_GET, MSG_GETCURRENT, MSG_GETDEFAULT, MSG_RESET and MSG_SET on: -ICAP_BITDEPTH -ICAP_BITORDER -ICAP_PIXELTYPE -ICAP_UNITS -ICAP_XFERMECH -ICAP_XRESOLUTION -ICAP_YRESOLUTION -All Sources must implement the advertised features supported by their devices. They must -make these features available to applications via the TWAIN protocol. For example, a Source -that's connected to a device that has an ADF must support DG_CONTROL / -DAT_CAPABILITY / MSG_GET, MSG_GETCURRENT, MSG_GETDEFAULT on: -CAP_FEEDERENABLED -CAP_FEEDERLOADED -and DG_CONTROL / DAT_CAPABILITY / MSG_GET, MSG_GETCURRENT, -MSG_GETDEFAULT, MSG_RESET and MSG_SET on: -CAP_AUTOFEED -If the ADF also supports ejecting and rewinding of pages then the Source should also support -DG_CONTROL / DAT_CAPABILITY / MSG_GET, MSG_GETCURRENT, -MSG_GETDEFAULT, MSG_RESET and MSG_SET on: -CAP_CLEARPAGE -CAP_REWINDPAGE - - -******************************************************************************* - -From Application to Source Manager (Control Information) - -Data Group Data Argument Type Message -DG_CONTROL DAT_IDENTITY MSG_CLOSEDS - MSG_GETDEFAULT - MSG_GETFIRST - MSG_GETNEXT - MSG_OPENDS - MSG_USERSELECT -DG_CONTROL DAT_PARENT MSG_CLOSEDSM - MSG_OPENDSM -DG_CONTROL DAT_STATUS MSG_GET - -From Application to Source (Control Information) -Data Group Data Argument Type Message -DG_CONTROL DAT_CAPABILITY MSG_GET - MSG_GETCURRENT - MSG_GETDEFAULT - MSG_QUERYSUPPORT - MSG_RESET - MSG_SET -DG_CONTROL DAT_CUSTOMDSDATA MSG_GET - MSG_SET -DG_CONTROL DAT_FILESYSTEM MSG_AUTOMATICCAPTURE - DIRECTORY - MSG_CHANGEDIRECTORY - MSG_COPY - MSG_CREATEDIRECTORY - MSG_DELETE - MSG_FORMATMEDIA - MSG_GETCLOSE - MSG_GETFIRSTFILE - MSG_GETINFO - MSG_GETNEXTFILE - MSG_RENAME -DG_CONTROL DAT_EVENT MSG_PROCESSEVENT -DG_CONTROL DAT_PASSTHRU MSG_PASSTHRU -DG_CONTROL DAT_PENDINGXFERS MSG_ENDXFER - MSG_GET - MSG_RESET - MSG_STOPFEEDER -DG_CONTROL DAT_SETUPFILEXFER MSG_GET - MSG_GETDEFAULT - MSG_RESET - MSG_SET -DG_CONTROL DAT_SETUPFILEXFER2 MSG_GET - MSG_GETDEFAULT - MSG_RESET - MSG_SET -DG_CONTROL DAT_SETUPMEMXFER MSG_GET -DG_CONTROL DAT_STATUS MSG_GET -DG_CONTROL DAT_USERINTERFACE MSG_DISABLEDS - MSG_ENABLEDS - MSG_ENABLEDSUIONLY -DG_CONTROL DAT_XFERGROUP MSG_GET - MSG_SET - -From Application to Source (Image Information) -Data Group Data Argument Type Message -DG_IMAGE DAT_CIECOLOR MSG_GET -DG_IMAGE DAT_EXTIMAGEINFO MSG_GET -DG_IMAGE DAT_GRAYRESPONSE MSG_RESET - MSG_SET -DG_IMAGE DAT_IMAGEFILEXFER MSG_GET -DG_IMAGE DAT_IMAGEINFO MSG_GET -DG_IMAGE DAT_IMAGELAYOUT MSG_GET - MSG_GETDEFAULT - MSG_RESET - MSG_SET -DG_IMAGE DAT_IMAGEMEMXFER MSG_GET -DG_IMAGE DAT_IMAGENATIVEXFER MSG_GET -DG_IMAGE DAT_JPEGCOMPRESSION MSG_GET - MSG_GETDEFAULT - MSG_RESET - MSG_SET -DG_IMAGE DAT_PALETTE8 MSG_GET - MSG_GETDEFAULT - MSG_RESET - MSG_SET -DG_IMAGE DAT_RGBRESPONSE MSG_RESET - MSG_SET - -From Application to Source (Audio Information) -Data Group Data Argument Type Message -DG_AUDIO DAT_AUDIOFILEXFER MSG_GET -DG_AUDIO DAT_AUDIOINFO MSG_GET -DG_AUDIO DAT_AUDIONATIVEXFER MSG_GET - -From Source Manager to Source (Control Information) -Data Group Data Argument Type Message -DG_CONTROL DAT_IDENTITY MSG_CLOSEDS - MSG_GET - MSG_OPENDS - -From Source to Application (Control Information via the Source Manager) -(Used by Windows Sources only) -Data Group Data Argument Type Message -DG_CONTROL DAT_NULL MSG_CLOSEDSOK - MSG_CLOSEDSREQ - MSG_DEVICEEVENT - MSG_XFERREADY

1 0

Jeremy White : sane.ds: Add fixmes for the last 2 unsupported capabilities; this now makes the code have fixmes for all known issues.
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: f764ddc87e0d1ed21e7c298bdefc038c21363ad5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f764ddc87e0d1ed21e7c298bd… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Fri Mar 6 12:44:58 2009 -0600 sane.ds: Add fixmes for the last 2 unsupported capabilities; this now makes the code have fixmes for all known issues. --- dlls/sane.ds/capability.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 72574e0..859b4be 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -1255,6 +1255,14 @@ TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) twCC = SANE_ICAPSupportedSizes (pCapability, action); break; + case ICAP_PLANARCHUNKY: + FIXME("ICAP_PLANARCHUNKY not implemented\n"); + break; + + case ICAP_BITORDER: + FIXME("ICAP_BITORDER not implemented\n"); + break; + } /* Twain specifies that you should return a 0 in response to QUERYSUPPORT,

1 0

Jeremy White : sane.ds: Remove large chunks of stubbed optional functionality; if it's optional, we don't have to support it, and it is not a stub.
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: 83d4dac8c2faba9e225877eeed5cafee77c71625 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83d4dac8c2faba9e225877eee… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Fri Mar 6 12:44:50 2009 -0600 sane.ds: Remove large chunks of stubbed optional functionality; if it's optional, we don't have to support it, and it is not a stub. --- dlls/sane.ds/ds_ctrl.c | 211 ------------------------------------------- dlls/sane.ds/ds_image.c | 136 ---------------------------- dlls/sane.ds/sane_main.c | 224 +--------------------------------------------- 3 files changed, 3 insertions(+), 568 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83d4dac8c2faba9e22587…

1 0

Jeremy White : sane.ds: Downgrade more inappropriate FIXMEs to WARNs.
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: a3bfa00ce4c4d3922f018085ddefb3e4a361241d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3bfa00ce4c4d3922f018085d… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Fri Mar 6 12:44:44 2009 -0600 sane.ds: Downgrade more inappropriate FIXMEs to WARNs. --- dlls/sane.ds/ds_ctrl.c | 3 +-- dlls/sane.ds/sane_main.c | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/sane.ds/ds_ctrl.c b/dlls/sane.ds/ds_ctrl.c index 74390f1..f8efedf 100644 --- a/dlls/sane.ds/ds_ctrl.c +++ b/dlls/sane.ds/ds_ctrl.c @@ -610,7 +610,7 @@ TW_UINT16 SANE_EnableDSUserInterface (pTW_IDENTITY pOrigin, { twRC = TWRC_FAILURE; activeDS.twCC = TWCC_SEQERROR; - FIXME("sequence error %d\n", activeDS.currentState); + WARN("sequence error %d\n", activeDS.currentState); } else { @@ -621,7 +621,6 @@ TW_UINT16 SANE_EnableDSUserInterface (pTW_IDENTITY pOrigin, { BOOL rc; activeDS.currentState = 5; /* Transitions to state 5 */ - FIXME("showing UI\n"); rc = DoScannerUI(); pUserInterface->ModalUI = TRUE; if (!rc) diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 55b5b90..6341d3d 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -388,7 +388,7 @@ static TW_UINT16 SANE_SourceControlHandler ( break; default: - FIXME("code unknown: %d\n", DAT); + WARN("code unknown: %d\n", DAT); activeDS.twCC = TWCC_CAPUNSUPPORTED; twRC = TWRC_FAILURE; break; @@ -440,7 +440,7 @@ static TW_UINT16 SANE_ImageGroupHandler ( default: twRC = TWRC_FAILURE; activeDS.twCC = TWCC_CAPBADOPERATION; - FIXME("unrecognized operation triplet\n"); + WARN("unrecognized operation triplet\n"); break; } break; @@ -572,7 +572,7 @@ static TW_UINT16 SANE_ImageGroupHandler ( default: twRC = TWRC_FAILURE; activeDS.twCC = TWCC_CAPUNSUPPORTED; - FIXME("unrecognized DG type %d\n", DAT); + WARN("unrecognized DG type %d\n", DAT); } return twRC; } @@ -598,7 +598,7 @@ DS_Entry ( pTW_IDENTITY pOrigin, twRC = SANE_ImageGroupHandler (pOrigin,DAT,MSG,pData); break; case DG_AUDIO: - FIXME("Audio group of controls not implemented yet.\n"); + WARN("Audio group of controls not implemented yet.\n"); twRC = TWRC_FAILURE; activeDS.twCC = TWCC_CAPUNSUPPORTED; break;

1 0

Jeremy White : sane.ds: Make sure that the condition code is set correctly when we handle an unexpected request .
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: e577d45b4aedf6cb181aa07b30e9d35cd1fd43e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e577d45b4aedf6cb181aa07b3… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Fri Mar 6 12:44:39 2009 -0600 sane.ds: Make sure that the condition code is set correctly when we handle an unexpected request. --- dlls/sane.ds/sane_main.c | 59 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 53 insertions(+), 6 deletions(-) diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index d8ba9b5..55b5b90 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -141,6 +141,9 @@ static TW_UINT16 SANE_SourceControlHandler ( case MSG_CLOSEDS: #ifdef SONAME_LIBSANE psane_close (activeDS.deviceHandle); +#else + twRC = TWRC_FAILURE; + activeDS.twCC = TWCC_CAPUNSUPPORTED; #endif break; case MSG_OPENDS: @@ -148,6 +151,7 @@ static TW_UINT16 SANE_SourceControlHandler ( twRC = SANE_OpenDS( pOrigin, (pTW_IDENTITY)pData); #else twRC = TWRC_FAILURE; + activeDS.twCC = TWCC_CAPUNSUPPORTED; #endif break; case MSG_GET: @@ -155,6 +159,7 @@ static TW_UINT16 SANE_SourceControlHandler ( twRC = SANE_GetIdentity( pOrigin, (pTW_IDENTITY)pData); #else twRC = TWRC_FAILURE; + activeDS.twCC = TWCC_CAPUNSUPPORTED; #endif break; } @@ -182,6 +187,7 @@ static TW_UINT16 SANE_SourceControlHandler ( break; default: twRC = TWRC_FAILURE; + activeDS.twCC = TWCC_CAPBADOPERATION; FIXME("unrecognized opertion triplet\n"); } break; @@ -196,6 +202,8 @@ static TW_UINT16 SANE_SourceControlHandler ( twRC = SANE_CustomDSDataSet (pOrigin, pData); break; default: + activeDS.twCC = TWCC_CAPBADOPERATION; + twRC = TWRC_FAILURE; break; } break; @@ -238,6 +246,7 @@ static TW_UINT16 SANE_SourceControlHandler ( twRC = SANE_FileSystemRename (pOrigin, pData); break; default: + activeDS.twCC = TWCC_CAPBADOPERATION; twRC = TWRC_FAILURE; break; } @@ -247,14 +256,20 @@ static TW_UINT16 SANE_SourceControlHandler ( if (MSG == MSG_PROCESSEVENT) twRC = SANE_ProcessEvent (pOrigin, pData); else + { + activeDS.twCC = TWCC_CAPBADOPERATION; twRC = TWRC_FAILURE; + } break; case DAT_PASSTHRU: if (MSG == MSG_PASSTHRU) twRC = SANE_PassThrough (pOrigin, pData); else + { + activeDS.twCC = TWCC_CAPBADOPERATION; twRC = TWRC_FAILURE; + } break; case DAT_PENDINGXFERS: @@ -273,6 +288,7 @@ static TW_UINT16 SANE_SourceControlHandler ( twRC = SANE_PendingXfersStopFeeder (pOrigin, pData); break;*/ default: + activeDS.twCC = TWCC_CAPBADOPERATION; twRC = TWRC_FAILURE; } break; @@ -293,6 +309,7 @@ static TW_UINT16 SANE_SourceControlHandler ( twRC = SANE_SetupFileXferSet (pOrigin, pData); break; default: + activeDS.twCC = TWCC_CAPBADOPERATION; twRC = TWRC_FAILURE; break; } @@ -319,14 +336,20 @@ static TW_UINT16 SANE_SourceControlHandler ( if (MSG == MSG_GET) twRC = SANE_SetupMemXferGet (pOrigin, pData); else + { + activeDS.twCC = TWCC_CAPBADOPERATION; twRC = TWRC_FAILURE; + } break; case DAT_STATUS: if (MSG == MSG_GET) twRC = SANE_GetDSStatus (pOrigin, pData); else + { + activeDS.twCC = TWCC_CAPBADOPERATION; twRC = TWRC_FAILURE; + } break; case DAT_USERINTERFACE: @@ -342,6 +365,7 @@ static TW_UINT16 SANE_SourceControlHandler ( twRC = SANE_EnableDSUIOnly (pOrigin, pData); break; default: + activeDS.twCC = TWCC_CAPBADOPERATION; twRC = TWRC_FAILURE; break; } @@ -357,6 +381,7 @@ static TW_UINT16 SANE_SourceControlHandler ( twRC = SANE_XferGroupSet (pOrigin, pData); break; default: + activeDS.twCC = TWCC_CAPBADOPERATION; twRC = TWRC_FAILURE; break; } @@ -364,6 +389,7 @@ static TW_UINT16 SANE_SourceControlHandler ( default: FIXME("code unknown: %d\n", DAT); + activeDS.twCC = TWCC_CAPUNSUPPORTED; twRC = TWRC_FAILURE; break; } @@ -386,14 +412,20 @@ static TW_UINT16 SANE_ImageGroupHandler ( if (MSG == MSG_GET) twRC = SANE_CIEColorGet (pOrigin, pData); else + { + activeDS.twCC = TWCC_CAPBADOPERATION; twRC = TWRC_FAILURE; + } break; case DAT_EXTIMAGEINFO: if (MSG == MSG_GET) twRC = SANE_ExtImageInfoGet (pOrigin, pData); else + { + activeDS.twCC = TWCC_CAPBADOPERATION; twRC = TWRC_FAILURE; + } break; case DAT_GRAYRESPONSE: @@ -407,7 +439,7 @@ static TW_UINT16 SANE_ImageGroupHandler ( break; default: twRC = TWRC_FAILURE; - activeDS.twCC = TWCC_BADPROTOCOL; + activeDS.twCC = TWCC_CAPBADOPERATION; FIXME("unrecognized operation triplet\n"); break; } @@ -416,14 +448,20 @@ static TW_UINT16 SANE_ImageGroupHandler ( if (MSG == MSG_GET) twRC = SANE_ImageFileXferGet (pOrigin, pData); else + { + activeDS.twCC = TWCC_CAPBADOPERATION; twRC = TWRC_FAILURE; + } break; case DAT_IMAGEINFO: if (MSG == MSG_GET) twRC = SANE_ImageInfoGet (pOrigin, pData); else + { + activeDS.twCC = TWCC_CAPBADOPERATION; twRC = TWRC_FAILURE; + } break; case DAT_IMAGELAYOUT: @@ -443,7 +481,7 @@ static TW_UINT16 SANE_ImageGroupHandler ( break; default: twRC = TWRC_FAILURE; - activeDS.twCC = TWCC_BADPROTOCOL; + activeDS.twCC = TWCC_CAPBADOPERATION; ERR("unrecognized operation triplet\n"); break; } @@ -453,14 +491,20 @@ static TW_UINT16 SANE_ImageGroupHandler ( if (MSG == MSG_GET) twRC = SANE_ImageMemXferGet (pOrigin, pData); else + { + activeDS.twCC = TWCC_CAPBADOPERATION; twRC = TWRC_FAILURE; + } break; case DAT_IMAGENATIVEXFER: if (MSG == MSG_GET) twRC = SANE_ImageNativeXferGet (pOrigin, pData); else + { + activeDS.twCC = TWCC_CAPBADOPERATION; twRC = TWRC_FAILURE; + } break; case DAT_JPEGCOMPRESSION: @@ -480,7 +524,7 @@ static TW_UINT16 SANE_ImageGroupHandler ( break; default: twRC = TWRC_FAILURE; - activeDS.twCC = TWCC_BADPROTOCOL; + activeDS.twCC = TWCC_CAPBADOPERATION; WARN("unrecognized operation triplet\n"); break; } @@ -503,7 +547,7 @@ static TW_UINT16 SANE_ImageGroupHandler ( break; default: twRC = TWRC_FAILURE; - activeDS.twCC = TWCC_BADPROTOCOL; + activeDS.twCC = TWCC_CAPBADOPERATION; WARN("unrecognized operation triplet\n"); } break; @@ -519,7 +563,7 @@ static TW_UINT16 SANE_ImageGroupHandler ( break; default: twRC = TWRC_FAILURE; - activeDS.twCC = TWCC_BADPROTOCOL; + activeDS.twCC = TWCC_CAPBADOPERATION; WARN("unrecognized operation triplet\n"); break; } @@ -527,7 +571,7 @@ static TW_UINT16 SANE_ImageGroupHandler ( default: twRC = TWRC_FAILURE; - activeDS.twCC = TWCC_BADPROTOCOL; + activeDS.twCC = TWCC_CAPUNSUPPORTED; FIXME("unrecognized DG type %d\n", DAT); } return twRC; @@ -555,6 +599,9 @@ DS_Entry ( pTW_IDENTITY pOrigin, break; case DG_AUDIO: FIXME("Audio group of controls not implemented yet.\n"); + twRC = TWRC_FAILURE; + activeDS.twCC = TWCC_CAPUNSUPPORTED; + break; default: activeDS.twCC = TWCC_BADPROTOCOL; twRC = TWRC_FAILURE;

1 0