wine-commits January 2009

wine-commits@winehq.org

3 participants
1348 discussions

Michael Stefaniuc : quartz: Remove superfluous pointer casts.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: cc7fc4abef5f0bd64871ab1ce2d5fab4012a654c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc7fc4abef5f0bd64871ab1ce… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 29 11:14:55 2009 +0100 quartz: Remove superfluous pointer casts. --- dlls/quartz/acmwrapper.c | 2 +- dlls/quartz/avidec.c | 2 +- dlls/quartz/avisplit.c | 12 ++++++------ dlls/quartz/dsoundrender.c | 16 ++++++++-------- dlls/quartz/enumfilters.c | 4 ++-- dlls/quartz/enummedia.c | 4 ++-- dlls/quartz/enummoniker.c | 2 +- dlls/quartz/enumpins.c | 4 ++-- dlls/quartz/enumregfilters.c | 4 ++-- dlls/quartz/filesource.c | 24 ++++++++++++------------ dlls/quartz/filtergraph.c | 2 +- dlls/quartz/filtermapper.c | 6 +++--- dlls/quartz/memallocator.c | 12 ++++++------ dlls/quartz/mpegsplit.c | 8 ++++---- dlls/quartz/nullrenderer.c | 12 ++++++------ dlls/quartz/parser.c | 18 +++++++++--------- dlls/quartz/pin.c | 14 +++++++------- dlls/quartz/systemclock.c | 2 +- dlls/quartz/transform.c | 10 +++++----- dlls/quartz/videorenderer.c | 22 +++++++++++----------- dlls/quartz/waveparser.c | 8 ++++---- 21 files changed, 94 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc7fc4abef5f0bd64871a…

1 0

Michael Stefaniuc : oleaut32/tests: Remove superfluous pointer casts.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: 330e6d86f9da8c6f08a0a8402116837104919ba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=330e6d86f9da8c6f08a0a8402… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 29 11:14:36 2009 +0100 oleaut32/tests: Remove superfluous pointer casts. --- dlls/oleaut32/tests/olepicture.c | 4 ++-- dlls/oleaut32/tests/safearray.c | 6 +++--- dlls/oleaut32/tests/tmarshal.c | 2 +- dlls/oleaut32/tests/usrmarshal.c | 4 ++-- dlls/oleaut32/tests/vartype.c | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index ee13227..f2997d6 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -760,11 +760,11 @@ static HRESULT WINAPI NoStatStreamImpl_QueryInterface( *ppvObject = 0; if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) { - *ppvObject = (IStream*)This; + *ppvObject = This; } else if (memcmp(&IID_IStream, riid, sizeof(IID_IStream)) == 0) { - *ppvObject = (IStream*)This; + *ppvObject = This; } if ((*ppvObject)==0) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 4fc615e..a34f095 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1274,7 +1274,7 @@ static void test_SafeArrayCopyData(void) /* Fill the source array with some data; it doesn't matter what */ for (dimension = 0; dimension < size; dimension++) { - int* data = (int*)sa->pvData; + int* data = sa->pvData; data[dimension] = dimension; } @@ -1420,7 +1420,7 @@ static void test_SafeArrayCreateEx(void) /* Win32 doesn't care if GetSize fails */ fail_GetSize = TRUE; - sa = pSafeArrayCreateEx(VT_RECORD, 1, sab, (LPVOID)iRec); + sa = pSafeArrayCreateEx(VT_RECORD, 1, sab, iRec); ok(sa != NULL, "CreateEx (Fail Size) failed\n"); ok(iRec->ref == START_REF_COUNT + 1, "Wrong iRec refcount %d\n", iRec->ref); ok(iRec->sizeCalled == 1, "GetSize called %d times\n", iRec->sizeCalled); @@ -1437,7 +1437,7 @@ static void test_SafeArrayCreateEx(void) iRec->ref = START_REF_COUNT; iRec->sizeCalled = 0; iRec->clearCalled = 0; - sa = pSafeArrayCreateEx(VT_RECORD, 1, sab, (LPVOID)iRec); + sa = pSafeArrayCreateEx(VT_RECORD, 1, sab, iRec); ok(sa != NULL, "CreateEx (Rec) failed\n"); ok(iRec->ref == START_REF_COUNT + 1, "Wrong iRec refcount %d\n", iRec->ref); ok(iRec->sizeCalled == 1, "GetSize called %d times\n", iRec->sizeCalled); diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 713c366..adc5d9f 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -135,7 +135,7 @@ struct host_object_data static DWORD CALLBACK host_object_proc(LPVOID p) { - struct host_object_data *data = (struct host_object_data *)p; + struct host_object_data *data = p; HRESULT hr; MSG msg; diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index dcf1150..9b12b2e 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -154,7 +154,7 @@ static void check_safearray(void *buffer, LPSAFEARRAY lpsa) { GUID guid; SafeArrayGetIID(lpsa, &guid); - ok(IsEqualGUID(&guid, (GUID*)wiresa), "guid mismatch\n"); + ok(IsEqualGUID(&guid, wiresa), "guid mismatch\n"); wiresa += sizeof(GUID); } ok(!memcmp(wiresa, lpsa->rgsabound, sizeof(lpsa->rgsabound[0]) * lpsa->cDims), "bounds mismatch\n"); @@ -444,7 +444,7 @@ static HRESULT WINAPI HeapUnknown_QueryInterface(IUnknown *iface, REFIID riid, v if (IsEqualIID(riid, &IID_IUnknown)) { IUnknown_AddRef(iface); - *ppv = (LPVOID)iface; + *ppv = iface; return S_OK; } *ppv = NULL; diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 6e3136d..4f28234 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -554,7 +554,7 @@ static HRESULT WINAPI DummyDispatch_QueryInterface(LPDISPATCH iface, } if (*ppvObject) { - DummyDispatch_AddRef((IDispatch*)*ppvObject); + DummyDispatch_AddRef(*ppvObject); return S_OK; } } @@ -5452,12 +5452,12 @@ static void test_IUnknownChangeTypeEx(void) /* =>IDispatch */ u.ref = 1; V_VT(&vSrc) = VT_UNKNOWN; - V_UNKNOWN(&vSrc) = (IUnknown*)pu; + V_UNKNOWN(&vSrc) = pu; VariantInit(&vDst); hres = VariantChangeTypeEx(&vDst, &vSrc, lcid, 0, VT_UNKNOWN); /* Note vSrc is not cleared, as final refcount is 2 */ ok(hres == S_OK && u.ref == 2 && - V_VT(&vDst) == VT_UNKNOWN && V_UNKNOWN(&vDst) == (IUnknown*)pu, + V_VT(&vDst) == VT_UNKNOWN && V_UNKNOWN(&vDst) == pu, "change unk(src,dst): expected 0x%08x,%d,%d,%p, got 0x%08x,%d,%d,%p\n", S_OK, 2, VT_UNKNOWN, pu, hres, u.ref, V_VT(&vDst), V_UNKNOWN(&vDst)); @@ -5467,7 +5467,7 @@ static void test_IUnknownChangeTypeEx(void) HRESULT hExpected = DISP_E_BADVARTYPE; V_VT(&vSrc) = VT_UNKNOWN; - V_UNKNOWN(&vSrc) = (IUnknown*)pu; + V_UNKNOWN(&vSrc) = pu; VariantInit(&vDst); if (vt == VT_UNKNOWN || vt == VT_DISPATCH || vt == VT_EMPTY || vt == VT_NULL)

1 0

Jeremy White : twain_32: Return TWRC_FAILURE/ TWCC_NODS when we have no sources.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: 620e81a9828a6a07a449d9b7e1a8a6ecf8c02f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=620e81a9828a6a07a449d9b7e… Author: Jeremy White <jwhite(a)winehq.org> Date: Wed Jan 28 08:53:10 2009 -0600 twain_32: Return TWRC_FAILURE/TWCC_NODS when we have no sources. --- dlls/twain_32/dsm_ctrl.c | 4 ++-- dlls/twain_32/tests/dsm.c | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index 16bffc3..325b49d 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -169,8 +169,8 @@ TW_UINT16 TWAIN_IdentityGetFirst (pTW_IDENTITY pOrigin, TW_MEMREF pData) twain_autodetect(); if (!nrdevices) { TRACE ("no entries found.\n"); - DSM_twCC = TWCC_SUCCESS; - return TWRC_ENDOFLIST; + DSM_twCC = TWCC_NODS; + return TWRC_FAILURE; } DSM_currentDevice = 0; *pSourceIdentity = devices[DSM_currentDevice++].identity; diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index 8f3c7bf..bf91ba2 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -150,12 +150,9 @@ static void test_sources(TW_IDENTITY *appid) memset(&source, 0, sizeof(source)); rc = pDSM_Entry(appid, NULL, DG_CONTROL, DAT_IDENTITY, MSG_GETFIRST, &source); get_condition_code(appid, NULL, &status); - todo_wine - ok(rc == TWRC_SUCCESS || rc == TWRC_FAILURE, "Get first error code, rc %d, cc %d\n", rc, status.ConditionCode); - if (rc == TWRC_SUCCESS) - ok(status.ConditionCode == TWCC_SUCCESS,"Get first invalid condition code, rc %d, cc %d\n", rc, status.ConditionCode); - if (rc == TWRC_FAILURE) - ok(status.ConditionCode == TWCC_NODS,"Get first invalid condition code, rc %d, cc %d\n", rc, status.ConditionCode); + ok( (rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS) || + (rc == TWRC_FAILURE && status.ConditionCode == TWCC_NODS), + "Get first invalid condition code, rc %d, cc %d\n", rc, status.ConditionCode); while (rc == TWRC_SUCCESS) {

1 0

Jeremy White : twain_32: Set the correct condition code for DG_CONTROL/ DAT_IDENTITY/MSG_GETDEFAULT.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: 768c06d3e57344c427bf787285517ea74b438baa URL: http://source.winehq.org/git/wine.git/?a=commit;h=768c06d3e57344c427bf78728… Author: Jeremy White <jwhite(a)winehq.org> Date: Wed Jan 28 08:53:05 2009 -0600 twain_32: Set the correct condition code for DG_CONTROL/DAT_IDENTITY/MSG_GETDEFAULT. --- dlls/twain_32/dsm_ctrl.c | 1 + dlls/twain_32/tests/dsm.c | 12 +++--------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index 346aad3..16bffc3 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -156,6 +156,7 @@ TW_UINT16 TWAIN_IdentityGetDefault (pTW_IDENTITY pOrigin, TW_MEMREF pData) if (!nrdevices) return TWRC_FAILURE; *pSourceIdentity = devices[0].identity; + DSM_twCC = TWCC_SUCCESS; return TWRC_SUCCESS; } diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index 7ac3739..8f3c7bf 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -174,15 +174,9 @@ static void test_sources(TW_IDENTITY *appid) memset(&source, 0, sizeof(source)); rc = pDSM_Entry(appid, NULL, DG_CONTROL, DAT_IDENTITY, MSG_GETDEFAULT, &source); get_condition_code(appid, NULL, &status); - ok(rc == TWRC_SUCCESS || rc == TWRC_FAILURE, "Get default error code, rc %d, cc %d\n", rc, status.ConditionCode); - if (rc == TWRC_SUCCESS) - { - todo_wine - ok(status.ConditionCode == TWCC_SUCCESS,"Get default invalid condition code, rc %d, cc %d\n", rc, status.ConditionCode); - } - - if (rc == TWRC_FAILURE) - ok(status.ConditionCode == TWCC_NODS,"Get default invalid condition code, rc %d, cc %d\n", rc, status.ConditionCode); + ok( (rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS) || + (rc == TWRC_FAILURE && status.ConditionCode == TWCC_NODS), + "Get default invalid condition code, rc %d, cc %d\n", rc, status.ConditionCode); if (rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS) {

1 0

Jeremy White : sane.ds: Implement CAP_SUPPORTEDCAPS.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: e93c14fac78242396ca46ec8885bf7a51820e753 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e93c14fac78242396ca46ec88… Author: Jeremy White <jwhite(a)winehq.org> Date: Wed Jan 28 08:52:56 2009 -0600 sane.ds: Implement CAP_SUPPORTEDCAPS. --- dlls/sane.ds/capability.c | 35 ++++++++++++++++++++++++++++++++++- dlls/twain_32/tests/dsm.c | 3 --- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 615e4cb..1c71b7d 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); static TW_UINT16 SANE_ICAPXferMech (pTW_CAPABILITY pCapability, TW_UINT16 action); +static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability); TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) { @@ -41,6 +42,13 @@ TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) switch (pCapability->Cap) { + case CAP_SUPPORTEDCAPS: + if (action == MSG_GET) + twCC = TWAIN_GetSupportedCaps(pCapability); + else + twCC = TWCC_BADVALUE; + break; + case CAP_DEVICEEVENT: case CAP_ALARMS: case CAP_ALARMVOLUME: @@ -65,7 +73,6 @@ TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) case ICAP_BARCODEMAXRETRIES: case ICAP_BARCODETIMEOUT: case CAP_EXTENDEDCAPS: - case CAP_SUPPORTEDCAPS: case ICAP_FILTER: case ICAP_GAMMA: case ICAP_PLANARCHUNKY: @@ -176,6 +183,32 @@ TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) return twCC; } +static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability) +{ + TW_ARRAY *a; + static const UINT16 supported_caps[] = { CAP_SUPPORTEDCAPS, ICAP_XFERMECH }; + + pCapability->hContainer = GlobalAlloc (0, FIELD_OFFSET( TW_ARRAY, ItemList[sizeof(supported_caps)] )); + pCapability->ConType = TWON_ARRAY; + + if (pCapability->hContainer) + { + UINT16 *u; + int i; + a = GlobalLock (pCapability->hContainer); + a->ItemType = TWTY_UINT16; + a->NumItems = sizeof(supported_caps) / sizeof(supported_caps[0]); + u = (UINT16 *) a->ItemList; + for (i = 0; i < a->NumItems; i++) + u[i] = supported_caps[i]; + GlobalUnlock (pCapability->hContainer); + return TWCC_SUCCESS; + } + else + return TWCC_LOWMEMORY; +} + + static TW_BOOL TWAIN_OneValueSet (pTW_CAPABILITY pCapability, TW_UINT32 value) { pCapability->hContainer = GlobalAlloc (0, sizeof(TW_ONEVALUE)); diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index 0b36549..7ac3739 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -70,7 +70,6 @@ static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) rc = pDSM_Entry(appid, source, DG_CONTROL, DAT_CAPABILITY, MSG_GET, &cap); get_condition_code(appid, source, &status); - todo_wine ok(rc == TWRC_SUCCESS || status.ConditionCode == TWCC_SUCCESS, "Error obtaining CAP_SUPPORTEDCAPS\n"); @@ -98,7 +97,6 @@ static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) } /* For Twain 1.6, all sources must support: */ - todo_wine ok(capabilities[CAP_SUPPORTEDCAPS], "CAP_SUPPORTEDCAPS not supported\n"); todo_wine ok(capabilities[CAP_XFERCOUNT], "CAP_XFERCOUNT not supported\n"); @@ -134,7 +132,6 @@ static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) ok(capabilities[ICAP_PIXELTYPE], "ICAP_PIXELTYPE not supported\n"); todo_wine ok(capabilities[ICAP_UNITS], "ICAP_UNITS not supported\n"); - todo_wine ok(capabilities[ICAP_XFERMECH], "ICAP_XFERMECH not supported\n"); todo_wine ok(capabilities[ICAP_XRESOLUTION], "ICAP_XRESOLUTION not supported\n");

1 0

Jeremy White : sane.ds: Initialize the SupportedGroups field when returning a source.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: 7aa3bb3a68b1b1d5b01ace0dd9fc896c59375e99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aa3bb3a68b1b1d5b01ace0dd… Author: Jeremy White <jwhite(a)winehq.org> Date: Wed Jan 28 08:52:52 2009 -0600 sane.ds: Initialize the SupportedGroups field when returning a source. --- dlls/sane.ds/sane_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 468df3b..413649e 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -615,6 +615,7 @@ SANE_GetIdentity( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { return TWRC_FAILURE; self->ProtocolMajor = TWON_PROTOCOLMAJOR; self->ProtocolMinor = TWON_PROTOCOLMINOR; + self->SupportedGroups = DG_CONTROL | DG_IMAGE; copy_sane_short_name(sane_devlist[cursanedev]->name, self->ProductName, sizeof(self->ProductName) - 1); lstrcpynA (self->Manufacturer, sane_devlist[cursanedev]->vendor, sizeof(self->Manufacturer) - 1); lstrcpynA (self->ProductFamily, sane_devlist[cursanedev]->model, sizeof(self->ProductFamily) - 1);

1 0

Jeremy White : twain_32: Add a bit more tracing about the scanners found.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: 783e469e8bbf7ed97f4aa7217492e3c8582c87a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=783e469e8bbf7ed97f4aa7217… Author: Jeremy White <jwhite(a)winehq.org> Date: Wed Jan 28 08:52:47 2009 -0600 twain_32: Add a bit more tracing about the scanners found. --- dlls/twain_32/tests/dsm.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index 293969b..0b36549 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -148,6 +148,7 @@ static void test_sources(TW_IDENTITY *appid) TW_UINT16 rc; TW_IDENTITY source; TW_STATUS status; + int scannercount = 0; memset(&source, 0, sizeof(source)); rc = pDSM_Entry(appid, NULL, DG_CONTROL, DAT_IDENTITY, MSG_GETFIRST, &source); @@ -161,7 +162,12 @@ static void test_sources(TW_IDENTITY *appid) while (rc == TWRC_SUCCESS) { - trace("Got scanner %s\n", source.ProductName); + scannercount++; + trace("[Scanner %d|Version %d.%d(%s)|Protocol %d.%d|SupportedGroups 0x%x|Manufacturer %s|Family %s|ProductName %s]\n", + scannercount, + source.Version.MajorNum, source.Version.MinorNum, source.Version.Info, + source.ProtocolMajor, source.ProtocolMinor, source.SupportedGroups, + source.Manufacturer, source.ProductFamily, source.ProductName); memset(&source, 0, sizeof(source)); rc = pDSM_Entry(appid, NULL, DG_CONTROL, DAT_IDENTITY, MSG_GETNEXT, &source); get_condition_code(appid, NULL, &status);

1 0

Jeremy White : twain_32: Add an interactive set of tests for a selected scanner.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: b161c1511ca1cf0dc9bd5a5507bae89d452a9fc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b161c1511ca1cf0dc9bd5a550… Author: Jeremy White <jwhite(a)winehq.org> Date: Wed Jan 28 08:52:42 2009 -0600 twain_32: Add an interactive set of tests for a selected scanner. --- dlls/twain_32/tests/dsm.c | 99 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 99 insertions(+), 0 deletions(-) diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index 6ed0a90..293969b 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -57,6 +57,92 @@ static void get_condition_code(TW_IDENTITY *appid, TW_IDENTITY *source, TW_STATU ok(rc == TWRC_SUCCESS, "Condition code not available, rc %d\n", rc); } +static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) +{ + TW_UINT16 rc; + TW_STATUS status; + TW_CAPABILITY cap; + UINT16 capabilities[CAP_CUSTOMBASE]; + + memset(&cap, 0, sizeof(cap)); + cap.Cap = CAP_SUPPORTEDCAPS; + cap.ConType = TWON_DONTCARE16; + + rc = pDSM_Entry(appid, source, DG_CONTROL, DAT_CAPABILITY, MSG_GET, &cap); + get_condition_code(appid, source, &status); + todo_wine + ok(rc == TWRC_SUCCESS || status.ConditionCode == TWCC_SUCCESS, + "Error obtaining CAP_SUPPORTEDCAPS\n"); + + memset(capabilities, 0, sizeof(capabilities)); + if (rc == TWRC_SUCCESS && cap.ConType == TWON_ARRAY) + { + TW_ARRAY *a; + a = GlobalLock(cap.hContainer); + if (a) + { + if (a->ItemType == TWTY_UINT16) + { + int i; + UINT16 *u = (UINT16 *) a->ItemList; + trace("%d Capabilities:\n", a->NumItems); + for (i = 0; i < a->NumItems; i++) + if (u[i] < sizeof(capabilities) / sizeof(capabilities[0])) + { + capabilities[u[i]] = 1; + trace(" %d: 0x%x\n", i, u[i]); + } + } + GlobalUnlock(cap.hContainer); + } + } + + /* For Twain 1.6, all sources must support: */ + todo_wine + ok(capabilities[CAP_SUPPORTEDCAPS], "CAP_SUPPORTEDCAPS not supported\n"); + todo_wine + ok(capabilities[CAP_XFERCOUNT], "CAP_XFERCOUNT not supported\n"); + todo_wine + ok(capabilities[CAP_UICONTROLLABLE], "CAP_UICONTROLLABLE not supported\n"); + + if (source->SupportedGroups & DG_IMAGE) + { + /* For Twain 1.6: + Sources that supply image information must support DG_CONTROL / DAT_CAPABILITY / + MSG_GET, MSG_GETCURRENT, MSG_GETDEFAULT on: + */ + todo_wine + ok(capabilities[ICAP_COMPRESSION], "ICAP_COMPRESSION not supported\n"); + todo_wine + ok(capabilities[ICAP_PLANARCHUNKY], "ICAP_PLANARCHUNKY not supported\n"); + todo_wine + ok(capabilities[ICAP_PHYSICALHEIGHT], "ICAP_PHYSICALHEIGHT not supported\n"); + todo_wine + ok(capabilities[ICAP_PHYSICALWIDTH], "ICAP_PHYSICALWIDTH not supported\n"); + todo_wine + ok(capabilities[ICAP_PIXELFLAVOR], "ICAP_PIXELFLAVOR not supported\n"); + + /* For Twain 1.6: + Sources that supply image information must support DG_CONTROL / DAT_CAPABILITY / + MSG_GET, MSG_GETCURRENT, MSG_GETDEFAULT, MSG_RESET and MSG_SET on: + */ + todo_wine + ok(capabilities[ICAP_BITDEPTH], "ICAP_BITDEPTH not supported\n"); + todo_wine + ok(capabilities[ICAP_BITORDER], "ICAP_BITORDER not supported\n"); + todo_wine + ok(capabilities[ICAP_PIXELTYPE], "ICAP_PIXELTYPE not supported\n"); + todo_wine + ok(capabilities[ICAP_UNITS], "ICAP_UNITS not supported\n"); + todo_wine + ok(capabilities[ICAP_XFERMECH], "ICAP_XFERMECH not supported\n"); + todo_wine + ok(capabilities[ICAP_XRESOLUTION], "ICAP_XRESOLUTION not supported\n"); + todo_wine + ok(capabilities[ICAP_YRESOLUTION], "ICAP_YRESOLUTION not supported\n"); + } +} + static void test_sources(TW_IDENTITY *appid) { TW_UINT16 rc; @@ -115,6 +201,19 @@ static void test_sources(TW_IDENTITY *appid) rc = pDSM_Entry(appid, NULL, DG_CONTROL, DAT_IDENTITY, MSG_USERSELECT, &source); get_condition_code(appid, NULL, &status); ok(rc == TWRC_SUCCESS || rc == TWRC_CANCEL, "Userselect failed, rc %d, cc %d\n", rc, status.ConditionCode); + + if (rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS) + { + rc = pDSM_Entry(appid, NULL, DG_CONTROL, DAT_IDENTITY, MSG_OPENDS, &source); + get_condition_code(appid, NULL, &status); + if (rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS) + { + test_single_source(appid, &source); + rc = pDSM_Entry(appid, NULL, DG_CONTROL, DAT_IDENTITY, MSG_CLOSEDS, &source); + get_condition_code(appid, NULL, &status); + ok(rc == TWRC_SUCCESS, "Close DS Failed, rc %d, cc %d\n", rc, status.ConditionCode); + } + } } }

1 0

Jeremy White : twain_32: Modify get_condition_status to allow for a specific source.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: f7c267dac08c918fce45137293fd79be8d25ebaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7c267dac08c918fce4513729… Author: Jeremy White <jwhite(a)winehq.org> Date: Wed Jan 28 08:52:36 2009 -0600 twain_32: Modify get_condition_status to allow for a specific source. --- dlls/twain_32/tests/dsm.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index a915b53..6ed0a90 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -50,10 +50,10 @@ static BOOL dsm_RegisterWindowClasses(void) } -static void get_condition_code(TW_IDENTITY *appid, TW_STATUS *status) +static void get_condition_code(TW_IDENTITY *appid, TW_IDENTITY *source, TW_STATUS *status) { TW_UINT16 rc; - rc = pDSM_Entry(appid, NULL, DG_CONTROL, DAT_STATUS, MSG_GET, status); + rc = pDSM_Entry(appid, source, DG_CONTROL, DAT_STATUS, MSG_GET, status); ok(rc == TWRC_SUCCESS, "Condition code not available, rc %d\n", rc); } @@ -65,7 +65,7 @@ static void test_sources(TW_IDENTITY *appid) memset(&source, 0, sizeof(source)); rc = pDSM_Entry(appid, NULL, DG_CONTROL, DAT_IDENTITY, MSG_GETFIRST, &source); - get_condition_code(appid, &status); + get_condition_code(appid, NULL, &status); todo_wine ok(rc == TWRC_SUCCESS || rc == TWRC_FAILURE, "Get first error code, rc %d, cc %d\n", rc, status.ConditionCode); if (rc == TWRC_SUCCESS) @@ -78,13 +78,13 @@ static void test_sources(TW_IDENTITY *appid) trace("Got scanner %s\n", source.ProductName); memset(&source, 0, sizeof(source)); rc = pDSM_Entry(appid, NULL, DG_CONTROL, DAT_IDENTITY, MSG_GETNEXT, &source); - get_condition_code(appid, &status); + get_condition_code(appid, NULL, &status); ok(rc == TWRC_SUCCESS || rc == TWRC_ENDOFLIST, "Get next source failed, rc %d, cc %d\n", rc, status.ConditionCode); } memset(&source, 0, sizeof(source)); rc = pDSM_Entry(appid, NULL, DG_CONTROL, DAT_IDENTITY, MSG_GETDEFAULT, &source); - get_condition_code(appid, &status); + get_condition_code(appid, NULL, &status); ok(rc == TWRC_SUCCESS || rc == TWRC_FAILURE, "Get default error code, rc %d, cc %d\n", rc, status.ConditionCode); if (rc == TWRC_SUCCESS) { @@ -98,12 +98,12 @@ static void test_sources(TW_IDENTITY *appid) if (rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS) { rc = pDSM_Entry(appid, NULL, DG_CONTROL, DAT_IDENTITY, MSG_OPENDS, &source); - get_condition_code(appid, &status); + get_condition_code(appid, NULL, &status); if (rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS) { rc = pDSM_Entry(appid, NULL, DG_CONTROL, DAT_IDENTITY, MSG_CLOSEDS, &source); - get_condition_code(appid, &status); + get_condition_code(appid, NULL, &status); ok(rc == TWRC_SUCCESS, "Close DS Failed, rc %d, cc %d\n", rc, status.ConditionCode); } } @@ -113,7 +113,7 @@ static void test_sources(TW_IDENTITY *appid) trace("Interactive, so trying userselect\n"); memset(&source, 0, sizeof(source)); rc = pDSM_Entry(appid, NULL, DG_CONTROL, DAT_IDENTITY, MSG_USERSELECT, &source); - get_condition_code(appid, &status); + get_condition_code(appid, NULL, &status); ok(rc == TWRC_SUCCESS || rc == TWRC_CANCEL, "Userselect failed, rc %d, cc %d\n", rc, status.ConditionCode); }

1 0

Austin English : mssign32: Add stub dll.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: 0d731937b54958168afede28f26584a3309b372a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d731937b54958168afede28f… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 20 20:03:45 2009 -0600 mssign32: Add stub dll. --- configure | 9 ++++++++ configure.ac | 1 + dlls/mssign32/Makefile.in | 13 ++++++++++++ dlls/mssign32/mssign32.spec | 30 +++++++++++++++++++++++++++ dlls/mssign32/mssign32_main.c | 44 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 97 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 9add58a..efb673c 100755 --- a/configure +++ b/configure @@ -25654,6 +25654,14 @@ dlls/msrle32/Makefile: dlls/msrle32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/msrle32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/mssign32/Makefile" +test "x$enable_mssign32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + mssign32" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/mssign32/Makefile: dlls/mssign32/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/mssign32/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mssip32/Makefile" test "x$enable_mssip32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ mssip32" @@ -28499,6 +28507,7 @@ do "dlls/msisys.ocx/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msisys.ocx/Makefile" ;; "dlls/msnet32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msnet32/Makefile" ;; "dlls/msrle32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msrle32/Makefile" ;; + "dlls/mssign32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mssign32/Makefile" ;; "dlls/mssip32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mssip32/Makefile" ;; "dlls/mstask/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mstask/Makefile" ;; "dlls/mstask/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mstask/tests/Makefile" ;; diff --git a/configure.ac b/configure.ac index 682d1da..89e9c5a 100644 --- a/configure.ac +++ b/configure.ac @@ -1999,6 +1999,7 @@ WINE_CONFIG_MAKEFILE([dlls/msisip/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL WINE_CONFIG_MAKEFILE([dlls/msisys.ocx/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/msnet32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/msrle32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mssign32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/mssip32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/mstask/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/mstask/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) diff --git a/dlls/mssign32/Makefile.in b/dlls/mssign32/Makefile.in new file mode 100644 index 0000000..0579acf --- /dev/null +++ b/dlls/mssign32/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = mssign32.dll +IMPORTS = kernel32 + +C_SRCS = \ + mssign32_main.c + +@MAKE_DLL_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/mssign32/mssign32.spec b/dlls/mssign32/mssign32.spec new file mode 100644 index 0000000..95b42e4 --- /dev/null +++ b/dlls/mssign32/mssign32.spec @@ -0,0 +1,30 @@ +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub FreeCryptProvFromCert +@ stub GetCryptProvFromCert +@ stub PvkFreeCryptProv +@ stub PvkGetCryptProv +@ stub PvkPrivateKeyAcquireContext +@ stub PvkPrivateKeyAcquireContextA +@ stub PvkPrivateKeyAcquireContextFromMemory +@ stub PvkPrivateKeyAcquireContextFromMemoryA +@ stub PvkPrivateKeyLoad +@ stub PvkPrivateKeyLoadA +@ stub PvkPrivateKeyLoadFromMemory +@ stub PvkPrivateKeyLoadFromMemoryA +@ stub PvkPrivateKeyReleaseContext +@ stub PvkPrivateKeyReleaseContextA +@ stub PvkPrivateKeySave +@ stub PvkPrivateKeySaveA +@ stub PvkPrivateKeySaveToMemory +@ stub PvkPrivateKeySaveToMemoryA +@ stub SignError +@ stub SignerAddTimeStampResponse +@ stub SignerAddTimeStampResponseEx +@ stub SignerCreateTimeStampRequest +@ stub SignerFreeSignerContext +@ stub SignerSign +@ stub SignerSignEx +@ stub SignerTimeStamp +@ stub SignerTimeStampEx +@ stub SpcGetCertFromKey diff --git a/dlls/mssign32/mssign32_main.c b/dlls/mssign32/mssign32_main.c new file mode 100644 index 0000000..e591917 --- /dev/null +++ b/dlls/mssign32/mssign32_main.c @@ -0,0 +1,44 @@ +/* + * MSSIGN32 implementation + * + * Copyright 2009 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mssign32); + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +}

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
135
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2009