September 2006 - Wine-Commits

Mikołaj Zalewski : sane.ds: Use SS_CENTER to center a dialog string.
by Alexandre Julliard Sept. 29, 2006

Sept. 29, 2006

Module: wine Branch: master Commit: 1be963e6580d6faa562ed6f1f92813514b649f15 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1be963e6580d6faa562ed6f… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Sep 28 20:48:41 2006 +0200 sane.ds: Use SS_CENTER to center a dialog string. --- dlls/sane.ds/sane_De.rc | 2 +- dlls/sane.ds/sane_En.rc | 2 +- dlls/sane.ds/sane_Fi.rc | 2 +- dlls/sane.ds/sane_Fr.rc | 2 +- dlls/sane.ds/sane_Ko.rc | 2 +- dlls/sane.ds/sane_Nl.rc | 2 +- dlls/sane.ds/sane_No.rc | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/sane.ds/sane_De.rc b/dlls/sane.ds/sane_De.rc index 68fefb4..39ac10c 100644 --- a/dlls/sane.ds/sane_De.rc +++ b/dlls/sane.ds/sane_De.rc @@ -25,7 +25,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPT CAPTION "Scanne" FONT 8, "MS Sans Serif" BEGIN - LTEXT "SCANNE.... Bitte warten",IDC_STATIC,53,19,85,8 + LTEXT "SCANNE.... Bitte warten",IDC_STATIC,5,19,176,8, SS_CENTER END STRINGTABLE DISCARDABLE diff --git a/dlls/sane.ds/sane_En.rc b/dlls/sane.ds/sane_En.rc index 5af5a01..7a2bd5d 100644 --- a/dlls/sane.ds/sane_En.rc +++ b/dlls/sane.ds/sane_En.rc @@ -25,7 +25,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPT CAPTION "Scanning" FONT 8, "MS Sans Serif" BEGIN - LTEXT "SCANNING.... Please Wait",IDC_STATIC,53,19,85,8 + LTEXT "SCANNING.... Please Wait",IDC_STATIC,5,19,176,8, SS_CENTER END STRINGTABLE DISCARDABLE diff --git a/dlls/sane.ds/sane_Fi.rc b/dlls/sane.ds/sane_Fi.rc index 1012a93..7801dc9 100644 --- a/dlls/sane.ds/sane_Fi.rc +++ b/dlls/sane.ds/sane_Fi.rc @@ -25,7 +25,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPT CAPTION "Skannataan" FONT 8, "MS Sans Serif" BEGIN - LTEXT "SKANNATAAN.... Odota hetki",IDC_STATIC,53,19,85,8 + LTEXT "SKANNATAAN.... Odota hetki",IDC_STATIC,5,19,176,8, SS_CENTER END STRINGTABLE DISCARDABLE diff --git a/dlls/sane.ds/sane_Fr.rc b/dlls/sane.ds/sane_Fr.rc index dc24303..9acc461 100644 --- a/dlls/sane.ds/sane_Fr.rc +++ b/dlls/sane.ds/sane_Fr.rc @@ -25,7 +25,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPT CAPTION "Acquisition" FONT 8, "MS Sans Serif" BEGIN - LTEXT "Acquisition.... Veuillez patienter",IDC_STATIC,53,19,85,8 + LTEXT "Acquisition.... Veuillez patienter",IDC_STATIC,5,19,176,8, SS_CENTER END STRINGTABLE DISCARDABLE diff --git a/dlls/sane.ds/sane_Ko.rc b/dlls/sane.ds/sane_Ko.rc index 6f6c6b8..5fbf531 100644 --- a/dlls/sane.ds/sane_Ko.rc +++ b/dlls/sane.ds/sane_Ko.rc @@ -26,7 +26,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPT CAPTION "��ĳ��" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "��ĳ�� ... ��ٸ��ʽÿ�.",IDC_STATIC,53,19,85,8 + LTEXT "��ĳ�� ... ��ٸ��ʽÿ�.",IDC_STATIC,5,19,176,8, SS_CENTER END STRINGTABLE DISCARDABLE diff --git a/dlls/sane.ds/sane_Nl.rc b/dlls/sane.ds/sane_Nl.rc index 70dafdf..3bcf3eb 100644 --- a/dlls/sane.ds/sane_Nl.rc +++ b/dlls/sane.ds/sane_Nl.rc @@ -25,7 +25,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPT CAPTION "Scannen" FONT 8, "MS Sans Serif" BEGIN - LTEXT "SCANNEN.... Even geduld",IDC_STATIC,53,19,85,8 + LTEXT "SCANNEN.... Even geduld",IDC_STATIC,5,19,176,8, SS_CENTER END STRINGTABLE DISCARDABLE diff --git a/dlls/sane.ds/sane_No.rc b/dlls/sane.ds/sane_No.rc index a8a1f0b..cbd14d5 100644 --- a/dlls/sane.ds/sane_No.rc +++ b/dlls/sane.ds/sane_No.rc @@ -25,7 +25,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPT CAPTION "Skanner" FONT 8, "MS Sans Serif" BEGIN - LTEXT "Skanner . . . vent litt",IDC_STATIC,53,19,85,8 + LTEXT "Skanner . . . vent litt",IDC_STATIC,5,19,176,8, SS_CENTER END STRINGTABLE DISCARDABLE

1 0

Juan Lang : wincrypt.h: Fix a typo.
by Alexandre Julliard Sept. 29, 2006

Sept. 29, 2006

Module: wine Branch: master Commit: 3fdd3398a2bde63c46f09f5f5ac1259ad48b22cf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3fdd3398a2bde63c46f09f5… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Sep 28 10:57:01 2006 -0700 wincrypt.h: Fix a typo. --- include/wincrypt.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index bfe9ac2..7b84570 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -1322,7 +1322,7 @@ #define ALG_SID_MD2 #define ALG_SID_MD4 2 #define ALG_SID_MD5 3 #define ALG_SID_SHA 4 -#define ALG_SID_SHA1 CALG_SHA +#define ALG_SID_SHA1 ALG_SID_SHA #define ALG_SID_MAC 5 #define ALG_SID_RIPEMD 6 #define ALG_SID_RIPEMD160 7

1 0

Mikołaj Zalewski : sane.ds: Add Polish translation.
by Alexandre Julliard Sept. 29, 2006

Sept. 29, 2006

Module: wine Branch: master Commit: 5543877f8163a538199e9f6284661b337b093ce5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5543877f8163a538199e9f6… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Sep 28 20:41:10 2006 +0200 sane.ds: Add Polish translation. --- dlls/sane.ds/rsrc.rc | 1 + dlls/sane.ds/sane_Pl.rc | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/rsrc.rc b/dlls/sane.ds/rsrc.rc index 7b2b975..037d2c5 100644 --- a/dlls/sane.ds/rsrc.rc +++ b/dlls/sane.ds/rsrc.rc @@ -32,3 +32,4 @@ #include "sane_Fr.rc" #include "sane_Ko.rc" #include "sane_Nl.rc" #include "sane_No.rc" +#include "sane_Pl.rc" diff --git a/dlls/sane.ds/sane_Pl.rc b/dlls/sane.ds/sane_Pl.rc new file mode 100644 index 0000000..65a9a31 --- /dev/null +++ b/dlls/sane.ds/sane_Pl.rc @@ -0,0 +1,41 @@ +/* + * Polish resources for Twain + * + * Copyright 2006 CodeWeavers, Aric Stewart + * Copyright 2006 Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Skanowanie" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "TRWA SKANOWANIE.... Prosz� czeka�",IDC_STATIC,5,19,181,8, SS_CENTER +END + +STRINGTABLE DISCARDABLE +{ + 0 "" + 1 "px" + 2 "b" + 3 "mm" + 4 "dpi" + 5 "%" + 6 "ns" +}

1 0

Paul Vriens : crypt32: Added some CryptSIP stub implementations.
by Alexandre Julliard Sept. 29, 2006

Sept. 29, 2006

Module: wine Branch: master Commit: c5ae39a3df93e35640be5814d257e8c070672f56 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c5ae39a3df93e35640be581… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Thu Sep 28 17:16:25 2006 +0200 crypt32: Added some CryptSIP stub implementations. --- dlls/crypt32/crypt32.spec | 10 ++++---- dlls/crypt32/sip.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 8da0dad..c375762 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -154,14 +154,14 @@ @ stdcall CryptRegisterOIDFunction(long str str wstr str) @ stub CryptRegisterOIDInfo @ stdcall CryptSIPAddProvider(ptr) -@ stub CryptSIPCreateIndirectData -@ stub CryptSIPGetSignedDataMsg +@ stdcall CryptSIPCreateIndirectData(ptr ptr ptr) +@ stdcall CryptSIPGetSignedDataMsg(ptr ptr long ptr ptr) @ stdcall CryptSIPLoad(ptr long ptr) -@ stub CryptSIPPutSignedDataMsg +@ stdcall CryptSIPPutSignedDataMsg(ptr long ptr long ptr) @ stdcall CryptSIPRemoveProvider(ptr) -@ stub CryptSIPRemoveSignedDataMsg +@ stdcall CryptSIPRemoveSignedDataMsg(ptr long) @ stdcall CryptSIPRetrieveSubjectGuid(wstr long ptr) -@ stub CryptSIPVerifyIndirectData +@ stdcall CryptSIPVerifyIndirectData(ptr ptr) @ stub CryptSetAsyncParam @ stdcall CryptSetOIDFunctionValue(long str str wstr long ptr long) @ stub CryptSetProviderU diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index ac5e884..b06a020 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -378,3 +378,60 @@ BOOL WINAPI CryptSIPLoad FIXME("(%s %ld %p) stub!\n", debugstr_guid(pgSubject), dwFlags, pSipDispatch); return FALSE; } + +/*********************************************************************** + * CryptSIPCreateIndirectData (CRYPT32.@) + */ +BOOL WINAPI CryptSIPCreateIndirectData(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pcbIndirectData, + SIP_INDIRECT_DATA* pIndirectData) +{ + FIXME("(%p %p %p) stub\n", pSubjectInfo, pcbIndirectData, pIndirectData); + + return FALSE; +} + +/*********************************************************************** + * CryptSIPGetSignedDataMsg (CRYPT32.@) + */ +BOOL WINAPI CryptSIPGetSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pdwEncodingType, + DWORD dwIndex, DWORD* pcbSignedDataMsg, BYTE* pbSignedDataMsg) +{ + FIXME("(%p %p %ld %p %p) stub\n", pSubjectInfo, pdwEncodingType, dwIndex, + pcbSignedDataMsg, pbSignedDataMsg); + + return FALSE; +} + +/*********************************************************************** + * CryptSIPPutSignedDataMsg (CRYPT32.@) + */ +BOOL WINAPI CryptSIPPutSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD pdwEncodingType, + DWORD* pdwIndex, DWORD cbSignedDataMsg, BYTE* pbSignedDataMsg) +{ + FIXME("(%p %ld %p %ld %p) stub\n", pSubjectInfo, pdwEncodingType, pdwIndex, + cbSignedDataMsg, pbSignedDataMsg); + + return FALSE; +} + +/*********************************************************************** + * CryptSIPRemoveSignedDataMsg (CRYPT32.@) + */ +BOOL WINAPI CryptSIPRemoveSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, + DWORD dwIndex) +{ + FIXME("(%p %ld) stub\n", pSubjectInfo, dwIndex); + + return FALSE; +} + +/*********************************************************************** + * CryptSIPVerifyIndirectData (CRYPT32.@) + */ +BOOL WINAPI CryptSIPVerifyIndirectData(SIP_SUBJECTINFO* pSubjectInfo, + SIP_INDIRECT_DATA* pIndirectData) +{ + FIXME("(%p %p) stub\n", pSubjectInfo, pIndirectData); + + return FALSE; +}

1 0

Hans Leidekker : usp10: Add a stub implementation and a test for ScriptLayout.
by Alexandre Julliard Sept. 29, 2006

Sept. 29, 2006

Module: wine Branch: master Commit: 578260745a25ecbcbd8c40ce5a27796881ab3743 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=578260745a25ecbcbd8c40c… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Sep 28 17:00:19 2006 +0200 usp10: Add a stub implementation and a test for ScriptLayout. --- dlls/usp10/tests/usp10.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/usp10.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/usp10.spec | 2 +- 3 files changed, 95 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 45a65f2..3fef69a 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -727,6 +727,52 @@ void test_ScriptGetGlyphABCWidth(HDC hdc ok(hr == S_OK, "expected S_OK, got 0x%08lx\n", hr); } +void test_ScriptLayout(void) +{ + HRESULT hr; + static const BYTE levels[][5] = + { + { 0, 0, 0, 0, 0 }, + { 1, 1, 1, 1, 1 }, + { 2, 2, 2, 2, 2 }, + { 3, 3, 3, 3, 3 }, + }; + static const int expect[][5] = + { + { 0, 1, 2, 3, 4 }, + { 4, 3, 2, 1, 0 }, + { 0, 1, 2, 3, 4 }, + { 4, 3, 2, 1, 0 } + }; + int i, j, vistolog[sizeof(levels[0])], logtovis[sizeof(levels[0])]; + + hr = ScriptLayout(sizeof(levels[0]), NULL, vistolog, logtovis); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08lx\n", hr); + + hr = ScriptLayout(sizeof(levels[0]), levels[0], NULL, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08lx\n", hr); + + for (i = 0; i < sizeof(levels)/sizeof(levels[0]); i++) + { + hr = ScriptLayout(sizeof(levels[0]), levels[i], vistolog, logtovis); + ok(hr == S_OK, "expected S_OK, got 0x%08lx\n", hr); + + for (j = 0; j < sizeof(levels[i]); j++) + { + ok(expect[i][j] == vistolog[j], + "failure: levels[%d][%d] = %d, vistolog[%d] = %d\n", + i, j, levels[i][j], j, vistolog[j] ); + } + + for (j = 0; j < sizeof(levels[i]); j++) + { + ok(expect[i][j] == logtovis[j], + "failure: levels[%d][%d] = %d, logtovis[%d] = %d\n", + i, j, levels[i][j], j, logtovis[j] ); + } + } +} + static const struct { LGRPID group; @@ -1010,6 +1056,7 @@ START_TEST(usp10) test_ScriptTextOut(); test_ScriptXtoX(); test_ScriptString(); + test_ScriptLayout(); test_digit_substitution(); } diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index e258345..7fca547 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1124,3 +1124,50 @@ HRESULT WINAPI ScriptGetGlyphABCWidth(HD return S_OK; } + +/*********************************************************************** + * ScriptLayout (USP10.@) + * + * Map embedding levels to visual and/or logical order. + * + * PARAMS + * runs [I] Size of level array. + * level [I] Array of embedding levels. + * vistolog [O] Map of embedding levels from visual to logical order. + * logtovis [O] Map of embedding levels from logical to visual order. + * + * RETURNS + * Success: S_OK + * Failure: Non-zero HRESULT value. + * + * BUGS + * This stub works correctly for any sequence of a single + * embedding level but not for sequences of different + * embedding levels, i.e. mixtures of RTL and LTR scripts. + */ +HRESULT WINAPI ScriptLayout(int runs, const BYTE *level, int *vistolog, int *logtovis) +{ + int i, j = runs - 1, k = 0; + + FIXME("(%d, %p, %p, %p): stub\n", runs, level, vistolog, logtovis); + + if (!level || (!vistolog && !logtovis)) + return E_INVALIDARG; + + for (i = 0; i < runs; i++) + { + if (level[i] % 2) + { + if (vistolog) *vistolog++ = j; + if (logtovis) *logtovis++ = j; + j--; + } + else + { + if (vistolog) *vistolog++ = k; + if (logtovis) *logtovis++ = k; + k++; + } + } + return S_OK; +} diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index 0c9ab51..95a6c77 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -13,7 +13,7 @@ @ stdcall ScriptIsComplex(wstr long long) @ stdcall ScriptItemize(wstr long long ptr ptr ptr ptr) @ stub ScriptJustify -@ stub ScriptLayout +@ stdcall ScriptLayout(long ptr ptr ptr) @ stdcall ScriptPlace(ptr ptr ptr long ptr ptr ptr ptr ptr) @ stdcall ScriptRecordDigitSubstitution(ptr ptr) @ stdcall ScriptShape(ptr ptr ptr long long ptr ptr ptr ptr ptr)

1 0

lostwages/include winehq.conf
by Alexandre Julliard Sept. 28, 2006

Sept. 28, 2006

ChangeSet ID: 28365 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2006/09/28 13:37:43 Modified files: include : winehq.conf Log message: Release 0.9.22 Patch: http://cvs.winehq.org/patch.py?id=28365 Old revision New revision Changes Path 1.44 1.45 +1 -1 lostwages/include/winehq.conf Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.44 lostwages/include/winehq.conf:1.45 --- lostwages/include/winehq.conf:1.44 28 Sep 2006 18:37:43 -0000 +++ lostwages/include/winehq.conf 28 Sep 2006 18:37:43 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.21 +snapshot_date: 0.9.22 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2

1 0

Tag wine-0.9.22 : Alexandre Julliard : Release 0.9.22
by Alexandre Julliard Sept. 28, 2006

Sept. 28, 2006

Module: wine Branch: refs/tags/wine-0.9.22 Tag: d65e1af5e820b298a4f950a51f6d5b9718abb0ca URL: http://source.winehq.org/git/?p=wine.git;a=tag;h=d65e1af5e820b298a4f950a51f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 28 19:35:08 2006 +0200 Release 0.9.22

1 0

Alexandre Julliard : Release 0.9.22.
by Alexandre Julliard Sept. 28, 2006

Sept. 28, 2006

Module: wine Branch: master Commit: 6fa9343b04ef0eaf9960812311c2e63c4c2ead73 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6fa9343b04ef0eaf9960812… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 28 19:35:07 2006 +0200 Release 0.9.22. --- ANNOUNCE | 15 - ChangeLog | 1435 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 configure | 18 - 4 files changed, 1452 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=6fa9343b04ef0eaf996…

1 0

Andrey Turkin : ole32: StgOpenStorage on non-existent file should create it (with test).
by Alexandre Julliard Sept. 28, 2006

Sept. 28, 2006

Module: wine Branch: master Commit: 63f88b3d57a2d3453dd77852ce4ae31a73d084ad URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=63f88b3d57a2d3453dd7785… Author: Andrey Turkin <pancha(a)mail.nnov.ru> Date: Fri Sep 22 06:40:49 2006 +0400 ole32: StgOpenStorage on non-existent file should create it (with test). --- dlls/ole32/storage32.c | 48 +++++++++++++++++++++++++----------------- dlls/ole32/tests/storage32.c | 20 ++++++++++++++++++ 2 files changed, 49 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 187ba0b..0293073 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5935,18 +5935,18 @@ HRESULT WINAPI StgOpenStorageEx(const WC HRESULT WINAPI StgOpenStorage( const OLECHAR *pwcsName, IStorage *pstgPriority, - DWORD grfMode, - SNB snbExclude, - DWORD reserved, - IStorage **ppstgOpen) + DWORD grfMode, + SNB snbExclude, + DWORD reserved, + IStorage **ppstgOpen) { - StorageImpl* newStorage = 0; + StorageImpl* newStorage = 0; HRESULT hr = S_OK; - HANDLE hFile = 0; + HANDLE hFile = 0; DWORD shareMode; DWORD accessMode; WCHAR fullname[MAX_PATH]; - DWORD length; + BOOL newFile; TRACE("(%s, %p, %lx, %p, %ld, %p)\n", debugstr_w(pwcsName), pstgPriority, grfMode, @@ -6036,13 +6036,24 @@ HRESULT WINAPI StgOpenStorage( */ *ppstgOpen = 0; - hFile = CreateFileW( pwcsName, - accessMode, - shareMode, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS, - 0); + if ((accessMode & GENERIC_WRITE) && /* try to create a file if no yet exists */ + ((hFile = CreateFileW( pwcsName, accessMode, shareMode, NULL, CREATE_NEW, + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS, 0)) + != INVALID_HANDLE_VALUE)) + { + newFile = TRUE; + } + else + { + newFile = FALSE; + hFile = CreateFileW( pwcsName, + accessMode, + shareMode, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS, + 0); + } if (hFile==INVALID_HANDLE_VALUE) { @@ -6080,8 +6091,7 @@ HRESULT WINAPI StgOpenStorage( * Refuse to open the file if it's too small to be a structured storage file * FIXME: verify the file when reading instead of here */ - length = GetFileSize(hFile, NULL); - if (length < 0x100) + if (!newFile && GetFileSize(hFile, NULL) < 0x100) { CloseHandle(hFile); hr = STG_E_FILEALREADYEXISTS; @@ -6099,15 +6109,15 @@ HRESULT WINAPI StgOpenStorage( goto end; } - /* if the file's length was zero, initialize the storage */ + /* if we created new file, initialize the storage */ hr = StorageImpl_Construct( newStorage, hFile, - pwcsName, + pwcsName, NULL, grfMode, TRUE, - FALSE ); + newFile ); if (FAILED(hr)) { diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 437387f..469e53a 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -349,6 +349,18 @@ static BOOL is_zero_length(LPCWSTR filen return len == 0; } +static BOOL is_existing_file(LPCWSTR filename) +{ + HANDLE file; + + file = CreateFileW(filename, GENERIC_READ, 0, NULL, + OPEN_EXISTING, 0, NULL); + if (file==INVALID_HANDLE_VALUE) + return FALSE; + CloseHandle(file); + return TRUE; +} + static void test_open_storage(void) { static const WCHAR szPrefix[] = { 's','t','g',0 }; @@ -376,6 +388,14 @@ static void test_open_storage(void) DeleteFileW(filename); + /* try opening a non-existant file - it should create it */ + stgm = STGM_DIRECT | STGM_SHARE_EXCLUSIVE | STGM_READWRITE; + r = StgOpenStorage( filename, NULL, stgm, NULL, 0, &stg); + ok(r==S_OK, "StgOpenStorage failed: 0x%08lx\n", r); + if (r==S_OK) IStorage_Release(stg); + ok(is_existing_file(filename), "StgOpenStorage didn't create a file\n"); + DeleteFileW(filename); + /* create the file */ r = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE |STGM_TRANSACTED, 0, &stg); ok(r==S_OK, "StgCreateDocfile failed\n");

1 0

Andrew Talbot : shlwapi: Add size parameters to function that takes array arguments.
by Alexandre Julliard Sept. 28, 2006

Sept. 28, 2006

Module: wine Branch: master Commit: b19c98481a6342c744926e60f5bc36f4ea8b0442 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b19c98481a6342c744926e6… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Sep 27 19:27:37 2006 +0100 shlwapi: Add size parameters to function that takes array arguments. --- dlls/shlwapi/string.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index ac5970f..f839546 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -66,7 +66,8 @@ static HRESULT WINAPI _SHStrDupAA(LPCSTR static HRESULT WINAPI _SHStrDupAW(LPCWSTR,LPSTR*); -static void FillNumberFmt(NUMBERFMTW *fmt, WCHAR decimal_buffer[8], WCHAR thousand_buffer[8]) +static void FillNumberFmt(NUMBERFMTW *fmt, LPWSTR decimal_buffer, int decimal_bufwlen, + LPWSTR thousand_buffer, int thousand_bufwlen) { WCHAR grouping[64]; WCHAR *c; @@ -74,11 +75,11 @@ static void FillNumberFmt(NUMBERFMTW *fm GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_ILZERO|LOCALE_RETURN_NUMBER, (LPWSTR)&fmt->LeadingZero, sizeof(fmt->LeadingZero)/sizeof(WCHAR)); GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_INEGNUMBER|LOCALE_RETURN_NUMBER, (LPWSTR)&fmt->LeadingZero, sizeof(fmt->NegativeOrder)/sizeof(WCHAR)); fmt->NumDigits = 0; - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, decimal_buffer, sizeof(decimal_buffer)/sizeof(WCHAR)); - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, thousand_buffer, sizeof(thousand_buffer)/sizeof(WCHAR)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, decimal_buffer, decimal_bufwlen); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, thousand_buffer, thousand_bufwlen); fmt->lpThousandSep = thousand_buffer; fmt->lpDecimalSep = decimal_buffer; - + /* * Converting grouping string to number as described on * http://blogs.msdn.com/oldnewthing/archive/2006/04/18/578251.aspx @@ -114,8 +115,9 @@ static int FormatInt(LONGLONG qdwValue, WCHAR *c; BOOL neg = (qdwValue < 0); - FillNumberFmt(&fmt, decimal, thousand); - + FillNumberFmt(&fmt, decimal, sizeof decimal / sizeof (WCHAR), + thousand, sizeof thousand / sizeof (WCHAR)); + c = &buf[24]; *(--c) = 0; do @@ -147,7 +149,8 @@ static int FormatDouble(double value, in snprintfW(buf, 64, flfmt, value); - FillNumberFmt(&fmt, decimal, thousand); + FillNumberFmt(&fmt, decimal, sizeof decimal / sizeof (WCHAR), + thousand, sizeof thousand / sizeof (WCHAR)); fmt.NumDigits = decimals; return GetNumberFormatW(LOCALE_USER_DEFAULT, 0, buf, &fmt, pszBuf, cchBuf); }

1 0