June 2006 - Wine-Commits - list.winehq.org

Tag wine-0.9.15 : Alexandre Julliard : Release 0.9.15
by Alexandre Julliard June 8, 2006

June 8, 2006

Module: wine Branch: refs/tags/wine-0.9.15 Tag: 9caf63d5c5f8aa943ff5f5727d662d16fd43f9c9 URL: http://source.winehq.org/git/?p=wine.git;a=tag;h=9caf63d5c5f8aa943ff5f5727d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 8 17:06:22 2006 +0200 Release 0.9.15

1 0

Jeff Latimer : usp10: Update ScriptGetCMap to conform to Windows.
by Alexandre Julliard June 8, 2006

June 8, 2006

Module: wine Branch: refs/heads/master Commit: 422ca43d14a8617f1d9fe06f1ddb565a5fd09d1e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=422ca43d14a8617f1d9fe06… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Jun 6 20:14:01 2006 +1000 usp10: Update ScriptGetCMap to conform to Windows. --- dlls/usp10/tests/usp10.c | 13 ++++++++++--- dlls/usp10/usp10.c | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index a46f643..221f3a4 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -220,7 +220,7 @@ void test_ScriptGetCMap(unsigned short p int cInChars; int cChars; unsigned short pwOutGlyphs3[256]; - WCHAR TestItem1[6] = {'T', 'e', 's', 't', 0x0166, 0}; + WCHAR TestItem1[6] = {'T', 'e', 's', 't', 'a', 0}; DWORD dwFlags; int cnt; @@ -249,10 +249,17 @@ void test_ScriptGetCMap(unsigned short p /* Set psc to NULL, to be able to check if a pointer is returned in psc */ psc = NULL; hr = ScriptGetCMap(NULL, &psc, NULL, 0, 0, NULL); - ok( hr == E_INVALIDARG, "(NULL,&psc,NULL,0,0NULL), expected E_INVALIDARG, " - "got %08x\n", (unsigned int)hr); + ok( hr == E_PENDING, "(NULL,&psc,NULL,0,0NULL), expected E_PENDING, " + "got %08x\n", (unsigned int)hr); ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + /* Set psc to NULL but add hdc, to be able to check if a pointer is returned in psc */ + psc = NULL; + hr = ScriptGetCMap(hdc, &psc, NULL, 0, 0, NULL); + ok( hr == S_OK, "ScriptGetCMap(NULL,&psc,NULL,0,0,NULL), expected S_OK, " + "got %08x\n", (unsigned int)hr); + ok( psc != NULL, "ScritpGetCMap expected psc to be not NULL\n"); + /* Set psc to NULL, to be able to check if a pointer is returned in psc */ psc = NULL; hr = ScriptGetCMap(NULL, &psc, TestItem1, cInChars, dwFlags, pwOutGlyphs3); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index abd4952..68e700e 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -555,7 +555,7 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SC FIXME("(%p,%p,%s,%d,0x%lx,%p): semi-stub\n", hdc, psc, debugstr_wn(pwcInChars,cChars), cChars, dwFlags, pwOutGlyphs); - if (!psc || !pwcInChars || !pwOutGlyphs) + if (!psc) return E_INVALIDARG; if (!hdc && !*psc) {

1 0

Jeff Latimer : usp10: Update ScriptStringAnalyse and tests for ScriptString functions.
by Alexandre Julliard June 8, 2006

June 8, 2006

Module: wine Branch: refs/heads/master Commit: 51ac1039dbf059fa50150c45a7880e0fa852ff68 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=51ac1039dbf059fa50150c4… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Jun 6 20:21:07 2006 +1000 usp10: Update ScriptStringAnalyse and tests for ScriptString functions. --- dlls/usp10/tests/usp10.c | 69 ++++++++++++++++++++++++++++++++++++---------- dlls/usp10/usp10.c | 2 + 2 files changed, 55 insertions(+), 16 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 221f3a4..f65a1fa 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -488,8 +488,9 @@ void test_ScriptTextOut(void) static void test_ScriptString(void) { HRESULT hr; + HWND hwnd; HDC hdc = 0; - WCHAR teststr[6] = {'T', 'e', 's', 't', '1', '\0'}; + WCHAR teststr[6] = {'T', 'e', 's', 't', 'a', '\0'}; void *pString = (WCHAR *) &teststr; int cString = 5; int cGlyphs = cString * 2 + 16; @@ -501,23 +502,61 @@ static void test_ScriptString(void) const int piDx[5] = {10, 10, 10, 10, 10}; SCRIPT_TABDEF pTabdef; const BYTE pbInClass = 0; - SCRIPT_STRING_ANALYSIS pssa; - - int iX = 10; - int iY = 100; - UINT uOptions = 0; - const RECT prc = {0, 50, 100, 100}; - int iMinSel = 0; - int iMaxSel = 0; - BOOL fDisabled = FALSE; + SCRIPT_STRING_ANALYSIS pssa = NULL; + + int iX = 10; + int iY = 100; + UINT uOptions = 0; + const RECT prc = {0, 50, 100, 100}; + int iMinSel = 0; + int iMaxSel = 0; + BOOL fDisabled = FALSE; + + LOGFONTW lf; + HFONT zfont; + + /* We need a valid HDC to drive a lot of Script functions which requires the following * + * to set up for the tests. */ + hwnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100, + 0, 0, 0, NULL); + assert(hwnd != 0); + + hdc = GetDC(hwnd); /* We now have a hdc */ + ok( hdc != NULL, "HDC failed to be created %p\n", hdc); + + lstrcpyW(lf.lfFaceName, (WCHAR *) "Courier"); + lf.lfHeight = 10; + lf.lfItalic = 0; + lf.lfEscapement = 0; + lf.lfOrientation = 0; + lf.lfUnderline = 0; + lf.lfStrikeOut = 0; + lf.lfWeight = 3; + lf.lfWidth = 10; + + zfont = (HFONT) SelectObject(hdc, CreateFontIndirectW(&lf)); + + /* Test without hdc to get E_INVALIDARG */ + hr = ScriptStringAnalyse( NULL, pString, cString, cGlyphs, iCharset, dwFlags, + iReqWidth, &psControl, &psState, piDx, &pTabdef, + &pbInClass, &pssa); + ok(hr == E_PENDING, "ScriptStringAnalyse Stub should return E_PENDING not %08x\n", (unsigned int) hr); + + /* test with hdc, this should be a valid test */ hr = ScriptStringAnalyse( hdc, pString, cString, cGlyphs, iCharset, dwFlags, iReqWidth, &psControl, &psState, piDx, &pTabdef, &pbInClass, &pssa); - ok(hr == E_INVALIDARG, "ScriptStringAnalyse Stub should return E_INVALIDARG not %08x\n", (unsigned int) hr); - hr = ScriptStringOut(pssa, iX, iY, uOptions, &prc, iMinSel, iMaxSel,fDisabled); - ok(hr == E_NOTIMPL, "ScriptStringOut Stub should return E_NOTIMPL not %08x\n", (unsigned int) hr); - hr = ScriptStringFree(&pssa); - ok(hr == S_OK, "ScriptStringFree Stub should return S_OK not %08x\n", (unsigned int) hr); + ok(hr == E_NOTIMPL, "ScriptStringAnalyse Stub should return E_NOTIMPL not %08x\n", (unsigned int) hr); +/* Commented code it pending new code in ScriptStringAnalysis */ +/* ok(hr == S_OK, "ScriptStringAnalyse Stub should return S_OK not %08x\n", (unsigned int) hr);*/ +/* ok(pssa != NULL, "ScriptStringAnalyse pssa should not be NULL\n");*/ + if (hr == 0) + { + hr = ScriptStringOut(pssa, iX, iY, uOptions, &prc, iMinSel, iMaxSel,fDisabled); + ok(hr == E_NOTIMPL, "ScriptStringOut Stub should return E_NOTIMPL not %08x\n", (unsigned int) hr); + hr = ScriptStringFree(&pssa); + ok(hr == S_OK, "ScriptStringFree Stub should return S_OK not %08x\n", (unsigned int) hr); + } } START_TEST(usp10) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 68e700e..9919658 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -288,7 +288,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC h return E_INVALIDARG; } if ((dwFlags & SSA_GLYPHS) && NULL == hdc) { - return E_INVALIDARG; + return E_PENDING; } return E_NOTIMPL;

1 0

Jeff Latimer : usp10: Update tests in test_ScriptItemIzeShapePlace to match Windows results.
by Alexandre Julliard June 8, 2006

June 8, 2006

Module: wine Branch: refs/heads/master Commit: beb097fc934d0d90206ac0729615a2d1559295ec URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=beb097fc934d0d90206ac07… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Jun 6 20:09:37 2006 +1000 usp10: Update tests in test_ScriptItemIzeShapePlace to match Windows results. --- dlls/usp10/tests/usp10.c | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 95203ed..a46f643 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -44,8 +44,8 @@ static void test_ScriptItemIzeShapePlace int cMaxItems; SCRIPT_ITEM pItem[255]; int pcItems; - WCHAR TestItem1[6] = {'T', 'e', 's', 't', 0x0166, 0}; - WCHAR TestItem2[6] = {'T', 'e', 's', 't', 0x0166, 0}; + WCHAR TestItem1[6] = {'T', 'e', 's', 't', 'a', 0}; + WCHAR TestItem2[6] = {'T', 'e', 's', 't', 'b', 0}; SCRIPT_CACHE psc; int cChars; @@ -58,6 +58,8 @@ static void test_ScriptItemIzeShapePlace int piAdvance[256]; GOFFSET pGoffset[256]; ABC pABC[256]; + LOGFONTW lf; + HFONT zfont; int cnt; /* We need a valid HDC to drive a lot of Script functions which requires the following * @@ -71,6 +73,18 @@ static void test_ScriptItemIzeShapePlace hdc = GetDC(hwnd); /* We now have a hdc */ ok( hdc != NULL, "HDC failed to be created %p\n", hdc); + lstrcpyW(lf.lfFaceName, (WCHAR *) "Courier"); + lf.lfHeight = 10; + lf.lfItalic = 0; + lf.lfEscapement = 0; + lf.lfOrientation = 0; + lf.lfUnderline = 0; + lf.lfStrikeOut = 0; + lf.lfWeight = 3; + lf.lfWidth = 10; + + zfont = (HFONT) SelectObject(hdc, CreateFontIndirectW(&lf)); + /* Start testing usp10 functions */ /* This test determines that the pointer returned by ScriptGetProperties is valid * by checking a known value in the table */ @@ -128,7 +142,7 @@ static void test_ScriptItemIzeShapePlace cMaxGlyphs, &pItem[0].a, pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); ok (hr == E_PENDING, "If psc is NULL (%08x) the E_PENDING should be returned\n", - (unsigned int) hr); + (unsigned int) hr); cMaxGlyphs = 4; hr = ScriptShape(hdc, &psc, TestItem1, cChars, cMaxGlyphs, &pItem[0].a, @@ -144,9 +158,12 @@ static void test_ScriptItemIzeShapePlace ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); ok (pcGlyphs == cChars, "Chars in (%d) should equal Glyphs out (%d)\n", cChars, pcGlyphs); if (hr ==0) { + hr = ScriptPlace(hdc, &psc, pwOutGlyphs1, pcGlyphs, psva, &pItem[0].a, piAdvance, + pGoffset, pABC); + ok (hr == 0, "ScriptPlace should return 0 not (%08x)\n", (unsigned int) hr); hr = ScriptPlace(NULL, &psc, pwOutGlyphs1, pcGlyphs, psva, &pItem[0].a, piAdvance, pGoffset, pABC); - ok (hr == 0, "Should return 0 not (%08x)\n", (unsigned int) hr); + ok (hr == 0, "ScriptPlace should return 0 not (%08x)\n", (unsigned int) hr); for (cnt=0; cnt < pcGlyphs; cnt++) pwOutGlyphs[cnt] = pwOutGlyphs1[cnt]; /* Send to next function */ } @@ -180,7 +197,7 @@ static void test_ScriptItemIzeShapePlace ok (cnt == cChars, "Translation to place when told not to. WCHAR %d - %04x != %04x\n", cnt, TestItem2[cnt], pwOutGlyphs2[cnt]); if (hr ==0) { - hr = ScriptPlace(NULL, &psc, pwOutGlyphs2, pcGlyphs, psva, &pItem[0].a, piAdvance, + hr = ScriptPlace(hdc, &psc, pwOutGlyphs2, pcGlyphs, psva, &pItem[0].a, piAdvance, pGoffset, pABC); ok (hr == 0, "ScriptPlace should return 0 not (%08x)\n", (unsigned int) hr); }

1 0

Jeff Latimer : usp10: Add stubs for ScriptCPtoX, ScriptXtoCP and ScriptBreak and some basic tests.
by Alexandre Julliard June 8, 2006

June 8, 2006

Module: wine Branch: refs/heads/master Commit: 5f529fe0d87f35f75e32785e9b0d8c490117c830 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5f529fe0d87f35f75e32785… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Wed Jun 7 23:05:14 2006 +1000 usp10: Add stubs for ScriptCPtoX, ScriptXtoCP and ScriptBreak and some basic tests. --- dlls/usp10/tests/usp10.c | 14 ++++++++++ dlls/usp10/usp10.c | 62 +++++++++++++++++++++++++++++++++++++++++++++- dlls/usp10/usp10.spec | 6 ++-- 3 files changed, 77 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 15d4c40..95203ed 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -352,6 +352,11 @@ void test_ScriptTextOut(void) GOFFSET pGoffset[256]; ABC pABC[256]; RECT rect; + int piX; + int iCP = 1; + BOOL fTrailing = FALSE; + SCRIPT_LOGATTR *psla; + SCRIPT_LOGATTR sla[256]; /* We need a valid HDC to drive a lot of Script functions which requires the following * * to set up for the tests. */ @@ -438,6 +443,15 @@ void test_ScriptTextOut(void) ok (hr == 0, "ScriptTextOut should return 0 not (%08x)\n", (unsigned int) hr); ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); + iCP = 1; + hr = ScriptCPtoX(iCP, fTrailing, cChars, pcGlyphs, (const WORD *) &pwLogClust, + (const SCRIPT_VISATTR *) &psva, (const int *)&piAdvance, &pItem[0].a, &piX); + ok(hr == S_OK, "ScriptCPtoX Stub should return S_OK not %08x\n", (unsigned int) hr); + + psla = (SCRIPT_LOGATTR *)&sla; + hr = ScriptBreak(TestItem1, cChars, &pItem[0].a, psla); + ok(hr == S_OK, "ScriptBreak Stub should return S_OK not %08x\n", (unsigned int) hr); + /* Clean up and go */ ScriptFreeCache(&psc); ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index f24a7f0..abd4952 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -321,8 +321,66 @@ HRESULT WINAPI ScriptStringOut(SCRIPT_ST * */ HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa) { - FIXME("(%p): stub\n",pssa); - return S_OK; + FIXME("(%p): stub\n",pssa); + return S_OK; +} + +/*********************************************************************** + * ScriptCPtoX (USP10.@) + * + */ +HRESULT WINAPI ScriptCPtoX(int iCP, + BOOL fTrailing, + int cChars, + int cGlyphs, + const WORD *pwLogClust, + const SCRIPT_VISATTR *psva, + const int *piAdvance, + const SCRIPT_ANALYSIS *psa, + int *piX) +{ + FIXME("(%d,%d,%d,%d,%p,%p,%p,%p,%p): stub\n", + iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, + psa, piX); + + *piX = 1; /* Return something in range */ + return S_OK; +} + +/*********************************************************************** + * ScriptXtoCP (USP10.@) + * + */ +HRESULT WINAPI ScriptXtoCP(int iX, + int cChars, + int cGlyphs, + const WORD *pwLogClust, + const SCRIPT_VISATTR *psva, + const int *piAdvance, + const SCRIPT_ANALYSIS *psa, + int *piCP, + int *piTrailing) +{ + FIXME("(%d,%d,%d,%p,%p,%p,%p,%p,%p): stub\n", + iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, + psa, piCP, piTrailing); + + *piCP = 1; /* Return something in range */ + *piTrailing = 0; + return S_OK; +} + +/*********************************************************************** + * ScriptBreak (USP10.@) + * + */ +HRESULT WINAPI ScriptBreak(const WCHAR *pwcChars, int cChars, const SCRIPT_ANALYSIS *psa, + SCRIPT_LOGATTR *psla) +{ + FIXME("(%p,%d,%p,%p): stub\n", + pwcChars, cChars, psa, psla); + + return S_OK; } /*********************************************************************** diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index 518a04e..22ee688 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -1,8 +1,8 @@ @ stub LpkPresent @ stdcall ScriptApplyDigitSubstitution(ptr ptr ptr) @ stub ScriptApplyLogicalWidth -@ stub ScriptBreak -@ stub ScriptCPtoX +@ stdcall ScriptBreak(ptr long ptr ptr) +@ stdcall ScriptCPtoX(long long long long ptr ptr ptr ptr ptr) @ stub ScriptCacheGetHeight @ stdcall ScriptFreeCache(ptr) @ stdcall ScriptGetCMap(ptr ptr ptr long long ptr) @@ -29,7 +29,7 @@ @ stub ScriptString_pSize @ stub ScriptString_pcOutChars @ stdcall ScriptTextOut(ptr ptr long long long ptr ptr ptr long ptr long ptr ptr ptr) -@ stub ScriptXtoCP +@ stdcall ScriptXtoCP(long long long ptr ptr ptr ptr ptr ptr) @ stub UspAllocCache @ stub UspAllocTemp @ stub UspFreeMem

1 0

Alexandre Julliard : rpcrt4: Avoid potential redefinition of uuid_t.
by Alexandre Julliard June 8, 2006

June 8, 2006

Module: wine Branch: refs/heads/master Commit: c0fcba798b8c722e52c53aac402191ac1e948e9a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c0fcba798b8c722e52c53aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 8 11:29:26 2006 +0200 rpcrt4: Avoid potential redefinition of uuid_t. --- dlls/rpcrt4/epm_towers.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/epm_towers.h b/dlls/rpcrt4/epm_towers.h index d50d698..7570cc2 100644 --- a/dlls/rpcrt4/epm_towers.h +++ b/dlls/rpcrt4/epm_towers.h @@ -51,13 +51,12 @@ #include <pshpack1.h> typedef unsigned char u_int8; typedef unsigned short u_int16; typedef unsigned int u_int32; -typedef GUID uuid_t; typedef struct { u_int16 count_lhs; u_int8 protid; - uuid_t uuid; + GUID uuid; u_int16 major_version; u_int16 count_rhs; u_int16 minor_version;

1 0

Alexandre Julliard : configure: Make the font warning more explicit about what package is missing.
by Alexandre Julliard June 8, 2006

June 8, 2006

Module: wine Branch: refs/heads/master Commit: baf3f5d6f9fe0440c999ed4b2a9fbaeb2505c260 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=baf3f5d6f9fe0440c999ed4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 8 11:26:44 2006 +0200 configure: Make the font warning more explicit about what package is missing. --- configure | 12 +++++++----- configure.ac | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/configure b/configure index fe99f62..b2cd31e 100755 --- a/configure +++ b/configure @@ -12237,9 +12237,6 @@ if test "$FONTFORGE" != "false" -a -n "$ then FONTSSUBDIRS="fonts" - wine_cv_msg_fonts=no -else - wine_cv_msg_fonts=yes fi { echo "$as_me:$LINENO: checking for parport header/ppdev.h" >&5 @@ -22836,10 +22833,15 @@ then exitcode=1 fi -if test "$wine_cv_msg_fonts" = "yes" +if test -z "$FONTSSUBDIRS" then echo - echo "*** Warning: FreeType or FontForge is missing." + if test "$FONTFORGE" = "false" + then + echo "*** Warning: FontForge is missing." + else + echo "*** Warning: FreeType is missing." + fi echo "*** Fonts will not be built. Dialog text may be invisible or unaligned." exitcode=1 fi diff --git a/configure.ac b/configure.ac index ba6b1b3..81c79b2 100644 --- a/configure.ac +++ b/configure.ac @@ -719,9 +719,6 @@ dnl Only build the fonts dir if we have if test "$FONTFORGE" != "false" -a -n "$FREETYPELIBS" then AC_SUBST(FONTSSUBDIRS,"fonts") - wine_cv_msg_fonts=no -else - wine_cv_msg_fonts=yes fi dnl **** Check for parport (currently Linux only) **** @@ -1854,10 +1851,15 @@ then exitcode=1 fi -if test "$wine_cv_msg_fonts" = "yes" +if test -z "$FONTSSUBDIRS" then echo - echo "*** Warning: FreeType or FontForge is missing." + if test "$FONTFORGE" = "false" + then + echo "*** Warning: FontForge is missing." + else + echo "*** Warning: FreeType is missing." + fi echo "*** Fonts will not be built. Dialog text may be invisible or unaligned." exitcode=1 fi

1 0

Robert Reif : include: Add lmmsg.h.
by Alexandre Julliard June 8, 2006

June 8, 2006

Module: wine Branch: refs/heads/master Commit: 8e01c1b2a3dc7aa4a79f9444b5dff53dd4f6408e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8e01c1b2a3dc7aa4a79f944… Author: Robert Reif <reif(a)earthlink.net> Date: Thu Jun 8 00:14:28 2006 -0400 include: Add lmmsg.h. --- include/Makefile.in | 1 + include/lm.h | 1 + include/lmmsg.h | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 0 deletions(-) create mode 100644 include/lmmsg.h diff --git a/include/Makefile.in b/include/Makefile.in index d9825c4..a7a4a74 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -162,6 +162,7 @@ WINDOWS_INCLUDES = \ lmcons.h \ lmerr.h \ lmjoin.h \ + lmmsg.h \ lmserver.h \ lmshare.h \ lmstats.h \ diff --git a/include/lm.h b/include/lm.h index 681440d..6151fd5 100644 --- a/include/lm.h +++ b/include/lm.h @@ -31,5 +31,6 @@ #include <lmwksta.h> #include <lmapibuf.h> #include <lmstats.h> #include <lmjoin.h> +#include <lmmsg.h> #endif diff --git a/include/lmmsg.h b/include/lmmsg.h new file mode 100644 index 0000000..a6b395b --- /dev/null +++ b/include/lmmsg.h @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2006 Robert Reif + * + * 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 + */ +#ifndef _LMMSG_ +#define _LMMSG_ + +#ifdef __cplusplus +extern "C" { +#endif + +#define MSGNAME_NOT_FORWARDED 0x00 +#define MSGNAME_FORWARDED_TO 0x04 +#define MSGNAME_FORWARDED_FROM 0x10 + +typedef struct _MSG_INFO_0 +{ + LPWSTR msgi0_name; +} MSG_INFO_0, *PMSG_INFO_0, *LPMSG_INFO_0; + +typedef struct _MSG_INFO_1 +{ + LPWSTR msgi1_name; + DWORD msgi1_forward_flag; + LPWSTR msgi1_forward; +} MSG_INFO_1, *PMSG_INFO_1, *LPMSG_INFO_1; + +NET_API_STATUS NET_API_FUNCTION NetMessageBufferSend(LPCWSTR,LPCWSTR,LPCWSTR,LPBYTE,DWORD); +NET_API_STATUS NET_API_FUNCTION NetMessageNameAdd(LPCWSTR,LPCWSTR); +NET_API_STATUS NET_API_FUNCTION NetMessageNameDel(LPCWSTR,LPCWSTR); +NET_API_STATUS NET_API_FUNCTION NetMessageNameEnum(LPCWSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD); +NET_API_STATUS NET_API_FUNCTION NetMessageNameGetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE*); + +#ifdef __cplusplus +} +#endif + +#endif

1 0

Phil Lodwick : shell32/tests: Test to make sure we can create a non-nested directory.
by Alexandre Julliard June 8, 2006

June 8, 2006

Module: wine Branch: refs/heads/master Commit: 6fc50ff37878e24e16c1704d96f11688ecef2570 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6fc50ff37878e24e16c1704… Author: Phil Lodwick <Phil.Lodwick(a)EFI.COM> Date: Wed Jun 7 14:08:27 2006 -0500 shell32/tests: Test to make sure we can create a non-nested directory. --- dlls/shell32/tests/shlfileop.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index c13cfec..a1180fc 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -103,6 +103,7 @@ static void clean_after_shfo_tests(void) RemoveDirectoryA("testdir2\\test4.txt"); RemoveDirectoryA("testdir2\\nested"); RemoveDirectoryA("testdir2"); + RemoveDirectoryA("c:\\testdir3"); DeleteFileA("nonexistent\\notreal\\test2.txt"); RemoveDirectoryA("nonexistent\\notreal"); RemoveDirectoryA("nonexistent"); @@ -839,6 +840,9 @@ static void test_sh_create_dir(void) ret = pSHCreateDirectoryExA(NULL, path, NULL); ok(ERROR_ALREADY_EXISTS == ret, "SHCreateDirectoryEx should fail to create existing directory, ret = %d\n", ret); + + ret = pSHCreateDirectoryExA(NULL, "c:\\testdir3", NULL); + ok(file_exists("c:\\testdir3"), "The directory is not created\n"); } START_TEST(shlfileop)

1 0

Phil Lodwick : shell32: SHCreateDirectoryEx can create a non-nested directory.
by Alexandre Julliard June 8, 2006

June 8, 2006

Module: wine Branch: refs/heads/master Commit: 5a13cba8b690a03e07a4f74729d9c5b8601df36d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5a13cba8b690a03e07a4f74… Author: Phil Lodwick <Phil.Lodwick(a)EFI.COM> Date: Wed Jun 7 14:08:38 2006 -0500 shell32: SHCreateDirectoryEx can create a non-nested directory. --- dlls/shell32/shlfileop.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 426c022..055b91d 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -559,7 +559,8 @@ int WINAPI SHCreateDirectoryExW(HWND hWn { ret = SHNotifyCreateDirectoryW(path, sec); /* Refuse to work on certain error codes before trying to create directories recursively */ - if (ret != ERROR_FILE_EXISTS && + if (ret != ERROR_SUCCESS && + ret != ERROR_FILE_EXISTS && ret != ERROR_ALREADY_EXISTS && ret != ERROR_FILENAME_EXCED_RANGE) {

1 0