April 2008 - Wine-Commits - list.winehq.org

Eric Pouech : winhelp: Added support for transparent bitmaps.
by Alexandre Julliard April 30, 2008

April 30, 2008

Module: wine Branch: master Commit: 2f1048862a379d6688b0141e227b125bc265daed URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f1048862a379d6688b0141e2… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Apr 30 08:32:06 2008 +0200 winhelp: Added support for transparent bitmaps. --- programs/winhelp/hlpfile.c | 93 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 91 insertions(+), 2 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 312d932..95ec432 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -709,6 +709,89 @@ static BOOL HLPFILE_RtfAddHexBytes(struct RtfData* rd, const void* _ptr, unsigne } /****************************************************************** + * HLPFILE_RtfAddTransparentBitmap + * + * We'll transform a transparent bitmap into an metafile that + * we then transform into RTF + */ +static BOOL HLPFILE_RtfAddTransparentBitmap(struct RtfData* rd, const BITMAPINFO* bi, + const void* pict, unsigned nc) +{ + HDC hdc, hdcMask, hdcMem, hdcEMF; + HBITMAP hbm, hbmMask, hbmOldMask, hbmOldMem; + HENHMETAFILE hEMF; + BOOL ret = FALSE; + void* data; + UINT sz; + + hbm = CreateDIBitmap(hdc = GetDC(0), &bi->bmiHeader, + CBM_INIT, pict, bi, DIB_RGB_COLORS); + + hdcMem = CreateCompatibleDC(hdc); + hbmOldMem = SelectObject(hdcMem, hbm); + + /* create the mask bitmap from the main bitmap */ + hdcMask = CreateCompatibleDC(hdc); + hbmMask = CreateBitmap(bi->bmiHeader.biWidth, bi->bmiHeader.biHeight, 1, 1, NULL); + hbmOldMask = SelectObject(hdcMask, hbmMask); + SetBkColor(hdcMem, + RGB(bi->bmiColors[nc - 1].rgbRed, + bi->bmiColors[nc - 1].rgbGreen, + bi->bmiColors[nc - 1].rgbBlue)); + BitBlt(hdcMask, 0, 0, bi->bmiHeader.biWidth, bi->bmiHeader.biHeight, hdcMem, 0, 0, SRCCOPY); + + /* sets to RGB(0,0,0) the transparent bits in main bitmap */ + SetBkColor(hdcMem, RGB(0,0,0)); + SetTextColor(hdcMem, RGB(255,255,255)); + BitBlt(hdcMem, 0, 0, bi->bmiHeader.biWidth, bi->bmiHeader.biHeight, hdcMask, 0, 0, SRCAND); + + SelectObject(hdcMask, hbmOldMask); + DeleteDC(hdcMask); + + SelectObject(hdcMem, hbmOldMem); + DeleteDC(hdcMem); + + /* we create the bitmap on the fly */ + hdcEMF = CreateEnhMetaFile(NULL, NULL, NULL, NULL); + hdcMem = CreateCompatibleDC(hdcEMF); + + /* sets to RGB(0,0,0) the transparent bits in final bitmap */ + hbmOldMem = SelectObject(hdcMem, hbmMask); + SetBkColor(hdcEMF, RGB(255, 255, 255)); + SetTextColor(hdcEMF, RGB(0, 0, 0)); + BitBlt(hdcEMF, 0, 0, bi->bmiHeader.biWidth, bi->bmiHeader.biHeight, hdcMem, 0, 0, SRCAND); + + /* and copy the remaining bits of main bitmap */ + SelectObject(hdcMem, hbm); + BitBlt(hdcEMF, 0, 0, bi->bmiHeader.biWidth, bi->bmiHeader.biHeight, hdcMem, 0, 0, SRCPAINT); + SelectObject(hdcMem, hbmOldMem); + DeleteDC(hdcMem); + + /* do the cleanup */ + ReleaseDC(0, hdc); + DeleteObject(hbmMask); + DeleteObject(hbm); + + hEMF = CloseEnhMetaFile(hdcEMF); + + /* generate rtf stream */ + sz = GetEnhMetaFileBits(hEMF, 0, NULL); + if (sz && (data = HeapAlloc(GetProcessHeap(), 0, sz))) + { + if (sz == GetEnhMetaFileBits(hEMF, sz, data)) + { + ret = HLPFILE_RtfAddControl(rd, "{\\pict\\emfblip") && + HLPFILE_RtfAddHexBytes(rd, data, sz) && + HLPFILE_RtfAddControl(rd, "}"); + } + HeapFree(GetProcessHeap(), 0, data); + } + DeleteEnhMetaFile(hEMF); + + return ret; +} + +/****************************************************************** * HLPFILE_RtfAddBitmap * */ @@ -719,6 +802,7 @@ static BOOL HLPFILE_RtfAddBitmap(struct RtfData* rd, BYTE* beg, BYTE type, BYTE BITMAPINFO* bi; unsigned long off, csz; unsigned nc = 0; + BOOL clrImportant = FALSE; BOOL ret = FALSE; char tmp[256]; @@ -735,7 +819,8 @@ static BOOL HLPFILE_RtfAddBitmap(struct RtfData* rd, BYTE* beg, BYTE type, BYTE bi->bmiHeader.biWidth = fetch_ulong(&ptr); bi->bmiHeader.biHeight = fetch_ulong(&ptr); bi->bmiHeader.biClrUsed = fetch_ulong(&ptr); - bi->bmiHeader.biClrImportant = fetch_ulong(&ptr); + clrImportant = fetch_ulong(&ptr); + bi->bmiHeader.biClrImportant = (clrImportant > 1) ? clrImportant : 0; bi->bmiHeader.biCompression = BI_RGB; if (bi->bmiHeader.biBitCount > 32) WINE_FIXME("Unknown bit count %u\n", bi->bmiHeader.biBitCount); if (bi->bmiHeader.biPlanes != 1) WINE_FIXME("Unsupported planes %u\n", bi->bmiHeader.biPlanes); @@ -773,7 +858,11 @@ static BOOL HLPFILE_RtfAddBitmap(struct RtfData* rd, BYTE* beg, BYTE type, BYTE } pict_beg = HLPFILE_DecompressGfx(beg + off, csz, bi->bmiHeader.biSizeImage, pack); - + if (clrImportant == 1 && nc > 0) + { + ret = HLPFILE_RtfAddTransparentBitmap(rd, bi, pict_beg, nc); + goto done; + } if (!HLPFILE_RtfAddControl(rd, "{\\pict")) goto done; if (type == 0x06) {

1 0

Eric Pouech : winhelp: Generate the proper RTF data for a table formatting.
by Alexandre Julliard April 30, 2008

April 30, 2008

Module: wine Branch: master Commit: 8f1805f9b6ca4fb55f81e68c8325f1eafc86b979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f1805f9b6ca4fb55f81e68c8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Apr 30 08:31:19 2008 +0200 winhelp: Generate the proper RTF data for a table formatting. --- programs/winhelp/hlpfile.c | 60 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 2 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index e7ae75e..312d932 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -1201,6 +1201,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, BYTE long size, blocksize, datalen; unsigned short bits; unsigned nc, ncol = 1; + short table_width; BOOL in_table = FALSE; char tmp[256]; BOOL ret = FALSE; @@ -1250,21 +1251,59 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, BYTE in_table = TRUE; ncol = *format++; - WINE_TRACE("#cols %u\n", ncol); + if (!HLPFILE_RtfAddControl(rd, "\\trowd")) goto done; type = *format++; if (type == 0 || type == 2) + { + table_width = GET_SHORT(format, 0); format += 2; + } + else + table_width = 32767; + WINE_TRACE("New table: cols=%d type=%x width=%d\n", + ncol, type, table_width); + if (ncol > 1) + { + int pos; + sprintf(tmp, "\\trgaph%d\\trleft%d", + HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 6), table_width, 32767)), + HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 0), table_width, 32767))); + if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; + pos = HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 6) / 2, table_width, 32767)); + for (nc = 0; nc < ncol; nc++) + { + WINE_TRACE("column(%d/%d) gap=%d width=%d\n", + nc, ncol, GET_SHORT(format, nc*4), + GET_SHORT(format, nc*4+2)); + pos += GET_SHORT(format, nc * 4) + GET_SHORT(format, nc * 4 + 2); + sprintf(tmp, "\\cellx%d", + HLPFILE_HalfPointsToTwips(MulDiv(pos, table_width, 32767))); + if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; + } + } + else + { + WINE_TRACE("column(0/%d) gap=%d width=%d\n", + ncol, GET_SHORT(format, 0), GET_SHORT(format, 2)); + sprintf(tmp, "\\trleft%d\\cellx%d ", + HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 0), table_width, 32767)), + HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 0) + GET_SHORT(format, 2), + table_width, 32767))); + if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; + } format += ncol * 4; } for (nc = 0; nc < ncol; /**/) { WINE_TRACE("looking for format at offset %lu in column %d\n", (SIZE_T)(format - (buf + 0x15)), nc); + if (!HLPFILE_RtfAddControl(rd, "\\pard")) goto done; if (in_table) { nc = GET_SHORT(format, 0); if (nc == -1) break; format += 5; + if (!HLPFILE_RtfAddControl(rd, "\\intbl")) goto done; } else nc++; if (buf[0x14] == 0x01) @@ -1453,7 +1492,18 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, BYTE break; case 0x82: - if (!HLPFILE_RtfAddControl(rd, "\\par\\pard")) goto done; + if (in_table) + { + if (format[1] != 0xFF) + { + if (!HLPFILE_RtfAddControl(rd, "\\par\\intbl")) goto done; + } + else + { + if (!HLPFILE_RtfAddControl(rd, "\\cell\\pard\\intbl")) goto done; + } + } + else if (!HLPFILE_RtfAddControl(rd, "\\par")) goto done; attributes.wVSpace++; attributes.wIndent = 0; format += 1; @@ -1655,8 +1705,14 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, BYTE } } } + if (in_table) + { + if (!HLPFILE_RtfAddControl(rd, "\\row\\par\\pard\\plain")) goto done; + rd->char_pos += 2; + } ret = TRUE; done: + HeapFree(GetProcessHeap(), 0, text_base); return ret; }

1 0

Alexandre Julliard : itss: Fix function prototype now that widl does the right thing with const.
by Alexandre Julliard April 30, 2008

April 30, 2008

Module: wine Branch: master Commit: 67fb5507cc45cf4038b8ab651f291621521050a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67fb5507cc45cf4038b8ab651… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 30 11:45:21 2008 +0200 itss: Fix function prototype now that widl does the right thing with const. --- dlls/itss/itss.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/itss/itss.c b/dlls/itss/itss.c index 3bab9e1..47756fa 100644 --- a/dlls/itss/itss.c +++ b/dlls/itss/itss.c @@ -296,10 +296,10 @@ static HRESULT WINAPI ITStorageImpl_StgOpenStorageOnILockBytes( static HRESULT WINAPI ITStorageImpl_StgSetTimes( IITStorage* iface, - WCHAR* lpszName, - FILETIME* pctime, - FILETIME* patime, - FILETIME* pmtime) + const WCHAR* lpszName, + const FILETIME* pctime, + const FILETIME* patime, + const FILETIME* pmtime) { ITStorageImpl *This = (ITStorageImpl *)iface; FIXME("%p\n", This);

1 0

Lei Zhang : userenv: Add initial tests for CreateEnvironmentBlock.
by Alexandre Julliard April 30, 2008

April 30, 2008

Module: wine Branch: master Commit: ffb04579826c5024387ff01e7ef36b96ad092d66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb04579826c5024387ff01e7… Author: Lei Zhang <thestig(a)google.com> Date: Tue Apr 29 18:09:24 2008 -0700 userenv: Add initial tests for CreateEnvironmentBlock. --- .gitignore | 5 +++ Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 5 +++ dlls/userenv/Makefile.in | 1 + dlls/userenv/tests/Makefile.in | 13 +++++++++ dlls/userenv/tests/userenv.c | 59 ++++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 ++ programs/winetest/winetest.rc | 1 + 10 files changed, 93 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 7aeef02..b74bd95 100644 --- a/.gitignore +++ b/.gitignore @@ -419,6 +419,10 @@ dlls/user32/libuser32.def dlls/user32/tests/*.ok dlls/user32/tests/testlist.c dlls/user32/tests/user32_crosstest.exe +dlls/userenv/libuserenv.def +dlls/userenv/tests/*.ok +dlls/userenv/tests/testlist.c +dlls/userenv/tests/userenv_crosstest.exe dlls/usp10/libusp10.def dlls/usp10/tests/*.ok dlls/usp10/tests/testlist.c @@ -681,6 +685,7 @@ programs/winetest/snmpapi_test.exe programs/winetest/spoolss_test.exe programs/winetest/urlmon_test.exe programs/winetest/user32_test.exe +programs/winetest/userenv_test.exe programs/winetest/usp10_test.exe programs/winetest/uxtheme_test.exe programs/winetest/version_test.exe diff --git a/Makefile.in b/Makefile.in index c91c86d..aac678d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -459,6 +459,7 @@ ALL_MAKEFILES = \ dlls/user32/Makefile \ dlls/user32/tests/Makefile \ dlls/userenv/Makefile \ + dlls/userenv/tests/Makefile \ dlls/usp10/Makefile \ dlls/usp10/tests/Makefile \ dlls/uuid/Makefile \ @@ -884,6 +885,7 @@ dlls/urlmon/tests/Makefile: dlls/urlmon/tests/Makefile.in dlls/Maketest.rules dlls/user32/Makefile: dlls/user32/Makefile.in dlls/Makedll.rules dlls/user32/tests/Makefile: dlls/user32/tests/Makefile.in dlls/Maketest.rules dlls/userenv/Makefile: dlls/userenv/Makefile.in dlls/Makedll.rules +dlls/userenv/tests/Makefile: dlls/userenv/tests/Makefile.in dlls/Maketest.rules dlls/usp10/Makefile: dlls/usp10/Makefile.in dlls/Makedll.rules dlls/usp10/tests/Makefile: dlls/usp10/tests/Makefile.in dlls/Maketest.rules dlls/uuid/Makefile: dlls/uuid/Makefile.in dlls/Makeimplib.rules diff --git a/configure b/configure index 45c98c6..87a5a17 100755 --- a/configure +++ b/configure @@ -22077,6 +22077,8 @@ ac_config_files="$ac_config_files dlls/user32/tests/Makefile" ac_config_files="$ac_config_files dlls/userenv/Makefile" +ac_config_files="$ac_config_files dlls/userenv/tests/Makefile" + ac_config_files="$ac_config_files dlls/usp10/Makefile" ac_config_files="$ac_config_files dlls/usp10/tests/Makefile" @@ -23170,6 +23172,7 @@ do "dlls/user32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/user32/Makefile" ;; "dlls/user32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/user32/tests/Makefile" ;; "dlls/userenv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/userenv/Makefile" ;; + "dlls/userenv/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/userenv/tests/Makefile" ;; "dlls/usp10/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/usp10/Makefile" ;; "dlls/usp10/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/usp10/tests/Makefile" ;; "dlls/uuid/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/uuid/Makefile" ;; diff --git a/configure.ac b/configure.ac index da31303..5c02fb4 100644 --- a/configure.ac +++ b/configure.ac @@ -1977,6 +1977,7 @@ AC_CONFIG_FILES([dlls/urlmon/tests/Makefile]) AC_CONFIG_FILES([dlls/user32/Makefile]) AC_CONFIG_FILES([dlls/user32/tests/Makefile]) AC_CONFIG_FILES([dlls/userenv/Makefile]) +AC_CONFIG_FILES([dlls/userenv/tests/Makefile]) AC_CONFIG_FILES([dlls/usp10/Makefile]) AC_CONFIG_FILES([dlls/usp10/tests/Makefile]) AC_CONFIG_FILES([dlls/uuid/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 9b979ac..d3bb2b7 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -355,6 +355,7 @@ TESTSUBDIRS = \ spoolss/tests \ urlmon/tests \ user32/tests \ + userenv/tests \ usp10/tests \ uxtheme/tests \ version/tests \ @@ -650,6 +651,7 @@ IMPORT_LIBS = \ url/liburl.$(IMPLIBEXT) \ urlmon/liburlmon.$(IMPLIBEXT) \ user32/libuser32.$(IMPLIBEXT) \ + userenv/libuserenv.$(IMPLIBEXT) \ usp10/libusp10.$(IMPLIBEXT) \ uxtheme/libuxtheme.$(IMPLIBEXT) \ vdmdbg/libvdmdbg.$(IMPLIBEXT) \ @@ -1013,6 +1015,9 @@ urlmon/liburlmon.$(IMPLIBEXT): urlmon/urlmon.spec $(WINEBUILD) user32/libuser32.$(IMPLIBEXT): user32/user32.spec $(WINEBUILD) @cd user32 && $(MAKE) libuser32.$(IMPLIBEXT) +userenv/libuserenv.$(IMPLIBEXT): userenv/userenv.spec $(WINEBUILD) + @cd userenv && $(MAKE) libuserenv.$(IMPLIBEXT) + usp10/libusp10.$(IMPLIBEXT): usp10/usp10.spec $(WINEBUILD) @cd usp10 && $(MAKE) libusp10.$(IMPLIBEXT) diff --git a/dlls/userenv/Makefile.in b/dlls/userenv/Makefile.in index 9db0d69..946d210 100644 --- a/dlls/userenv/Makefile.in +++ b/dlls/userenv/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = userenv.dll IMPORTS = kernel32 +IMPORTLIB = userenv C_SRCS = \ userenv_main.c diff --git a/dlls/userenv/tests/Makefile.in b/dlls/userenv/tests/Makefile.in new file mode 100644 index 0000000..9720239 --- /dev/null +++ b/dlls/userenv/tests/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = userenv.dll +IMPORTS = userenv advapi32 kernel32 + +CTESTS = \ + userenv.c + +(a)MAKE_TEST_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c new file mode 100644 index 0000000..9f9425a --- /dev/null +++ b/dlls/userenv/tests/userenv.c @@ -0,0 +1,59 @@ +/* + * Unit test suite for userenv functions + * + * Copyright 2008 Google (Lei Zhang) + * + * 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 + */ + +#include <stdlib.h> +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +#include "userenv.h" + +#include "wine/test.h" + +#define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT)) + +static void test_create_env(void) +{ + BOOL r; + HANDLE htok; + WCHAR * env; + WCHAR * env2; + + r = CreateEnvironmentBlock(NULL, NULL, FALSE); + expect(FALSE, r); + + r = CreateEnvironmentBlock((LPVOID) &env, NULL, FALSE); + todo_wine expect(TRUE, r); + + r = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &htok); + expect(TRUE, r); + + r = CreateEnvironmentBlock(NULL, htok, FALSE); + expect(FALSE, r); + + r = CreateEnvironmentBlock((LPVOID) &env2, htok, FALSE); + todo_wine expect(TRUE, r); +} + +START_TEST(userenv) +{ + test_create_env(); +} diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 917c6f7..03c5dae 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -95,6 +95,7 @@ TESTBINS = \ spoolss_test.exe \ urlmon_test.exe \ user32_test.exe \ + userenv_test.exe \ usp10_test.exe \ uxtheme_test.exe \ version_test.exe \ @@ -246,6 +247,8 @@ urlmon_test.exe: $(DLLDIR)/urlmon/tests/urlmon_test.exe$(DLLEXT) cp $(DLLDIR)/urlmon/tests/urlmon_test.exe$(DLLEXT) $@ && $(STRIP) $@ user32_test.exe: $(DLLDIR)/user32/tests/user32_test.exe$(DLLEXT) cp $(DLLDIR)/user32/tests/user32_test.exe$(DLLEXT) $@ && $(STRIP) $@ +userenv_test.exe: $(DLLDIR)/userenv/tests/userenv_test.exe$(DLLEXT) + cp $(DLLDIR)/userenv/tests/userenv_test.exe$(DLLEXT) $@ && $(STRIP) $@ usp10_test.exe: $(DLLDIR)/usp10/tests/usp10_test.exe$(DLLEXT) cp $(DLLDIR)/usp10/tests/usp10_test.exe$(DLLEXT) $@ && $(STRIP) $@ uxtheme_test.exe: $(DLLDIR)/uxtheme/tests/uxtheme_test.exe$(DLLEXT) diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index 299e0e3..05b28c3 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -156,6 +156,7 @@ snmpapi_test.exe TESTRES "snmpapi_test.exe" spoolss_test.exe TESTRES "spoolss_test.exe" urlmon_test.exe TESTRES "urlmon_test.exe" user32_test.exe TESTRES "user32_test.exe" +userenv_test.exe TESTRES "userenv_test.exe" usp10_test.exe TESTRES "usp10_test.exe" uxtheme_test.exe TESTRES "uxtheme_test.exe" version_test.exe TESTRES "version_test.exe"

1 0

Lei Zhang : userenv: Initial implementation of CreateEnvironmentBlock.
by Alexandre Julliard April 30, 2008

April 30, 2008

Module: wine Branch: master Commit: bca84d5467bc0242da027d24082871d8df3053fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=bca84d5467bc0242da027d240… Author: Lei Zhang <thestig(a)google.com> Date: Tue Apr 29 18:19:05 2008 -0700 userenv: Initial implementation of CreateEnvironmentBlock. --- dlls/userenv/Makefile.in | 2 +- dlls/userenv/tests/userenv.c | 4 ++-- dlls/userenv/userenv_main.c | 14 +++++++++++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/userenv/Makefile.in b/dlls/userenv/Makefile.in index 946d210..07bba8f 100644 --- a/dlls/userenv/Makefile.in +++ b/dlls/userenv/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = userenv.dll -IMPORTS = kernel32 +IMPORTS = kernel32 ntdll IMPORTLIB = userenv C_SRCS = \ diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index 9f9425a..c50b0a2 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -41,7 +41,7 @@ static void test_create_env(void) expect(FALSE, r); r = CreateEnvironmentBlock((LPVOID) &env, NULL, FALSE); - todo_wine expect(TRUE, r); + expect(TRUE, r); r = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &htok); expect(TRUE, r); @@ -50,7 +50,7 @@ static void test_create_env(void) expect(FALSE, r); r = CreateEnvironmentBlock((LPVOID) &env2, htok, FALSE); - todo_wine expect(TRUE, r); + expect(TRUE, r); } START_TEST(userenv) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 0efea5c..1eaaa71 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -20,9 +20,12 @@ #include <stdarg.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winreg.h" +#include "winternl.h" #include "userenv.h" #include "wine/debug.h" @@ -49,7 +52,16 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, HANDLE hToken, BOOL bInherit ) { - FIXME("%p %p %d\n", lpEnvironment, hToken, bInherit ); + NTSTATUS r; + + TRACE("%p %p %d\n", lpEnvironment, hToken, bInherit ); + + if (!lpEnvironment) + return FALSE; + + r = RtlCreateEnvironment(bInherit, (WCHAR **)lpEnvironment); + if (r == STATUS_SUCCESS) + return TRUE; return FALSE; }

1 0

Rob Shearman : widl: callback, code, comm_status and in_line are attribute names, not keywords.
by Alexandre Julliard April 30, 2008

April 30, 2008

Module: wine Branch: master Commit: e35c79efbfa6b630a572469e3c84785eba17ddae URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35c79efbfa6b630a572469e3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 29 19:52:31 2008 +0100 widl: callback, code, comm_status and in_line are attribute names, not keywords. --- tools/widl/parser.l | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index c202409..096f6a0 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -213,13 +213,10 @@ static const struct keyword keywords[] = { {"_stdcall", tSTDCALL}, {"boolean", tBOOLEAN}, {"byte", tBYTE}, - {"callback", tCALLBACK}, {"case", tCASE}, {"cdecl", tCDECL}, {"char", tCHAR}, {"coclass", tCOCLASS}, - {"code", tCODE}, - {"comm_status", tCOMMSTATUS}, {"const", tCONST}, {"cpp_quote", tCPPQUOTE}, {"default", tDEFAULT}, @@ -233,7 +230,6 @@ static const struct keyword keywords[] = { {"hyper", tHYPER}, {"import", tIMPORT}, {"importlib", tIMPORTLIB}, - {"in_line", tIN_LINE}, {"inline", tINLINE}, {"int", tINT}, {"interface", tINTERFACE}, @@ -271,6 +267,9 @@ static const struct keyword attr_keywords[] = {"broadcast", tBROADCAST}, {"byte_count", tBYTECOUNT}, {"call_as", tCALLAS}, + {"callback", tCALLBACK}, + {"code", tCODE}, + {"comm_status", tCOMMSTATUS}, {"context_handle", tCONTEXTHANDLE}, {"context_handle_noserialize", tCONTEXTHANDLENOSERIALIZE}, {"context_handle_serialize", tCONTEXTHANDLENOSERIALIZE}, @@ -297,6 +296,7 @@ static const struct keyword attr_keywords[] = {"immediatebind", tIMMEDIATEBIND}, {"implicit_handle", tIMPLICITHANDLE}, {"in", tIN}, + {"in_line", tIN_LINE}, {"input_sync", tINPUTSYNC}, {"lcid", tLCID}, {"length_is", tLENGTHIS},

1 0

Rob Shearman : widl: Allow pointer attributes to be applied to function pointers.
by Alexandre Julliard April 30, 2008

April 30, 2008

Module: wine Branch: master Commit: 48153a89447a0699e62d53aceb2ce3200a506ffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=48153a89447a0699e62d53ace… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 29 20:41:03 2008 +0100 widl: Allow pointer attributes to be applied to function pointers. --- tools/widl/parser.y | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index b5e95cc..6d5f497 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -606,6 +606,7 @@ constdef: tCONST decl_spec declarator '=' expr_const { $$ = reg_const($3->var); set_type($$, $2, $3, FALSE); $$->eval = $5; + free($3); } ; @@ -723,6 +724,7 @@ expr_const: expr { $$ = $1; externdef: tEXTERN tCONST decl_spec declarator { $$ = $4->var; set_type($$, $3, $4, FALSE); + free($4); } ; @@ -1355,16 +1357,17 @@ static void set_type(var_t *v, type_t *type, const declarator_t *decl, expr_t *dim; type_t *atype, **ptype; array_dims_t *arr = decl ? decl->array : NULL; + type_t *func_type = decl ? decl->func_type : NULL; if (is_attr(type->attrs, ATTR_INLINE)) { - if (!decl || !decl->func_type) + if (!func_type) error_loc("inline attribute applied to non-function type\n"); else { type_t *t; /* move inline attribute from return type node to function node */ - for (t = decl->func_type; is_ptr(t); t = t->ref) + for (t = func_type; is_ptr(t); t = t->ref) ; t->attrs = move_attr(t->attrs, type->attrs, ATTR_INLINE); } @@ -1379,7 +1382,10 @@ static void set_type(var_t *v, type_t *type, const declarator_t *decl, if (!arr) { const type_t *ptr = NULL; - for (ptr = v->type; ptr; ) + /* pointer attributes on the left side of the type belong to the function + * pointer, if one is being declared */ + type_t **pt = func_type ? &func_type : &v->type; + for (ptr = *pt; ptr; ) { if (ptr->kind == TKIND_ALIAS) ptr = ptr->orig; @@ -1389,8 +1395,8 @@ static void set_type(var_t *v, type_t *type, const declarator_t *decl, if (ptr && is_ptr(ptr) && (ptr_attr || top)) { /* duplicate type to avoid changing original type */ - v->type = duptype(v->type, 1); - v->type->type = ptr_attr ? ptr_attr : RPC_FC_RP; + *pt = duptype(*pt, 1); + (*pt)->type = ptr_attr ? ptr_attr : RPC_FC_RP; } else if (ptr_attr) error_loc("%s: pointer attribute applied to non-pointer type\n", v->name); @@ -1516,11 +1522,11 @@ static void set_type(var_t *v, type_t *type, const declarator_t *decl, /* v->type is currently pointing the the type on the left-side of the * declaration, so we need to fix this up so that it is the return type of the * function and make v->type point to the function side of the declaration */ - if (decl && decl->func_type) + if (func_type) { type_t *ft, *t; type_t *return_type = v->type; - v->type = decl->func_type; + v->type = func_type; for (ft = v->type; is_ptr(ft); ft = ft->ref) ; assert(ft->type == RPC_FC_FUNCTION);

1 0

Rob Shearman : widl: Make constdef and externdef take a declarator instead of an ident so that functions and arrays can be defined using the statements .
by Alexandre Julliard April 30, 2008

April 30, 2008

Module: wine Branch: master Commit: 017213e11a52c30a39d70eeac9c5dbd4a5e2c450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=017213e11a52c30a39d70eeac… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 29 20:40:48 2008 +0100 widl: Make constdef and externdef take a declarator instead of an ident so that functions and arrays can be defined using the statements. --- tools/widl/parser.y | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 8c99da4..b5e95cc 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -602,8 +602,9 @@ case: tCASE expr_int_const ':' union_field { attr_t *a = make_attrp(ATTR_CASE, } ; -constdef: tCONST decl_spec ident '=' expr_const { $$ = reg_const($3); - set_type($$, $2, NULL, FALSE); +constdef: tCONST decl_spec declarator '=' expr_const + { $$ = reg_const($3->var); + set_type($$, $2, $3, FALSE); $$->eval = $5; } ; @@ -720,8 +721,8 @@ expr_const: expr { $$ = $1; } ; -externdef: tEXTERN tCONST decl_spec ident { $$ = $4; - set_type($$, $3, NULL, FALSE); +externdef: tEXTERN tCONST decl_spec declarator { $$ = $4->var; + set_type($$, $3, $4, FALSE); } ;

1 0

Rob Shearman : widl: Keep const attributes applied to pointers when writing out the type.
by Alexandre Julliard April 30, 2008

April 30, 2008

Module: wine Branch: master Commit: 146ef11b7716e17dada38bd157906179c2b0d76e URL: http://source.winehq.org/git/wine.git/?a=commit;h=146ef11b7716e17dada38bd15… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 29 20:39:53 2008 +0100 widl: Keep const attributes applied to pointers when writing out the type. Use an attribute to store the const qualifier for the pointer and type. Allow multiple type-qualifiers to be applied to a type by adding a declaration-specifier rule that encompasses type-qualifiers and types. --- tools/widl/header.c | 5 ++- tools/widl/parser.y | 111 +++++++++++++++++++++++++++++++++++++++++------- tools/widl/widltypes.h | 2 +- 3 files changed, 100 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=146ef11b7716e17dada38…

1 0

Rob Shearman : widl: Add support for "inline" on function definitions.
by Alexandre Julliard April 30, 2008

April 30, 2008

Module: wine Branch: master Commit: 4f8f89e6bb7e2f5f601ce8549cedfd56548472c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f8f89e6bb7e2f5f601ce8549… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 29 20:40:30 2008 +0100 widl: Add support for "inline" on function definitions. Fix applying calling convention to function type. --- tools/widl/header.c | 1 + tools/widl/parser.l | 3 +- tools/widl/parser.y | 89 +++++++++++++++++++++++++++++++++--------------- tools/widl/widltypes.h | 3 +- 4 files changed, 66 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f8f89e6bb7e2f5f601ce…

1 0