Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
cpython
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
Batuhan Osman TASKAYA
cpython
Commits
371bb50b
Kaydet (Commit)
371bb50b
authored
Agu 16, 2008
tarafından
Martin v. Löwis
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Bug #3542: Support Unicode strings in _msi module.
üst
9abf93d6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
19 deletions
+24
-19
NEWS
Misc/NEWS
+5
-0
_msi.c
PC/_msi.c
+19
-19
No files found.
Misc/NEWS
Dosyayı görüntüle @
371bb50b
...
@@ -49,6 +49,11 @@ Library
...
@@ -49,6 +49,11 @@ Library
- Issue #2523: Fix quadratic behaviour when read()ing a binary file without
- Issue #2523: Fix quadratic behaviour when read()ing a binary file without
asking for a specific length.
asking for a specific length.
Extension Modules
-----------------
- Bug #3542: Support Unicode strings in _msi module.
What's new in Python 3.0b2?
What's new in Python 3.0b2?
===========================
===========================
...
...
PC/_msi.c
Dosyayı görüntüle @
371bb50b
...
@@ -18,7 +18,7 @@ static PyObject*
...
@@ -18,7 +18,7 @@ static PyObject*
uuidcreate
(
PyObject
*
obj
,
PyObject
*
args
)
uuidcreate
(
PyObject
*
obj
,
PyObject
*
args
)
{
{
UUID
result
;
UUID
result
;
char
*
cresult
;
RPC_WSTR
cresult
;
PyObject
*
oresult
;
PyObject
*
oresult
;
/* May return ok, local only, and no address.
/* May return ok, local only, and no address.
...
@@ -30,13 +30,13 @@ uuidcreate(PyObject* obj, PyObject*args)
...
@@ -30,13 +30,13 @@ uuidcreate(PyObject* obj, PyObject*args)
return
NULL
;
return
NULL
;
}
}
if
(
UuidToString
(
&
result
,
&
cresult
)
==
RPC_S_OUT_OF_MEMORY
)
{
if
(
UuidToString
W
(
&
result
,
&
cresult
)
==
RPC_S_OUT_OF_MEMORY
)
{
PyErr_SetString
(
PyExc_MemoryError
,
"out of memory in uuidgen"
);
PyErr_SetString
(
PyExc_MemoryError
,
"out of memory in uuidgen"
);
return
NULL
;
return
NULL
;
}
}
oresult
=
Py
Bytes_FromString
(
cresult
);
oresult
=
Py
Unicode_FromUnicode
(
cresult
,
wcslen
(
cresult
)
);
RpcStringFree
(
&
cresult
);
RpcStringFree
W
(
&
cresult
);
return
oresult
;
return
oresult
;
}
}
...
@@ -359,23 +359,23 @@ record_getstring(msiobj* record, PyObject* args)
...
@@ -359,23 +359,23 @@ record_getstring(msiobj* record, PyObject* args)
{
{
unsigned
int
field
;
unsigned
int
field
;
unsigned
int
status
;
unsigned
int
status
;
char
buf
[
2000
];
WCHAR
buf
[
2000
];
char
*
res
=
buf
;
WCHAR
*
res
=
buf
;
DWORD
size
=
sizeof
(
buf
);
DWORD
size
=
sizeof
(
buf
);
PyObject
*
string
;
PyObject
*
string
;
if
(
!
PyArg_ParseTuple
(
args
,
"I:GetString"
,
&
field
))
if
(
!
PyArg_ParseTuple
(
args
,
"I:GetString"
,
&
field
))
return
NULL
;
return
NULL
;
status
=
MsiRecordGetString
(
record
->
h
,
field
,
res
,
&
size
);
status
=
MsiRecordGetString
W
(
record
->
h
,
field
,
res
,
&
size
);
if
(
status
==
ERROR_MORE_DATA
)
{
if
(
status
==
ERROR_MORE_DATA
)
{
res
=
(
char
*
)
malloc
(
size
+
1
);
res
=
(
WCHAR
*
)
malloc
((
size
+
1
)
*
sizeof
(
WCHAR
)
);
if
(
res
==
NULL
)
if
(
res
==
NULL
)
return
PyErr_NoMemory
();
return
PyErr_NoMemory
();
status
=
MsiRecordGetString
(
record
->
h
,
field
,
res
,
&
size
);
status
=
MsiRecordGetString
W
(
record
->
h
,
field
,
res
,
&
size
);
}
}
if
(
status
!=
ERROR_SUCCESS
)
if
(
status
!=
ERROR_SUCCESS
)
return
msierror
((
int
)
status
);
return
msierror
((
int
)
status
);
string
=
PyUnicode_From
String
(
res
);
string
=
PyUnicode_From
Unicode
(
res
,
size
);
if
(
buf
!=
res
)
if
(
buf
!=
res
)
free
(
res
);
free
(
res
);
return
string
;
return
string
;
...
@@ -397,12 +397,12 @@ record_setstring(msiobj* record, PyObject *args)
...
@@ -397,12 +397,12 @@ record_setstring(msiobj* record, PyObject *args)
{
{
int
status
;
int
status
;
int
field
;
int
field
;
char
*
data
;
Py_UNICODE
*
data
;
if
(
!
PyArg_ParseTuple
(
args
,
"i
s
:SetString"
,
&
field
,
&
data
))
if
(
!
PyArg_ParseTuple
(
args
,
"i
u
:SetString"
,
&
field
,
&
data
))
return
NULL
;
return
NULL
;
if
((
status
=
MsiRecordSetString
(
record
->
h
,
field
,
data
))
!=
ERROR_SUCCESS
)
if
((
status
=
MsiRecordSetString
W
(
record
->
h
,
field
,
data
))
!=
ERROR_SUCCESS
)
return
msierror
(
status
);
return
msierror
(
status
);
Py_INCREF
(
Py_None
);
Py_INCREF
(
Py_None
);
...
@@ -414,12 +414,12 @@ record_setstream(msiobj* record, PyObject *args)
...
@@ -414,12 +414,12 @@ record_setstream(msiobj* record, PyObject *args)
{
{
int
status
;
int
status
;
int
field
;
int
field
;
char
*
data
;
Py_UNICODE
*
data
;
if
(
!
PyArg_ParseTuple
(
args
,
"i
s
:SetStream"
,
&
field
,
&
data
))
if
(
!
PyArg_ParseTuple
(
args
,
"i
u
:SetStream"
,
&
field
,
&
data
))
return
NULL
;
return
NULL
;
if
((
status
=
MsiRecordSetStream
(
record
->
h
,
field
,
data
))
!=
ERROR_SUCCESS
)
if
((
status
=
MsiRecordSetStream
W
(
record
->
h
,
field
,
data
))
!=
ERROR_SUCCESS
)
return
msierror
(
status
);
return
msierror
(
status
);
Py_INCREF
(
Py_None
);
Py_INCREF
(
Py_None
);
...
@@ -586,9 +586,9 @@ summary_setproperty(msiobj* si, PyObject *args)
...
@@ -586,9 +586,9 @@ summary_setproperty(msiobj* si, PyObject *args)
if
(
!
PyArg_ParseTuple
(
args
,
"iO:SetProperty"
,
&
field
,
&
data
))
if
(
!
PyArg_ParseTuple
(
args
,
"iO:SetProperty"
,
&
field
,
&
data
))
return
NULL
;
return
NULL
;
if
(
Py
Bytes
_Check
(
data
))
{
if
(
Py
Unicode
_Check
(
data
))
{
status
=
MsiSummaryInfoSetProperty
(
si
->
h
,
field
,
VT_LPSTR
,
status
=
MsiSummaryInfoSetProperty
W
(
si
->
h
,
field
,
VT_LPSTR
,
0
,
NULL
,
Py
Bytes_AsString
(
data
));
0
,
NULL
,
Py
Unicode_AsUnicode
(
data
));
}
else
if
(
PyLong_CheckExact
(
data
))
{
}
else
if
(
PyLong_CheckExact
(
data
))
{
long
value
=
PyLong_AsLong
(
data
);
long
value
=
PyLong_AsLong
(
data
);
if
(
value
==
-
1
&&
PyErr_Occurred
())
{
if
(
value
==
-
1
&&
PyErr_Occurred
())
{
...
...
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