February 2009 - Wine-commits

James Hawkins : msi: Make sure the view being updated is the same view the record was fetched from .
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 2f8c2a8d41007e117f5ada081afb2d8cf87ac9a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f8c2a8d41007e117f5ada081… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Feb 25 19:44:46 2009 -0800 msi: Make sure the view being updated is the same view the record was fetched from. --- dlls/msi/msiquery.c | 6 ++++++ dlls/msi/tests/db.c | 7 +------ dlls/msi/tests/record.c | 10 ++-------- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 430ff52..0cfd05e 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -377,7 +377,10 @@ UINT MSI_ViewFetch(MSIQUERY *query, MSIRECORD **prec) r = msi_view_get_row(query->db, view, query->row, prec); if (r == ERROR_SUCCESS) + { query->row ++; + MSI_RecordSetInteger(*prec, 0, (int)query); + } return r; } @@ -597,6 +600,9 @@ UINT MSI_ViewModify( MSIQUERY *query, MSIMODIFY mode, MSIRECORD *rec ) if ( !view || !view->ops->modify) return ERROR_FUNCTION_FAILED; + if ( mode == MSIMODIFY_UPDATE && MSI_RecordGetInteger( rec, 0 ) != (int)query ) + return ERROR_FUNCTION_FAILED; + r = view->ops->modify( view, mode, rec, query->row ); if (mode == MSIMODIFY_DELETE && r == ERROR_SUCCESS) query->row--; diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 7629bc3..bc7e513 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -321,10 +321,8 @@ static void test_msiinsert(void) r = MsiRecordGetFieldCount(hrec); ok(r == 3, "record count wrong\n"); - todo_wine { r = MsiRecordIsNull(hrec, 0); ok(r == FALSE, "field 0 not null\n"); - } r = MsiRecordGetInteger(hrec, 1); ok(r == 1, "field 1 contents wrong\n"); @@ -903,10 +901,7 @@ static void test_viewmodify(void) ok(r == ERROR_SUCCESS, "failed to set string\n"); r = MsiViewModify(hview, MSIMODIFY_UPDATE, hrec); - todo_wine - { - ok(r == ERROR_FUNCTION_FAILED, "MsiViewModify failed\n"); - } + ok(r == ERROR_FUNCTION_FAILED, "MsiViewModify failed\n"); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 1b88239..8f2b963 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -569,16 +569,10 @@ static void test_fieldzero(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiRecordGetInteger(rec, 0); - todo_wine - { - ok(r != MSI_NULL_INTEGER && r != 0, "Expected non-NULL value, got %d\n", r); - } + ok(r != MSI_NULL_INTEGER && r != 0, "Expected non-NULL value, got %d\n", r); r = MsiRecordIsNull(rec, 0); - todo_wine - { - ok(r == FALSE, "Expected FALSE, got %d\n", r); - } + ok(r == FALSE, "Expected FALSE, got %d\n", r); MsiCloseHandle(hdb); DeleteFileA(msifile);

1 0

Jeremy White : sane.ds: Revise to match identity structures with partial information.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 3d0d1250247e238efd6b7c28dff120be596d61d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d0d1250247e238efd6b7c28d… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Wed Feb 25 20:58:51 2009 -0600 sane.ds: Revise to match identity structures with partial information. --- dlls/sane.ds/sane_main.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 413649e..3bd231e 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -645,19 +645,19 @@ static TW_UINT16 SANE_OpenDS( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { /* To make string as short as above */ lstrcpynA(name, sane_devlist[i]->vendor, sizeof(name)-1); - if (strcmp(name, self->Manufacturer)) + if (self->Manufacturer && *self->Manufacturer && strcmp(name, self->Manufacturer)) continue; lstrcpynA(name, sane_devlist[i]->model, sizeof(name)-1); - if (strcmp(name, self->ProductFamily)) + if (self->ProductFamily && *self->ProductFamily && strcmp(name, self->ProductFamily)) continue; copy_sane_short_name(sane_devlist[i]->name, name, sizeof(name) - 1); - if (strcmp(name, self->ProductName)) + if (self->ProductName && *self->ProductName && strcmp(name, self->ProductName)) continue; break; } if (!sane_devlist[i]) { - FIXME("Scanner not found? Using first one!\n"); - i=0; + FIXME("Scanner not found.\n"); + return TWRC_FAILURE; } status = psane_open(sane_devlist[i]->name,&activeDS.deviceHandle); if (status == SANE_STATUS_GOOD) {

1 0

Alexandre Julliard : makefiles: Avoid nested variable expansion that doesn' t work on BSD make.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: a67d80b4a6107f7301f399f1b14d19e277fa022c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a67d80b4a6107f7301f399f1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 26 12:12:55 2009 +0100 makefiles: Avoid nested variable expansion that doesn't work on BSD make. --- dlls/Makedll.rules.in | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index c318bf2..ca9e972 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -10,7 +10,6 @@ DLLFLAGS = @DLLFLAGS@ DLLEXT = @DLLEXT@ -IMPLIBEXT = @IMPLIBEXT@ MINGWAR = @MINGWAR@ DEFS = -D__WINESRC__ $(EXTRADEFS) BASEMODULE = $(MODULE:%.dll=%) @@ -20,7 +19,7 @@ WIN16_FILES = $(SPEC_SRCS16:.spec=.spec.o) $(C_SRCS16:.c=.o) $(EXTRA_OBJS16) ALL_OBJS = @WIN16_FILES@ $(OBJS) $(RC_SRCS:.rc=.res) ALL_LIBS = $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) $(LIBS) IMPLIB_OBJS = $(IMPLIB_SRCS:.c=.o) -IMPORTLIBFILE = $(IMPORTLIB:%=lib%.$(IMPLIBEXT)) +IMPORTLIBFILE = $(IMPORTLIB:%=lib%.(a)IMPLIBEXT@) STATICIMPLIB = $(IMPORTLIBFILE:.def=.def.a) DLL_LDPATH = -L$(DLLDIR) $(DELAYIMPORTS:%=-L$(DLLDIR)/%) $(IMPORTS:%=-L$(DLLDIR)/%) INSTALLDIRS = $(DESTDIR)$(dlldir) $(DESTDIR)$(datadir)/wine

1 0

James Hawkins : msi: Make sure a constant string's quotes match up.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 60ad75eade5b613b23f22f295d58d8450533a8c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60ad75eade5b613b23f22f295… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Feb 25 19:43:54 2009 -0800 msi: Make sure a constant string's quotes match up. --- dlls/msi/sql.y | 31 +++++++++++++++++++------------ dlls/msi/tests/db.c | 5 ++++- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index 7deae21..0ddbc64 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -49,7 +49,7 @@ typedef struct tag_SQL_input struct list *mem; } SQL_input; -static LPWSTR SQL_getstring( void *info, const struct sql_str *str ); +static UINT SQL_getstring( void *info, const struct sql_str *strdata, LPWSTR *str ); static INT SQL_getint( void *info ); static int sql_lex( void *SQL_lval, SQL_input *info ); @@ -677,8 +677,7 @@ table: id: TK_ID { - $$ = SQL_getstring( info, &$1 ); - if( !$$ ) + if ( SQL_getstring( info, &$1, &$$ ) != ERROR_SUCCESS || !$$ ) YYABORT; } ; @@ -757,11 +756,15 @@ static int sql_lex( void *SQL_lval, SQL_input *sql ) return token; } -LPWSTR SQL_getstring( void *info, const struct sql_str *strdata ) +UINT SQL_getstring( void *info, const struct sql_str *strdata, LPWSTR *str ) { LPCWSTR p = strdata->data; UINT len = strdata->len; - LPWSTR str; + + /* match quotes */ + if( ( (p[0]=='`') && (p[len-1]!='`') ) || + ( (p[0]=='\'') && (p[len-1]!='\'') ) ) + return ERROR_FUNCTION_FAILED; /* if there's quotes, remove them */ if( ( (p[0]=='`') && (p[len-1]=='`') ) || @@ -770,13 +773,13 @@ LPWSTR SQL_getstring( void *info, const struct sql_str *strdata ) p++; len -= 2; } - str = parser_alloc( info, (len + 1)*sizeof(WCHAR) ); - if( !str ) - return str; - memcpy( str, p, len*sizeof(WCHAR) ); - str[len]=0; + *str = parser_alloc( info, (len + 1)*sizeof(WCHAR) ); + if( !*str ) + return ERROR_OUTOFMEMORY; + memcpy( *str, p, len*sizeof(WCHAR) ); + (*str)[len]=0; - return str; + return ERROR_SUCCESS; } INT SQL_getint( void *info ) @@ -867,7 +870,11 @@ static struct expr * EXPR_sval( void *info, const struct sql_str *str ) if( e ) { e->type = EXPR_SVAL; - e->u.sval = SQL_getstring( info, str ); + if( SQL_getstring( info, str, (LPWSTR *)&e->u.sval ) != ERROR_SUCCESS ) + { + msi_free( e ); + return NULL; + } } return e; } diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index cb58de0..7629bc3 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -651,7 +651,10 @@ static void test_msibadqueries(void) ok(r == ERROR_SUCCESS , "query failed\n"); r = try_query( hdb, "select * from c where b = 'x"); - todo_wine ok(r == ERROR_BAD_QUERY_SYNTAX, "query failed\n"); + ok(r == ERROR_BAD_QUERY_SYNTAX, "query failed\n"); + + r = try_query( hdb, "select * from c where b = 'x'"); + ok(r == ERROR_SUCCESS, "query failed\n"); r = try_query( hdb, "select * from 'c'"); ok(r == ERROR_BAD_QUERY_SYNTAX, "query failed\n");

1 0

Jeremy White : sane.ds: Fully support ICAP_PIXELTYPE.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 00f9ef0f4fb1603a5b6d1c2019358f090c4dac2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=00f9ef0f4fb1603a5b6d1c201… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Wed Feb 25 20:58:42 2009 -0600 sane.ds: Fully support ICAP_PIXELTYPE. --- dlls/sane.ds/capability.c | 144 ++++++++++++++++++++++++++++++++++++++++++--- dlls/sane.ds/options.c | 40 +++++++++++++ dlls/sane.ds/sane_i.h | 6 ++- 3 files changed, 180 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00f9ef0f4fb1603a5b6d1…

1 0

Jeremy White : sane.ds: Added support for ICAP_UNITS.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: f75b5ebba6f4caf24ca69a91a6a5bf283e7380d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f75b5ebba6f4caf24ca69a91a… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Wed Feb 25 20:58:34 2009 -0600 sane.ds: Added support for ICAP_UNITS. --- dlls/sane.ds/capability.c | 49 ++++++++++++++++++++++++++++++++++++++++++++- dlls/twain_32/tests/dsm.c | 7 +++++- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index bbd0590..f8a300c 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -154,7 +154,7 @@ static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability) { TW_ARRAY *a; static const UINT16 supported_caps[] = { CAP_SUPPORTEDCAPS, CAP_XFERCOUNT, CAP_UICONTROLLABLE, - ICAP_XFERMECH, ICAP_PIXELTYPE, ICAP_BITDEPTH, ICAP_COMPRESSION, ICAP_PIXELFLAVOR, + ICAP_XFERMECH, ICAP_PIXELTYPE, ICAP_UNITS, ICAP_BITDEPTH, ICAP_COMPRESSION, ICAP_PIXELFLAVOR, ICAP_XRESOLUTION, ICAP_YRESOLUTION }; pCapability->hContainer = GlobalAlloc (0, FIELD_OFFSET( TW_ARRAY, ItemList[sizeof(supported_caps)] )); @@ -311,6 +311,49 @@ static TW_UINT16 SANE_ICAPPixelType (pTW_CAPABILITY pCapability, TW_UINT16 actio return twCC; } +/* ICAP_UNITS */ +static TW_UINT16 SANE_ICAPUnits (pTW_CAPABILITY pCapability, TW_UINT16 action) +{ + TW_UINT32 val; + TW_UINT16 twCC = TWCC_BADCAP; + + TRACE("ICAP_UNITS\n"); + + 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_UINT16, TWUN_INCHES); + break; + + case MSG_SET: + twCC = msg_set(pCapability, &val); + if (twCC == TWCC_SUCCESS) + { + if (val != TWUN_INCHES) + { + ERR("Sane supports only SANE_UNIT_DPI\n"); + twCC = TWCC_BADVALUE; + } + } + break; + + case MSG_GETDEFAULT: + case MSG_RESET: + /* .. fall through intentional .. */ + + case MSG_GETCURRENT: + twCC = set_onevalue(pCapability, TWTY_UINT16, TWUN_INCHES); + break; + } + + return twCC; +} + /* ICAP_BITDEPTH */ static TW_UINT16 SANE_ICAPBitDepth(pTW_CAPABILITY pCapability, TW_UINT16 action) { @@ -581,6 +624,10 @@ TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) twCC = SANE_ICAPPixelType (pCapability, action); break; + case ICAP_UNITS: + twCC = SANE_ICAPUnits (pCapability, action); + break; + case ICAP_BITDEPTH: twCC = SANE_ICAPBitDepth(pCapability, action); break; diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index 9e7dd8d..fb438ab 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -109,6 +109,9 @@ static void check_get(TW_CAPABILITY *pCapability, TW_INT32 actual_support, TW_ONEVALUE *onev = (TW_ONEVALUE *) p; ok(onev->Item == orig_value || !(actual_support & TWQC_GETCURRENT), "MSG_GET of 0x%x returned 0x%x, expecting 0x%x\n", pCapability->Cap, onev->Item, orig_value); + trace("MSG_GET of 0x%x returned val 0x%x, type %d\n", pCapability->Cap, onev->Item, onev->ItemType); + if (suggested_set_value) + *suggested_set_value = onev->Item; } else if (pCapability->ConType == TWON_ENUMERATION) { @@ -473,8 +476,10 @@ static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) if (capabilities[ICAP_PIXELTYPE]) test_onevalue_cap(appid, source, ICAP_PIXELTYPE, TWTY_UINT16, TWQC_GET | TWQC_SET | TWQC_GETDEFAULT | TWQC_GETCURRENT | TWQC_RESET); - todo_wine ok(capabilities[ICAP_UNITS], "ICAP_UNITS not supported\n"); + if (capabilities[ICAP_UNITS]) + test_onevalue_cap(appid, source, ICAP_UNITS, TWTY_UINT16, + TWQC_GET | TWQC_SET | TWQC_GETDEFAULT | TWQC_GETCURRENT | TWQC_RESET); ok(capabilities[ICAP_XFERMECH], "ICAP_XFERMECH not supported\n"); if (capabilities[ICAP_XFERMECH]) test_onevalue_cap(appid, source, ICAP_XFERMECH, TWTY_UINT16,

1 0

Vincent Povirk : shell32: Add a message for opening files with no association.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 8e4aff7a4d7c8bc8c710d1c3347025a83daf19f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e4aff7a4d7c8bc8c710d1c33… Author: Vincent Povirk <madewokherd+8cd9(a)gmail.com> Date: Wed Feb 25 19:14:30 2009 -0600 shell32: Add a message for opening files with no association. --- dlls/shell32/shell32_En.rc | 2 ++ dlls/shell32/shlexec.c | 6 +++++- dlls/shell32/shresdef.h | 2 ++ 3 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_En.rc b/dlls/shell32/shell32_En.rc index f752e6d..d7fa7c3 100644 --- a/dlls/shell32/shell32_En.rc +++ b/dlls/shell32/shell32_En.rc @@ -282,6 +282,8 @@ STRINGTABLE IDS_CPANEL_TITLE "Wine Control Panel" IDS_CPANEL_NAME "Name" IDS_CPANEL_DESCRIPTION "Description" + + IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." } STRINGTABLE diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 1fbaabb..67815ca 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -45,6 +45,7 @@ #include "wine/winbase16.h" #include "shell32_main.h" #include "pidl.h" +#include "shresdef.h" #include "wine/debug.h" @@ -1454,7 +1455,10 @@ static void do_error_dialog( UINT_PTR retval, HWND hwnd ) WCHAR msg[2048]; int error_code=GetLastError(); - FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code, 0, msg, sizeof(msg)/sizeof(WCHAR), NULL); + if (retval == SE_ERR_NOASSOC) + LoadStringW(shell32_hInstance, IDS_SHLEXEC_NOASSOC, msg, sizeof(msg)/sizeof(WCHAR)); + else + FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code, 0, msg, sizeof(msg)/sizeof(WCHAR), NULL); MessageBoxW(hwnd, msg, NULL, MB_ICONERROR); } diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 6353623..01ec977 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -106,6 +106,8 @@ #define IDS_RUNDLG_BROWSE_CAPTION 162 #define IDS_RUNDLG_BROWSE_FILTER 163 +#define IDS_SHLEXEC_NOASSOC 164 + #define IDS_LICENSE 256 #define IDS_LICENSE_CAPTION 257

1 0

Jeremy White : sane.ds: Add support for ICAP_BITDEPTH.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 982482e7e8129197a509c4152facd61d8f9b5822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=982482e7e8129197a509c4152… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Wed Feb 25 20:58:25 2009 -0600 sane.ds: Add support for ICAP_BITDEPTH. --- dlls/sane.ds/capability.c | 40 +++++++++++++++++++++++++++++++++++++++- dlls/twain_32/tests/dsm.c | 4 +++- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 1d574e3..bbd0590 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -154,7 +154,7 @@ static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability) { TW_ARRAY *a; static const UINT16 supported_caps[] = { CAP_SUPPORTEDCAPS, CAP_XFERCOUNT, CAP_UICONTROLLABLE, - ICAP_XFERMECH, ICAP_PIXELTYPE, ICAP_COMPRESSION, ICAP_PIXELFLAVOR, + ICAP_XFERMECH, ICAP_PIXELTYPE, ICAP_BITDEPTH, ICAP_COMPRESSION, ICAP_PIXELFLAVOR, ICAP_XRESOLUTION, ICAP_YRESOLUTION }; pCapability->hContainer = GlobalAlloc (0, FIELD_OFFSET( TW_ARRAY, ItemList[sizeof(supported_caps)] )); @@ -311,6 +311,40 @@ static TW_UINT16 SANE_ICAPPixelType (pTW_CAPABILITY pCapability, TW_UINT16 actio return twCC; } +/* ICAP_BITDEPTH */ +static TW_UINT16 SANE_ICAPBitDepth(pTW_CAPABILITY pCapability, TW_UINT16 action) +{ + TW_UINT16 twCC = TWCC_BADCAP; +#ifdef SONAME_LIBSANE + TW_UINT32 possible_values[1]; + + TRACE("ICAP_BITDEPTH\n"); + + possible_values[0] = activeDS.sane_param.depth; + + switch (action) + { + case MSG_QUERYSUPPORT: + twCC = set_onevalue(pCapability, TWTY_INT32, + TWQC_GET | TWQC_GETDEFAULT | TWQC_GETCURRENT ); + break; + + case MSG_GET: + twCC = msg_get_enum(pCapability, possible_values, sizeof(possible_values) / sizeof(possible_values[0]), + TWTY_UINT16, activeDS.sane_param.depth, activeDS.sane_param.depth); + break; + + case MSG_GETDEFAULT: + /* .. Fall through intentional .. */ + + case MSG_GETCURRENT: + twCC = set_onevalue(pCapability, TWTY_UINT16, activeDS.sane_param.depth); + break; + } +#endif + return twCC; +} + /* CAP_UICONTROLLABLE */ static TW_UINT16 SANE_CAPUiControllable(pTW_CAPABILITY pCapability, TW_UINT16 action) { @@ -547,6 +581,10 @@ TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) twCC = SANE_ICAPPixelType (pCapability, action); break; + case ICAP_BITDEPTH: + twCC = SANE_ICAPBitDepth(pCapability, action); + break; + case ICAP_XFERMECH: twCC = SANE_ICAPXferMech (pCapability, action); break; diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index 54641c1..9e7dd8d 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -463,8 +463,10 @@ static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) 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"); + if (capabilities[ICAP_BITDEPTH]) + test_onevalue_cap(appid, source, ICAP_BITDEPTH, TWTY_UINT16, + TWQC_GET | TWQC_GETDEFAULT | TWQC_GETCURRENT ); todo_wine ok(capabilities[ICAP_BITORDER], "ICAP_BITORDER not supported\n"); ok(capabilities[ICAP_PIXELTYPE], "ICAP_PIXELTYPE not supported\n");

1 0

Jacek Caban : urlmon: Make HttpProtocol implementation vtbl offset independent.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 6e5c2f961d7b883bc8f696bad280e1e239635102 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e5c2f961d7b883bc8f696bad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 26 01:47:24 2009 +0100 urlmon: Make HttpProtocol implementation vtbl offset independent. --- dlls/urlmon/http.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 9bb4ffa..bbad056 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -77,6 +77,9 @@ typedef struct { LONG ref; } HttpProtocol; +#define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) +#define PRIORITY(x) ((IInternetPriority*) &(x)->lpInternetPriorityVtbl) + /* Default headers from native */ static const WCHAR wszHeaders[] = {'A','c','c','e','p','t','-','E','n','c','o','d','i','n','g', ':',' ','g','z','i','p',',',' ','d','e','f','l','a','t','e',0}; @@ -186,10 +189,10 @@ static void CALLBACK HTTPPROTOCOL_InternetStatusCallback( if (This->grfBINDF & BINDF_FROMURLMON) IInternetProtocolSink_Switch(This->protocol_sink, &data); else - IInternetProtocol_Continue((IInternetProtocol *)This, &data); + IInternetProtocol_Continue(PROTOCOL(This), &data); return; case INTERNET_STATUS_HANDLE_CREATED: - IInternetProtocol_AddRef((IInternetProtocol *)This); + IInternetProtocol_AddRef(PROTOCOL(This)); return; case INTERNET_STATUS_HANDLE_CLOSING: if (*(HINTERNET *)lpvStatusInformation == This->connect) @@ -210,7 +213,7 @@ static void CALLBACK HTTPPROTOCOL_InternetStatusCallback( memset(&This->bind_info, 0, sizeof(This->bind_info)); } } - IInternetProtocol_Release((IInternetProtocol *)This); + IInternetProtocol_Release(PROTOCOL(This)); return; default: WARN("Unhandled Internet status callback %d\n", dwInternetStatus); @@ -236,9 +239,6 @@ static inline LPWSTR strndupW(LPCWSTR string, int len) * Interface implementations */ -#define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) -#define PRIORITY(x) ((IInternetPriority*) &(x)->lpInternetPriorityVtbl) - #define PROTOCOL_THIS(iface) DEFINE_THIS(HttpProtocol, InternetProtocol, iface) static HRESULT WINAPI HttpProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv)

1 0

Detlef Riekenberg : mshtml/tests: Fix text in ok().
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 785863ef8a582e3dfb46d007ba05062219946220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=785863ef8a582e3dfb46d007b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Feb 25 22:59:00 2009 +0100 mshtml/tests: Fix text in ok(). --- dlls/mshtml/tests/dom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b9cc872..c39f79f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4142,8 +4142,8 @@ static void test_elems(IHTMLDocument2 *doc) str = a2bstr("img"); hres = IHTMLDocument3_getElementsByTagName(doc3, str, &col); + ok(hres == S_OK, "getElementsByTagName(%s) failed: %08x\n", dbgstr_w(str), hres); SysFreeString(str); - ok(hres == S_OK, "getElementByTag(%s) failed: %08x\n", dbgstr_w(ifrW), hres); if(hres == S_OK) { static const elem_type_t img_types[] = { ET_IMG };

1 0