September 2006 - Wine-commits

Mike McCormack : msi: Fix the prototype of MsiDatabaseIsTablePersistent to match the SDK.
by Alexandre Julliard 08 Sep '06

08 Sep '06

Module: wine Branch: master Commit: 665829c390d3b833f00f3dad439204023b190d53 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=665829c390d3b833f00f3da… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Sep 8 18:01:54 2006 +0900 msi: Fix the prototype of MsiDatabaseIsTablePersistent to match the SDK. --- dlls/msi/msiquery.c | 4 ++-- include/msiquery.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index ba7fc1b..78614fe 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -870,7 +870,7 @@ UINT WINAPI MsiDatabaseGetPrimaryKeysA(M } MSICONDITION WINAPI MsiDatabaseIsTablePersistentA( - MSIHANDLE hDatabase, LPSTR szTableName) + MSIHANDLE hDatabase, LPCSTR szTableName) { LPWSTR szwTableName = NULL; MSICONDITION r; @@ -890,7 +890,7 @@ MSICONDITION WINAPI MsiDatabaseIsTablePe } MSICONDITION WINAPI MsiDatabaseIsTablePersistentW( - MSIHANDLE hDatabase, LPWSTR szTableName) + MSIHANDLE hDatabase, LPCWSTR szTableName) { FIXME("%lx %s\n", hDatabase, debugstr_w(szTableName)); return MSICONDITION_FALSE; diff --git a/include/msiquery.h b/include/msiquery.h index 57f7577..8ea24b6 100644 --- a/include/msiquery.h +++ b/include/msiquery.h @@ -273,8 +273,8 @@ UINT WINAPI MsiOpenDatabaseW(LPCWSTR, LP UINT WINAPI MsiOpenDatabaseA(LPCSTR, LPCSTR, MSIHANDLE*); #define MsiOpenDatabase WINELIB_NAME_AW(MsiOpenDatabase) -MSICONDITION WINAPI MsiDatabaseIsTablePersistentA(MSIHANDLE, LPSTR); -MSICONDITION WINAPI MsiDatabaseIsTablePersistentW(MSIHANDLE, LPWSTR); +MSICONDITION WINAPI MsiDatabaseIsTablePersistentA(MSIHANDLE, LPCSTR); +MSICONDITION WINAPI MsiDatabaseIsTablePersistentW(MSIHANDLE, LPCWSTR); #define MsiDatabaseIsTablePersistent WINELIB_NAME_AW(MsiDatabaseIsTablePersistent) UINT WINAPI MsiSequenceA(MSIHANDLE, LPCSTR, INT);

1 0

James Hawkins : msi: Add tests for MSI SQL join queries.
by Alexandre Julliard 08 Sep '06

08 Sep '06

Module: wine Branch: master Commit: d8c13370b31d067c9edab7770cae31ee036652fa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d8c13370b31d067c9edab77… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Sep 7 15:34:01 2006 -0700 msi: Add tests for MSI SQL join queries. --- dlls/msi/tests/db.c | 366 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 350 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=d8c13370b31d067c9ed…

1 0

James Hawkins : msi: Allow non-key columns to be used with the join query.
by Alexandre Julliard 08 Sep '06

08 Sep '06

Module: wine Branch: master Commit: a302f03c6533abec30e6664e6e152d167000b773 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a302f03c6533abec30e6664… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Sep 7 18:15:40 2006 -0700 msi: Allow non-key columns to be used with the join query. --- dlls/msi/join.c | 17 +-------------- dlls/msi/tests/db.c | 56 ++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 47 insertions(+), 26 deletions(-) diff --git a/dlls/msi/join.c b/dlls/msi/join.c index 17f04c0..fda6b1b 100644 --- a/dlls/msi/join.c +++ b/dlls/msi/join.c @@ -364,7 +364,7 @@ static const MSIVIEWOPS join_ops = */ static UINT join_check_condition(MSIJOINVIEW *jv, struct expr *cond) { - UINT r, type = 0; + UINT r; /* assume that we have `KeyColumn` = `SubkeyColumn` */ if ( cond->type != EXPR_COMPLEX ) @@ -388,21 +388,6 @@ static UINT join_check_condition(MSIJOIN if (r != ERROR_SUCCESS) return ERROR_FUNCTION_FAILED; - /* make sure both columns are keys */ - r = jv->left->ops->get_column_info( jv->left, jv->left_key, NULL, &type ); - if (r != ERROR_SUCCESS) - return ERROR_FUNCTION_FAILED; - - if (!(type & MSITYPE_KEY)) - return ERROR_FUNCTION_FAILED; - - r = jv->right->ops->get_column_info( jv->right, jv->right_key, NULL, &type ); - if (r != ERROR_SUCCESS) - return ERROR_FUNCTION_FAILED; - - if (!(type & MSITYPE_KEY)) - return ERROR_FUNCTION_FAILED; - TRACE("left %s (%u) right %s (%u)\n", debugstr_w(cond->u.expr.left->u.column), jv->left_key, debugstr_w(cond->u.expr.right->u.column), jv->right_key); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 7316fb4..9e43258 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1676,6 +1676,11 @@ static const struct join_res join_res_th { "msvcr.dll", "ijklmnop" }, }; +static const struct join_res join_res_fourth[] = +{ + { "msvcp.dll.01234", "single.dll.31415" }, +}; + static void test_join(void) { MSIHANDLE hdb, hview, hrec; @@ -1741,6 +1746,9 @@ static void test_join(void) r = add_binary_entry( hdb, "'msvcr.dll.56789', 'ijklmnop'" ); ok( r == ERROR_SUCCESS, "cannot add binary: %d\n", r ); + r = add_binary_entry( hdb, "'single.dll.31415', 'msvcp.dll'" ); + ok( r == ERROR_SUCCESS, "cannot add binary: %d\n", r ); + query = "SELECT `Component`.`ComponentId`, `FeatureComponents`.`Feature_` " "FROM `Component`, `FeatureComponents` " "WHERE `Component`.`Component` = `FeatureComponents`.`Component_` " @@ -1834,16 +1842,10 @@ static void test_join(void) "WHERE `StdDlls`.`Binary_` = `Binary`.`Name` " "ORDER BY `File`"; r = MsiDatabaseOpenView(hdb, query, &hview); - todo_wine - { - ok( r == ERROR_SUCCESS, "failed to open view: %d\n", r ); - } + ok( r == ERROR_SUCCESS, "failed to open view: %d\n", r ); r = MsiViewExecute(hview, 0); - todo_wine - { - ok( r == ERROR_SUCCESS, "failed to execute view: %d\n", r ); - } + ok( r == ERROR_SUCCESS, "failed to execute view: %d\n", r ); i = 0; while ((r = MsiViewFetch(hview, &hrec)) == ERROR_SUCCESS) @@ -1867,11 +1869,45 @@ static void test_join(void) MsiCloseHandle(hrec); } - todo_wine + ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); + + MsiViewClose(hview); + MsiCloseHandle(hview); + + query = "SELECT `StdDlls`.`Binary_`, `Binary`.`Name` " + "FROM `StdDlls`, `Binary` " + "WHERE `StdDlls`.`File` = `Binary`.`Data` " + "ORDER BY `Name`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok( r == ERROR_SUCCESS, "failed to open view: %d\n", r ); + + r = MsiViewExecute(hview, 0); + ok( r == ERROR_SUCCESS, "failed to execute view: %d\n", r ); + + i = 0; + while ((r = MsiViewFetch(hview, &hrec)) == ERROR_SUCCESS) { - ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); + count = MsiRecordGetFieldCount( hrec ); + ok( count == 2, "Expected 2 record fields, got %d\n", count ); + + size = MAX_PATH; + r = MsiRecordGetString( hrec, 1, buf, &size ); + ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); + ok( !lstrcmp( buf, join_res_fourth[i].one ), + "Expected '%s', got %s\n", join_res_fourth[i].one, buf ); + + size = MAX_PATH; + r = MsiRecordGetString( hrec, 2, buf, &size ); + ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); + ok( !lstrcmp( buf, join_res_fourth[i].two ), + "Expected '%s', got %s\n", join_res_fourth[i].two, buf ); + + i++; + MsiCloseHandle(hrec); } + ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); + MsiViewClose(hview); MsiCloseHandle(hview); MsiCloseHandle(hdb);

1 0

Detlef Riekenberg : ntdll: attr is never NULL inside NtCreateFile.
by Alexandre Julliard 08 Sep '06

08 Sep '06

Module: wine Branch: master Commit: ace8fd7298399d6437a4e6eca45797d22a44ffe5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ace8fd7298399d6437a4e6e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Sep 8 00:20:28 2006 +0200 ntdll: attr is never NULL inside NtCreateFile. --- dlls/ntdll/file.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index e6257f9..dc8a6bc 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -159,8 +159,8 @@ NTSTATUS WINAPI NtCreateFile( PHANDLE ha SERVER_START_REQ( open_named_pipe ) { req->access = access; - req->attributes = (attr) ? attr->Attributes : 0; - req->rootdir = attr ? attr->RootDirectory : 0; + req->attributes = attr->Attributes; + req->rootdir = attr->RootDirectory; req->flags = options; wine_server_add_data( req, attr->ObjectName->Buffer, attr->ObjectName->Length ); @@ -179,8 +179,8 @@ NTSTATUS WINAPI NtCreateFile( PHANDLE ha SERVER_START_REQ( open_mailslot ) { req->access = access & GENERIC_WRITE; - req->attributes = (attr) ? attr->Attributes : 0; - req->rootdir = attr ? attr->RootDirectory : 0; + req->attributes = attr->Attributes; + req->rootdir = attr->RootDirectory; req->sharing = sharing; wine_server_add_data( req, attr->ObjectName->Buffer, attr->ObjectName->Length );

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 08 Sep '06

08 Sep '06

Module: wine Branch: master Commit: 06f9532dda17bb99e618580bfff4b551236e4817 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=06f9532dda17bb99e618580… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 7 20:01:50 2006 +0200 Assorted spelling fixes. --- dlls/advapi32/crypt.c | 2 +- dlls/gdi/tests/font.c | 2 +- dlls/kernel/sync.c | 2 +- dlls/ole32/tests/compobj.c | 8 ++++---- dlls/opengl32/wgl.c | 6 +++--- dlls/opengl32/wgl_ext.c | 4 ++-- dlls/rpcrt4/rpcrt4_main.c | 4 ++-- dlls/wined3d/directx.c | 24 ++++++++++++------------ dlls/winex11.drv/opengl.c | 6 +++--- dlls/wintrust/tests/register.c | 2 +- dlls/ws2_32/socket.c | 2 +- programs/view/init.c | 2 +- 12 files changed, 32 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=06f9532dda17bb99e61…

1 0

Dan Hipschman : widl: Add more complete pointer handling to write_typeformatstring_var.
by Alexandre Julliard 08 Sep '06

08 Sep '06

Module: wine Branch: master Commit: 6ff8ae327f783252407192c5ac431ec13f8e0db8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6ff8ae327f783252407192c… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Sep 7 16:57:16 2006 -0700 widl: Add more complete pointer handling to write_typeformatstring_var. --- tools/widl/typegen.c | 108 ++++++++++++++++++++++++++++++++++++++++-------- tools/widl/typelib.c | 2 - tools/widl/widltypes.h | 2 - 3 files changed, 93 insertions(+), 19 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b46f0b1..84a2958 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -721,9 +721,17 @@ static size_t write_string_tfs(FILE *fil int has_size = size_is && (size_is->type != EXPR_VOID); size_t start_offset = *typestring_offset; unsigned char flags = 0; - int pointer_type = get_attrv(attrs, ATTR_POINTERTYPE); + int pointer_type; unsigned char rtype; + if (is_ptr(type)) + { + pointer_type = type->type; + type = type->ref; + } + else + pointer_type = get_attrv(attrs, ATTR_POINTERTYPE); + if (!pointer_type) pointer_type = RPC_FC_RP; @@ -1226,12 +1234,11 @@ static size_t write_struct_tfs(FILE *fil } } -static void write_pointer_only_tfs(FILE *file, const attr_t *attrs, size_t offset, unsigned int *typeformat_offset) +static void write_pointer_only_tfs(FILE *file, const attr_t *attrs, int pointer_type, + unsigned char flags, size_t offset, + unsigned int *typeformat_offset) { int in_attr, out_attr; - unsigned char flags = 0; - int pointer_type = get_attrv(attrs, ATTR_POINTERTYPE); - if (!pointer_type) pointer_type = RPC_FC_RP; in_attr = is_attr(attrs, ATTR_IN); out_attr = is_attr(attrs, ATTR_OUT); if (!in_attr && !out_attr) in_attr = 1; @@ -1239,11 +1246,19 @@ static void write_pointer_only_tfs(FILE if (out_attr && !in_attr && pointer_type == RPC_FC_RP) flags |= 0x04; - print_file(file, 2, "0x%x, 0x%x,\t\t/* %s%s */\n", + print_file(file, 2, "0x%x, 0x%x,\t\t/* %s", pointer_type, flags, - pointer_type == RPC_FC_FP ? "FC_FP" : (pointer_type == RPC_FC_UP ? "FC_UP" : "FC_RP"), - (flags & 0x04) ? " [allocated_on_stack]" : ""); + pointer_type == RPC_FC_FP ? "FC_FP" : (pointer_type == RPC_FC_UP ? "FC_UP" : "FC_RP")); + if (file) + { + if (flags & 0x04) + fprintf(file, " [allocated_on_stack]"); + if (flags & 0x10) + fprintf(file, " [pointer_deref]"); + fprintf(file, " */\n"); + } + print_file(file, 2, "NdrFcShort(0x%x), /* %d */\n", offset, offset); *typeformat_offset += 4; } @@ -1281,19 +1296,71 @@ static size_t write_ip_tfs(FILE *file, c return start_offset; } +static int get_ptr_attr(const type_t *t, int def_type) +{ + while (TRUE) + { + int ptr_attr = get_attrv(t->attrs, ATTR_POINTERTYPE); + if (ptr_attr) + return ptr_attr; + if (t->kind != TKIND_ALIAS) + return def_type; + t = t->orig; + } +} + static size_t write_typeformatstring_var(FILE *file, int indent, const var_t *var, unsigned int *typeformat_offset) { const type_t *type = var->type; - int ptr_level = var->ptr_level; + int var_ptrs = var->ptr_level, type_ptrs = 0; + int is_str = is_attr(var->attrs, ATTR_STRING); chat("write_typeformatstring_var: %s\n", var->name); while (TRUE) { + is_str = is_str || is_attr(type->attrs, ATTR_STRING); + if (type->kind == TKIND_ALIAS) + type = type->orig; + else if (is_ptr(type)) + { + ++type_ptrs; + type = type->ref; + } + else + { + type = var->type; + break; + } + } + + while (TRUE) + { + int ptr_level = var_ptrs + type_ptrs; + int pointer_type = 0; + chat("write_typeformatstring: type->type = 0x%x, type->name = %s, ptr_level = %d\n", type->type, type->name, ptr_level); - if (is_string_type(var->attrs, ptr_level, var->array)) + /* var attrs only effect the rightmost pointer */ + if ((0 < var->ptr_level && var_ptrs == var->ptr_level) + || (var->ptr_level == 0 && type == var->type)) + { + int pointer_attr = get_attrv(var->attrs, ATTR_POINTERTYPE); + if (pointer_attr) + { + if (! ptr_level) + error("'%s': pointer attribute applied to non-pointer type", + var->name); + pointer_type = pointer_attr; + } + else + pointer_type = RPC_FC_RP; + } + else /* pointers below other pointers default to unique */ + pointer_type = var_ptrs ? RPC_FC_UP : get_ptr_attr(type, RPC_FC_UP); + + if (is_str && ptr_level + (var->array != NULL) == 1) return write_string_tfs(file, var->attrs, type, var->array, var->name, typeformat_offset); if (is_array_type(var->attrs, ptr_level, var->array)) @@ -1330,16 +1397,15 @@ static size_t write_typeformatstring_var size_t start_offset = *typeformat_offset; int in_attr = is_attr(var->attrs, ATTR_IN); int out_attr = is_attr(var->attrs, ATTR_OUT); - int pointer_type = get_attrv(var->attrs, ATTR_POINTERTYPE); - if (!pointer_type) pointer_type = RPC_FC_RP; + const type_t *base = is_ptr(type) ? type->ref : type; - if (type->type == RPC_FC_IP) + if (base->type == RPC_FC_IP) { - return write_ip_tfs(file, type->attrs, type, type->name, typeformat_offset); + return write_ip_tfs(file, base->attrs, base, base->name, typeformat_offset); } /* special case for pointers to base types */ - switch (type->type) + switch (base->type) { #define CASE_BASETYPE(fctype) \ case RPC_##fctype: \ @@ -1377,9 +1443,17 @@ #define CASE_BASETYPE(fctype) \ if (file) fprintf(file, "/* %2u */\n", *typeformat_offset); - write_pointer_only_tfs(file, var->attrs, 2, typeformat_offset); + write_pointer_only_tfs(file, var->attrs, pointer_type, + 1 < ptr_level ? 0x10 : 0, + 2, typeformat_offset); - ptr_level--; + if (var_ptrs) + --var_ptrs; + else + { + --type_ptrs; + type = type->ref; + } } } diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index ae5cca8..1476e1a 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -73,7 +73,7 @@ type_t *alias(type_t *t, const char *nam return a; } -int is_ptr(type_t *t) +int is_ptr(const type_t *t) { unsigned char c = t->type; return c == RPC_FC_RP diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 6d51b51..3eb027d 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -295,7 +295,7 @@ void init_types(void); type_t *duptype(type_t *t, int dupname); type_t *alias(type_t *t, const char *name); -int is_ptr(type_t *t); +int is_ptr(const type_t *t); int is_var_ptr(var_t *v); int cant_be_null(var_t *v);

1 0

Francois Gouget : ntdll: Document a Microsoft spelling mistake so we know it is not to be fixed.
by Alexandre Julliard 08 Sep '06

08 Sep '06

Module: wine Branch: master Commit: 4efaf24ce7feb11ce1d62b08750f1b38d9a619f4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4efaf24ce7feb11ce1d62b0… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 7 20:01:35 2006 +0200 ntdll: Document a Microsoft spelling mistake so we know it is not to be fixed. --- dlls/ntdll/ntdll.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 5a75cec..d0c55cb 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -626,6 +626,7 @@ # @ stub RtlGetFrame @ stdcall RtlGetLastNtStatus() @ stdcall RtlGetLastWin32Error() # @ stub RtlGetLengthWithoutLastFullDosOrNtPathElement +# Yes, Microsoft really misspelled this one! # @ stub RtlGetLengthWithoutTrailingPathSeperators @ stdcall RtlGetLongestNtPathLength() # @ stub RtlGetNativeSystemInformation

1 0

Francois Gouget : shell32: Fix spelling of a local variable.
by Alexandre Julliard 08 Sep '06

08 Sep '06

Module: wine Branch: master Commit: 3c336ab0cf93de8238b3ff95cbab84ce69b93502 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3c336ab0cf93de8238b3ff9… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 7 20:00:15 2006 +0200 shell32: Fix spelling of a local variable. --- dlls/shell32/shlmenu.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index 7a56222..42cec7a 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -485,7 +485,7 @@ HMENU WINAPI FileMenu_FindSubMenuByPidl( int WINAPI FileMenu_AppendFilesForPidl( HMENU hmenu, LPCITEMIDLIST pidl, - BOOL bAddSeperator) + BOOL bAddSeparator) { LPFMINFO menudata; @@ -495,10 +495,10 @@ int WINAPI FileMenu_AppendFilesForPidl( FM_InitMenuPopup(hmenu, pidl); - if (bAddSeperator) + if (bAddSeparator) FileMenu_AppendItemW (hmenu, FM_SEPARATOR, 0, 0, 0, FM_DEFAULT_HEIGHT); - TRACE("%p %p 0x%08x\n",hmenu, pidl,bAddSeperator); + TRACE("%p %p 0x%08x\n",hmenu, pidl,bAddSeparator); return 0; }

1 0

Francois Gouget : ole32: Fix spelling of a couple of local variables.
by Alexandre Julliard 08 Sep '06

08 Sep '06

Module: wine Branch: master Commit: 19be7545e5f326287b3656694b02607b421d63af URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=19be7545e5f326287b36566… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 7 20:00:30 2006 +0200 ole32: Fix spelling of a couple of local variables. --- dlls/ole32/stg_stream.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index f866491..48ae9f8 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -187,7 +187,7 @@ static void StgStreamImpl_OpenBlockChain StgStreamImpl* This) { StgProperty curProperty; - BOOL readSucessful; + BOOL readSuccessful; /* * Make sure no old object is left over. @@ -207,11 +207,11 @@ static void StgStreamImpl_OpenBlockChain /* * Read the information from the property. */ - readSucessful = StorageImpl_ReadProperty(This->parentStorage->ancestorStorage, + readSuccessful = StorageImpl_ReadProperty(This->parentStorage->ancestorStorage, This->ownerProperty, &curProperty); - if (readSucessful) + if (readSuccessful) { This->streamSize = curProperty.size; @@ -803,7 +803,7 @@ static HRESULT WINAPI StgStreamImpl_Stat StgStreamImpl* const This=(StgStreamImpl*)iface; StgProperty curProperty; - BOOL readSucessful; + BOOL readSuccessful; TRACE("%p %p %ld\n", This, pstatstg, grfStatFlag); @@ -817,11 +817,11 @@ static HRESULT WINAPI StgStreamImpl_Stat /* * Read the information from the property. */ - readSucessful = StorageImpl_ReadProperty(This->parentStorage->ancestorStorage, + readSuccessful = StorageImpl_ReadProperty(This->parentStorage->ancestorStorage, This->ownerProperty, &curProperty); - if (readSucessful) + if (readSuccessful) { StorageUtl_CopyPropertyToSTATSTG(pstatstg, &curProperty,

1 0

Francois Gouget : tapi32: Fix spelling of a local variable.
by Alexandre Julliard 08 Sep '06

08 Sep '06

Module: wine Branch: master Commit: 2307b78604def5ce80e5973359f85fb6b935d16c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2307b78604def5ce80e5973… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 7 20:00:45 2006 +0200 tapi32: Fix spelling of a local variable. --- dlls/tapi32/line.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 02c6d25..97e118a 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -188,7 +188,7 @@ DWORD WINAPI lineDrop(HCALL hCall, LPCST /*********************************************************************** * lineForward (TAPI32.@) */ -DWORD WINAPI lineForwardA(HLINE hLine, DWORD bAllAddress, DWORD dwAdressID, LPLINEFORWARDLIST lpForwardList, DWORD dwNumRingsNoAnswer, LPHCALL lphConsultCall, LPLINECALLPARAMS lpCallParams) +DWORD WINAPI lineForwardA(HLINE hLine, DWORD bAllAddress, DWORD dwAddressID, LPLINEFORWARDLIST lpForwardList, DWORD dwNumRingsNoAnswer, LPHCALL lphConsultCall, LPLINECALLPARAMS lpCallParams) { FIXME("stub.\n"); return 1;

1 0