Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
ba491991
Commit
ba491991
authored
17 years ago
by
James Hawkins
Committed by
Alexandre Julliard
17 years ago
Browse files
Options
Downloads
Patches
Plain Diff
msi: Forward MsiFormatRecordA to MsiFormatRecordW.
parent
cba1b1e1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/msi/format.c
+30
-63
30 additions, 63 deletions
dlls/msi/format.c
dlls/msi/msipriv.h
+0
-1
0 additions, 1 deletion
dlls/msi/msipriv.h
with
30 additions
and
64 deletions
dlls/msi/format.c
+
30
−
63
View file @
ba491991
...
...
@@ -657,57 +657,6 @@ UINT MSI_FormatRecordW( MSIPACKAGE* package, MSIRECORD* record, LPWSTR buffer,
return
rc
;
}
UINT
MSI_FormatRecordA
(
MSIPACKAGE
*
package
,
MSIRECORD
*
record
,
LPSTR
buffer
,
DWORD
*
size
)
{
LPWSTR
deformated
;
LPWSTR
rec
;
DWORD
len
,
lenA
;
UINT
rc
=
ERROR_INVALID_PARAMETER
;
TRACE
(
"%p %p %p %i
\n
"
,
package
,
record
,
buffer
,
*
size
);
rec
=
msi_dup_record_field
(
record
,
0
);
if
(
!
rec
)
rec
=
build_default_format
(
record
);
TRACE
(
"(%s)
\n
"
,
debugstr_w
(
rec
));
len
=
deformat_string_internal
(
package
,
rec
,
&
deformated
,
strlenW
(
rec
),
record
,
NULL
);
/* If len is zero then WideCharToMultiByte will return 0 indicating
* failure, but that will do just as well since we are ignoring
* possible errors.
*/
lenA
=
WideCharToMultiByte
(
CP_ACP
,
0
,
deformated
,
len
,
NULL
,
0
,
NULL
,
NULL
);
if
(
buffer
)
{
/* Ditto above */
WideCharToMultiByte
(
CP_ACP
,
0
,
deformated
,
len
,
buffer
,
*
size
,
NULL
,
NULL
);
if
(
*
size
>
lenA
)
{
rc
=
ERROR_SUCCESS
;
buffer
[
lenA
]
=
0
;
}
else
{
rc
=
ERROR_MORE_DATA
;
if
(
*
size
)
buffer
[(
*
size
)
-
1
]
=
0
;
}
}
else
rc
=
ERROR_SUCCESS
;
*
size
=
lenA
;
msi_free
(
rec
);
msi_free
(
deformated
);
return
rc
;
}
UINT
WINAPI
MsiFormatRecordW
(
MSIHANDLE
hInstall
,
MSIHANDLE
hRecord
,
LPWSTR
szResult
,
DWORD
*
sz
)
{
...
...
@@ -791,30 +740,48 @@ done:
UINT
WINAPI
MsiFormatRecordA
(
MSIHANDLE
hInstall
,
MSIHANDLE
hRecord
,
LPSTR
szResult
,
DWORD
*
sz
)
{
UINT
r
=
ERROR_INVALID_HANDLE
;
MSIPACKAGE
*
package
=
NULL
;
MSIRECORD
*
record
=
NULL
;
UINT
r
;
DWORD
len
,
save
;
LPWSTR
value
;
TRACE
(
"%ld %ld %p %p
\n
"
,
hInstall
,
hRecord
,
szResult
,
sz
);
record
=
msihandle2msiinfo
(
hRecord
,
MSIHANDLETYPE_RECORD
);
if
(
!
record
)
if
(
!
hRecord
)
return
ERROR_INVALID_HANDLE
;
if
(
!
sz
)
{
msiobj_release
(
&
record
->
hdr
);
if
(
szResult
)
return
ERROR_INVALID_PARAMETER
;
else
return
ERROR_SUCCESS
;
}
package
=
msihandle2msiinfo
(
hInstall
,
MSIHANDLETYPE_PACKAGE
);
r
=
MsiFormatRecordW
(
hInstall
,
hRecord
,
NULL
,
&
len
);
if
(
r
!=
ERROR_SUCCESS
)
return
r
;
r
=
MSI_FormatRecordA
(
package
,
record
,
szResult
,
sz
);
msiobj_release
(
&
record
->
hdr
);
if
(
package
)
msiobj_release
(
&
package
->
hdr
);
value
=
msi_alloc
(
++
len
*
sizeof
(
WCHAR
));
if
(
!
value
)
return
ERROR_OUTOFMEMORY
;
r
=
MsiFormatRecordW
(
hInstall
,
hRecord
,
value
,
&
len
);
if
(
r
!=
ERROR_SUCCESS
)
goto
done
;
save
=
len
+
1
;
len
=
WideCharToMultiByte
(
CP_ACP
,
0
,
value
,
-
1
,
NULL
,
0
,
NULL
,
NULL
);
WideCharToMultiByte
(
CP_ACP
,
0
,
value
,
-
1
,
szResult
,
*
sz
,
NULL
,
NULL
);
if
(
szResult
&&
len
>
*
sz
)
{
if
(
*
sz
)
szResult
[
*
sz
-
1
]
=
'\0'
;
r
=
ERROR_MORE_DATA
;
}
*
sz
=
save
-
1
;
done:
msi_free
(
value
);
return
r
;
}
This diff is collapsed.
Click to expand it.
dlls/msi/msipriv.h
+
0
−
1
View file @
ba491991
...
...
@@ -691,7 +691,6 @@ extern UINT msi_package_add_media_disk(MSIPACKAGE *, DWORD, DWORD, DWORD, LPWSTR
/* for deformating */
extern
UINT
MSI_FormatRecordW
(
MSIPACKAGE
*
,
MSIRECORD
*
,
LPWSTR
,
DWORD
*
);
extern
UINT
MSI_FormatRecordA
(
MSIPACKAGE
*
,
MSIRECORD
*
,
LPSTR
,
DWORD
*
);
/* registry data encoding/decoding functions */
extern
BOOL
unsquash_guid
(
LPCWSTR
in
,
LPWSTR
out
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment