Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
f6c7ae6a
Commit
f6c7ae6a
authored
Oct 24, 2006
by
Mike McCormack
Committed by
Alexandre Julliard
Oct 23, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Fix insertion of null integers into a table.
parent
88580113
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
7 deletions
+4
-7
table.c
dlls/msi/table.c
+3
-1
db.c
dlls/msi/tests/db.c
+1
-6
No files found.
dlls/msi/table.c
View file @
f6c7ae6a
...
...
@@ -1378,7 +1378,9 @@ static UINT msi_table_modify_row( MSITABLEVIEW *tv, MSIRECORD *rec,
if
(
(
~
tv
->
columns
[
i
].
type
&
MSITYPE_KEY
)
&&
(
~
mask
&
(
1
<<
i
))
)
continue
;
if
(
(
tv
->
columns
[
i
].
type
&
MSITYPE_STRING
)
&&
if
(
MSI_RecordIsNull
(
rec
,
i
+
1
))
val
=
0
;
else
if
(
(
tv
->
columns
[
i
].
type
&
MSITYPE_STRING
)
&&
!
MSITYPE_IS_BINARY
(
tv
->
columns
[
i
].
type
)
)
{
const
WCHAR
*
str
=
MSI_RecordGetString
(
rec
,
i
+
1
);
...
...
dlls/msi/tests/db.c
View file @
f6c7ae6a
...
...
@@ -1458,10 +1458,7 @@ static void test_msiimport(void)
ok
(
i
==
2
,
"Expected 2, got %d
\n
"
,
i
);
i
=
MsiRecordGetInteger
(
rec
,
4
);
todo_wine
{
ok
(
i
==
0x80000000
,
"Expected 0x80000000, got %d
\n
"
,
i
);
}
ok
(
i
==
MSI_NULL_INTEGER
,
"Expected MSI_NULL_INTEGER, got %d
\n
"
,
i
);
i
=
MsiRecordGetInteger
(
rec
,
5
);
ok
(
i
==
2147483640
,
"Expected 2147483640, got %d
\n
"
,
i
);
...
...
@@ -2887,12 +2884,10 @@ static void test_integers(void)
r
=
MsiRecordGetFieldCount
(
rec
);
ok
(
r
==
8
,
"record count wrong: %d
\n
"
,
r
);
todo_wine
{
i
=
MsiRecordGetInteger
(
rec
,
1
);
ok
(
i
==
MSI_NULL_INTEGER
,
"Expected MSI_NULL_INTEGER, got %d
\n
"
,
i
);
i
=
MsiRecordGetInteger
(
rec
,
3
);
ok
(
i
==
MSI_NULL_INTEGER
,
"Expected MSI_NULL_INTEGER, got %d
\n
"
,
i
);
}
i
=
MsiRecordGetInteger
(
rec
,
2
);
ok
(
i
==
2
,
"Expected 2, got %d
\n
"
,
i
);
i
=
MsiRecordGetInteger
(
rec
,
4
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment