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

Huw Davies : ole32: Add support for VT_DECIMAL.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 561df2f1c67e4fa5d0c1c79be0d482337ef34805 URL: http://source.winehq.org/git/wine.git/?a=commit;h=561df2f1c67e4fa5d0c1c79be… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 6 11:32:42 2009 +0000 ole32: Add support for VT_DECIMAL. --- dlls/ole32/ole2.c | 5 +- dlls/ole32/tests/propvariant.c | 150 +++++++++++++++++++++------------------- 2 files changed, 84 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=561df2f1c67e4fa5d0c1c…

1 0

Henri Verbeet : d3d9: Improve IDirect3DDevice9::SetFVF() code flow.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 09f21f3fd8f081d72cc8641a47c69b12c16a9f95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09f21f3fd8f081d72cc8641a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 6 08:43:49 2009 +0100 d3d9: Improve IDirect3DDevice9::SetFVF() code flow. --- dlls/d3d9/device.c | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 57d3e15..8a3325f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1507,26 +1507,31 @@ static IDirect3DVertexDeclaration9 *getConvertedDecl(IDirect3DDevice9Impl *This, static HRESULT WINAPI IDirect3DDevice9Impl_SetFVF(LPDIRECT3DDEVICE9EX iface, DWORD FVF) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - HRESULT hr = S_OK; + IDirect3DVertexDeclaration9 *decl; + HRESULT hr; + TRACE("(%p) Relay\n" , This); - EnterCriticalSection(&d3d9_cs); - if (0 != FVF) { - IDirect3DVertexDeclaration9* pDecl = getConvertedDecl(This, FVF); + if (!FVF) + { + WARN("%#x is not a valid FVF\n", FVF); + return D3D_OK; + } - if(!pDecl) { - /* Any situation when this should happen, except out of memory? */ - ERR("Failed to create a converted vertex declaration\n"); - LeaveCriticalSection(&d3d9_cs); - return D3DERR_DRIVERINTERNALERROR; - } + EnterCriticalSection(&d3d9_cs); - hr = IDirect3DDevice9Impl_SetVertexDeclaration(iface, pDecl); - if (hr != S_OK) { - LeaveCriticalSection(&d3d9_cs); - return hr; - } + decl = getConvertedDecl(This, FVF); + if (!decl) + { + /* Any situation when this should happen, except out of memory? */ + ERR("Failed to create a converted vertex declaration\n"); + LeaveCriticalSection(&d3d9_cs); + return D3DERR_DRIVERINTERNALERROR; } + + hr = IDirect3DDevice9Impl_SetVertexDeclaration(iface, decl); + if (FAILED(hr)) ERR("Failed to set vertex declaration\n"); + LeaveCriticalSection(&d3d9_cs); return hr;

1 0

Henri Verbeet : wined3d: Merge IWineD3DVertexBuffer with IWineD3DBuffer.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: aa3027a6046c4a13d5930a88c4efeae9af0a22cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa3027a6046c4a13d5930a88c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 6 14:56:23 2009 +0100 wined3d: Merge IWineD3DVertexBuffer with IWineD3DBuffer. That still leaves IWineD3DIndexBuffer, but that code is also mostly similar, except for the conversion code (which will be unused there). --- dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d8/device.c | 6 +- dlls/d3d8/vertexbuffer.c | 22 +- dlls/d3d9/d3d9_private.h | 2 +- dlls/d3d9/device.c | 8 +- dlls/d3d9/vertexbuffer.c | 22 +- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 6 +- dlls/ddraw/direct3d.c | 2 +- dlls/ddraw/vertexbuffer.c | 24 +- dlls/wined3d/buffer.c | 1028 +++++++++++++++++---------------------- dlls/wined3d/device.c | 89 ++-- dlls/wined3d/drawprim.c | 50 +- dlls/wined3d/state.c | 31 +- dlls/wined3d/stateblock.c | 21 +- dlls/wined3d/wined3d_private.h | 100 ++--- include/wine/wined3d.idl | 39 +- 17 files changed, 648 insertions(+), 806 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa3027a6046c4a13d5930…

1 0

Henri Verbeet : wined3d: Simplify IWineD3DVertexBufferImpl_PreLoad() a bit.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 6324ba66ca457b044bcd5731f4176491e99a78c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6324ba66ca457b044bcd5731f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 6 14:56:22 2009 +0100 wined3d: Simplify IWineD3DVertexBufferImpl_PreLoad() a bit. --- dlls/wined3d/buffer.c | 26 ++++---------------------- 1 files changed, 4 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e353576..16c9a5d 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -541,7 +541,6 @@ static inline BOOL IWineD3DVertexBufferImpl_FindDecl(IWineD3DVertexBufferImpl *T } else { - This->Flags |= VBFLAG_HASDESC; return FALSE; } } @@ -603,7 +602,6 @@ static inline BOOL IWineD3DVertexBufferImpl_FindDecl(IWineD3DVertexBufferImpl *T This->conv_map = NULL; This->stride = 0; } - This->Flags |= VBFLAG_HASDESC; if (ret) TRACE("Conversion information changed\n"); @@ -747,21 +745,10 @@ static void STDMETHODCALLTYPE IWineD3DVertexBufferImpl_PreLoad(IWineD3DVertexBuf if (device->isInDraw && This->bindCount > 0) { declChanged = IWineD3DVertexBufferImpl_FindDecl(This); + This->Flags |= VBFLAG_HASDESC; } - else if (This->Flags & VBFLAG_HASDESC) - { - /* Reuse the declaration stored in the buffer. It will most likely not change, and if it does - * the stream source state handler will call PreLoad again and the change will be caught - */ - } - else - { - /* Cannot get a declaration, and no declaration is stored in the buffer. It is pointless to preload - * now. When the buffer is used, PreLoad will be called by the stream source state handler and a valid - * declaration for the buffer can be found - */ - return; - } + + if (!declChanged && !(This->Flags & VBFLAG_HASDESC && This->Flags & VBFLAG_DIRTY)) return; /* If applications change the declaration over and over, reconverting all the time is a huge * performance hit. So count the declaration changes and release the VBO if there are too many @@ -811,7 +798,7 @@ static void STDMETHODCALLTYPE IWineD3DVertexBufferImpl_PreLoad(IWineD3DVertexBuf start = 0; end = This->resource.size; } - else if(This->Flags & VBFLAG_DIRTY) + else { /* No decl change, but dirty data, reload the changed stuff */ if (This->conv_shift) @@ -824,11 +811,6 @@ static void STDMETHODCALLTYPE IWineD3DVertexBufferImpl_PreLoad(IWineD3DVertexBuf start = This->dirtystart; end = This->dirtyend; } - else - { - /* Desc not changed, buffer not dirty, nothing to do :-) */ - return; - } /* Mark the buffer clean */ This->Flags &= ~VBFLAG_DIRTY;

1 0

Henri Verbeet : wined3d: Also set VBFLAG_HASDESC if we can determine we don 't need conversion.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 594cc7ebc1fd2733da64621e286558efa2d94ce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=594cc7ebc1fd2733da64621e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 6 14:56:22 2009 +0100 wined3d: Also set VBFLAG_HASDESC if we can determine we don't need conversion. --- dlls/wined3d/buffer.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index c0d92c5..e353576 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -541,6 +541,7 @@ static inline BOOL IWineD3DVertexBufferImpl_FindDecl(IWineD3DVertexBufferImpl *T } else { + This->Flags |= VBFLAG_HASDESC; return FALSE; } }

1 0

Jeremy White : sane.ds: Sane should go first; that makes any actual scanner found the default device.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 1bdac9cf9d6d2e9183a19c92adc6395d9565f427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bdac9cf9d6d2e9183a19c92a… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Thu Mar 5 17:13:18 2009 -0600 sane.ds: Sane should go first; that makes any actual scanner found the default device. --- dlls/twain_32/dsm_ctrl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index e0d0983..c34bd1d 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -103,8 +103,8 @@ twain_autodetect(void) { if (detectionrun) return; detectionrun = 1; - twain_add_onedriver("gphoto2.ds"); twain_add_onedriver("sane.ds"); + twain_add_onedriver("gphoto2.ds"); #if 0 twain_add_onedriver("c:\\windows\\Twain_32\\Largan\\sp503a.ds"); twain_add_onedriver("c:\\windows\\Twain_32\\vivicam10\\vivicam10.ds");

1 0

Jeremy White : sane.ds: Fix a subtle bug that prevented the float scrollbar from incrementing by one .
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 956c296a32e60253f1cbdd7dd937e6f9a2ee3662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=956c296a32e60253f1cbdd7dd… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Thu Mar 5 17:13:45 2009 -0600 sane.ds: Fix a subtle bug that prevented the float scrollbar from incrementing by one. --- dlls/sane.ds/ui.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 31b5152..147c759 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -853,10 +853,14 @@ static INT_PTR InitializeDialog(HWND hwnd) dd = SANE_UNFIX(*sf); HeapFree(GetProcessHeap(),0,sf); + /* Note that conversion of float -> SANE_Fixed is lossy; + * and when you truncate it into an integer, you can get + * unfortunate results. This calculation attempts + * to mitigate that harm */ if (s_quant) - pos = (dd / s_quant); + pos = ((dd + (s_quant/2.0)) / s_quant); else - pos = dd / 0.01; + pos = (dd + 0.005) / 0.01; SendMessageW(control, SBM_SETPOS, pos, TRUE);

1 0

Dylan Smith : richedit: Avoid calling ITextHost_TxNotify with EN_MSGFILTER.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: bcd8dc93a2c5052a1185fe1b462fc0d95a5adb59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcd8dc93a2c5052a1185fe1b4… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Mar 5 17:06:47 2009 -0500 richedit: Avoid calling ITextHost_TxNotify with EN_MSGFILTER. The documentation for TxNotify says that it is not called with the EN_MSGFILTER notification, so I made sure ME_FilterEvent didn't call this method. --- dlls/riched20/editor.c | 5 ++++- dlls/riched20/txthost.c | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 09feb96..93d0c34 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2018,11 +2018,14 @@ ME_FilterEvent(ME_TextEditor *editor, UINT msg, WPARAM* wParam, LPARAM* lParam) { MSGFILTER msgf; + if (!editor->hWnd) return FALSE; + msgf.nmhdr.hwndFrom = editor->hWnd; + msgf.nmhdr.idFrom = GetWindowLongW(editor->hWnd, GWLP_ID); msgf.nmhdr.code = EN_MSGFILTER; msgf.msg = msg; msgf.wParam = *wParam; msgf.lParam = *lParam; - if (ITextHost_TxNotify(editor->texthost, msgf.nmhdr.code, &msgf) == S_OK) + if (SendMessageW(GetParent(editor->hWnd), WM_NOTIFY, msgf.nmhdr.idFrom, (LPARAM)&msgf)) return FALSE; *wParam = msgf.wParam; *lParam = msgf.lParam; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 5032e87..8fabd83 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -452,8 +452,6 @@ HRESULT WINAPI ITextHostImpl_TxNotify(ITextHost *iface, HWND parent = GetParent(hwnd); UINT id = GetWindowLongW(hwnd, GWLP_ID); - /* Note: EN_MSGFILTER is documented as not being sent to TxNotify */ - switch (iNotify) { case EN_DROPFILES: @@ -492,6 +490,9 @@ HRESULT WINAPI ITextHostImpl_TxNotify(ITextHost *iface, SendMessageW(parent, WM_COMMAND, MAKEWPARAM(id, iNotify), (LPARAM)hwnd); break; + case EN_MSGFILTER: + FIXME("EN_MSGFILTER is documented as not being sent to TxNotify\n"); + /* fall through */ default: return E_FAIL; }

1 0

Jeremy White : sane.ds: More correctly detect an end of scan job from sane; this enables Acrobat to pull multiple pages in one scan.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: e472c49a238c91fc17bb48cfbcafe6801e8cdd08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e472c49a238c91fc17bb48cfb… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Thu Mar 5 13:25:58 2009 -0600 sane.ds: More correctly detect an end of scan job from sane; this enables Acrobat to pull multiple pages in one scan. --- dlls/sane.ds/capability.c | 3 +- dlls/sane.ds/ds_ctrl.c | 59 +++++++++++++++++++++++++++++++++++--------- dlls/sane.ds/ds_image.c | 43 +++++++++++++++++++++++--------- dlls/sane.ds/sane_i.h | 1 + 4 files changed, 80 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e472c49a238c91fc17bb4…

1 0

Jeremy White : sane.ds: Add support for CAP_FEEDERENABLED.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 28b708ca9eb14a4c8c3151158569ff3a50cf93b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28b708ca9eb14a4c8c3151158… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Thu Mar 5 13:15:20 2009 -0600 sane.ds: Add support for CAP_FEEDERENABLED. --- dlls/sane.ds/capability.c | 87 ++++++++++++++++++++++++++++++++++++++++++++- dlls/sane.ds/options.c | 15 ++++++++ dlls/sane.ds/sane_i.h | 1 + dlls/twain_32/tests/dsm.c | 3 ++ 4 files changed, 105 insertions(+), 1 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 7a37399..ee2d5dd 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -166,7 +166,7 @@ static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability) { TW_ARRAY *a; static const UINT16 supported_caps[] = { CAP_SUPPORTEDCAPS, CAP_XFERCOUNT, CAP_UICONTROLLABLE, - CAP_AUTOFEED, + CAP_AUTOFEED, CAP_FEEDERENABLED, ICAP_XFERMECH, ICAP_PIXELTYPE, ICAP_UNITS, ICAP_BITDEPTH, ICAP_COMPRESSION, ICAP_PIXELFLAVOR, ICAP_XRESOLUTION, ICAP_YRESOLUTION, ICAP_PHYSICALHEIGHT, ICAP_PHYSICALWIDTH }; @@ -881,6 +881,80 @@ static TW_UINT16 SANE_CAPAutofeed (pTW_CAPABILITY pCapability, TW_UINT16 action) return twCC; } +/* CAP_FEEDERENABLED */ +static TW_UINT16 SANE_CAPFeederEnabled (pTW_CAPABILITY pCapability, TW_UINT16 action) +{ + TW_UINT16 twCC = TWCC_BADCAP; +#ifdef SONAME_LIBSANE + TW_UINT32 val; + TW_BOOL enabled; + SANE_Status status; + SANE_Char source[64]; + + TRACE("CAP_FEEDERENABLED\n"); + + if (sane_option_get_str(activeDS.deviceHandle, SANE_NAME_SCAN_SOURCE, source, sizeof(source), NULL) != SANE_STATUS_GOOD) + return TWCC_BADCAP; + + if (strcmp(source, "Auto") == 0 || strcmp(source, "ADF") == 0) + enabled = TRUE; + else + enabled = FALSE; + + switch (action) + { + case MSG_QUERYSUPPORT: + twCC = set_onevalue(pCapability, TWTY_INT32, + TWQC_GET | TWQC_SET | TWQC_GETDEFAULT | TWQC_GETCURRENT | TWQC_RESET ); + break; + + case MSG_GET: + twCC = set_onevalue(pCapability, TWTY_BOOL, enabled); + break; + + case MSG_SET: + twCC = msg_set(pCapability, &val); + if (twCC == TWCC_SUCCESS) + { + if (val) + enabled = TRUE; + else + enabled = FALSE; + + strcpy(source, "ADF"); + status = sane_option_set_str(activeDS.deviceHandle, SANE_NAME_SCAN_SOURCE, source, NULL); + if (status != SANE_STATUS_GOOD) + { + strcpy(source, "Auto"); + status = sane_option_set_str(activeDS.deviceHandle, SANE_NAME_SCAN_SOURCE, source, NULL); + } + if (status != SANE_STATUS_GOOD) + { + ERR("Error %s: Could not set source to either ADF or Auto\n", psane_strstatus(status)); + return sane_status_to_twcc(status); + } + } + break; + + case MSG_GETDEFAULT: + twCC = set_onevalue(pCapability, TWTY_BOOL, TRUE); + break; + + case MSG_RESET: + strcpy(source, "Auto"); + if (sane_option_set_str(activeDS.deviceHandle, SANE_NAME_SCAN_SOURCE, source, NULL) == SANE_STATUS_GOOD) + enabled = TRUE; + twCC = TWCC_SUCCESS; + /* .. fall through intentional .. */ + + case MSG_GETCURRENT: + twCC = set_onevalue(pCapability, TWTY_BOOL, enabled); + break; + } +#endif + return twCC; +} + TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) @@ -910,6 +984,10 @@ TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) twCC = SANE_CAPAutofeed (pCapability, action); break; + case CAP_FEEDERENABLED: + twCC = SANE_CAPFeederEnabled (pCapability, action); + break; + case ICAP_PIXELTYPE: twCC = SANE_ICAPPixelType (pCapability, action); break; @@ -974,5 +1052,12 @@ TW_UINT16 SANE_SaneSetDefaults (void) if (SANE_SaneCapability(&cap, MSG_RESET) == TWCC_SUCCESS) GlobalFree(cap.hContainer); + memset(&cap, 0, sizeof(cap)); + cap.Cap = CAP_FEEDERENABLED; + cap.ConType = TWON_DONTCARE16; + + if (SANE_SaneCapability(&cap, MSG_RESET) == TWCC_SUCCESS) + GlobalFree(cap.hContainer); + return TWCC_SUCCESS; } diff --git a/dlls/sane.ds/options.c b/dlls/sane.ds/options.c index 1997abc..3fccb45 100644 --- a/dlls/sane.ds/options.c +++ b/dlls/sane.ds/options.c @@ -111,6 +111,21 @@ SANE_Status sane_option_set_bool(SANE_Handle h, const char *option_name, SANE_Bo return psane_control_option(h, optno, SANE_ACTION_SET_VALUE, (void *) &val, status); } +SANE_Status sane_option_get_str(SANE_Handle h, const char *option_name, SANE_String val, size_t len, SANE_Int *status) +{ + SANE_Status rc; + int optno; + const SANE_Option_Descriptor *opt; + + rc = sane_find_option(h, option_name, &opt, &optno, SANE_TYPE_STRING); + if (rc != SANE_STATUS_GOOD) + return rc; + + if (opt->size < len) + return psane_control_option(h, optno, SANE_ACTION_GET_VALUE, (void *) val, status); + else + return SANE_STATUS_NO_MEM; +} /* Important: SANE has the side effect of of overwriting val with the returned value */ SANE_Status sane_option_set_str(SANE_Handle h, const char *option_name, SANE_String val, SANE_Int *status) diff --git a/dlls/sane.ds/sane_i.h b/dlls/sane.ds/sane_i.h index 81c9a9e..de2172c 100644 --- a/dlls/sane.ds/sane_i.h +++ b/dlls/sane.ds/sane_i.h @@ -224,6 +224,7 @@ HWND ScanningDialogBox(HWND dialog, LONG progress); #ifdef SONAME_LIBSANE SANE_Status sane_option_get_int(SANE_Handle h, const char *option_name, SANE_Int *val); SANE_Status sane_option_set_int(SANE_Handle h, const char *option_name, SANE_Int val, SANE_Int *status); +SANE_Status sane_option_get_str(SANE_Handle h, const char *option_name, SANE_String val, size_t len, SANE_Int *status); SANE_Status sane_option_set_str(SANE_Handle h, const char *option_name, SANE_String val, SANE_Int *status); SANE_Status sane_option_probe_resolution(SANE_Handle h, const char *option_name, SANE_Int *minval, SANE_Int *maxval, SANE_Int *quant); SANE_Status sane_option_probe_mode(SANE_Handle h, SANE_String_Const **choices, char *current, int current_size); diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index c4744f9..17c106b 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -583,6 +583,9 @@ static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) if (capabilities[CAP_AUTOFEED]) test_onevalue_cap(appid, source, CAP_AUTOFEED, TWTY_BOOL, TWQC_GET | TWQC_SET | TWQC_GETDEFAULT | TWQC_GETCURRENT | TWQC_RESET); + if (capabilities[CAP_FEEDERENABLED]) + test_onevalue_cap(appid, source, CAP_FEEDERENABLED, TWTY_BOOL, + TWQC_GET | TWQC_SET | TWQC_GETDEFAULT | TWQC_GETCURRENT | TWQC_RESET); } }

1 0