wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Joel Holdsworth : gdi32: Added tests for StretchDIBits.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 170e425b00c2846f3fa61fb2f3397e1b325e9cb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=170e425b00c2846f3fa61fb2f… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Wed Jul 15 22:17:48 2009 +0100 gdi32: Added tests for StretchDIBits. --- dlls/gdi32/tests/bitmap.c | 172 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 172 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 0b4c993..517033c 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2544,6 +2544,177 @@ static void test_StretchBlt(void) DeleteDC(hdcScreen); } +static void check_StretchDIBits_pixel(HDC hdcDst, UINT32 *dstBuffer, UINT32 *srcBuffer, + DWORD dwRop, UINT32 expected, int line) +{ + const UINT32 buffer[2] = { 0xFEDCBA98, 0 }; + BITMAPINFO bitmapInfo; + + memset(&bitmapInfo, 0, sizeof(BITMAPINFO)); + bitmapInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bitmapInfo.bmiHeader.biWidth = 2; + bitmapInfo.bmiHeader.biHeight = 1; + bitmapInfo.bmiHeader.biPlanes = 1; + bitmapInfo.bmiHeader.biBitCount = 32; + bitmapInfo.bmiHeader.biCompression = BI_RGB; + bitmapInfo.bmiHeader.biSizeImage = sizeof(buffer); + + *dstBuffer = 0x89ABCDEF; + + StretchDIBits(hdcDst, 0, 0, 2, 1, 0, 0, 1, 1, &buffer, &bitmapInfo, DIB_RGB_COLORS, dwRop); + ok(expected == *dstBuffer, + "StretchDIBits with dwRop %06X. Expected 0x%08X, got 0x%08X from line %d\n", + dwRop, expected, *dstBuffer, line); +} + +static void check_StretchDIBits_stretch(HDC hdcDst, UINT32 *dstBuffer, UINT32 *srcBuffer, + int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, + int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, + UINT32 expected[4], UINT32 legacy_expected[4], int line) +{ + BITMAPINFO bitmapInfo; + + memset(&bitmapInfo, 0, sizeof(BITMAPINFO)); + bitmapInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bitmapInfo.bmiHeader.biWidth = 2; + bitmapInfo.bmiHeader.biHeight = -2; + bitmapInfo.bmiHeader.biPlanes = 1; + bitmapInfo.bmiHeader.biBitCount = 32; + bitmapInfo.bmiHeader.biCompression = BI_RGB; + + memset(dstBuffer, 0, 16); + StretchDIBits(hdcDst, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, + nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, + srcBuffer, &bitmapInfo, DIB_RGB_COLORS, SRCCOPY); + ok(memcmp(dstBuffer, expected, 16) == 0 || /* Win2k/XP */ + broken(compare_buffers_no_alpha(dstBuffer, legacy_expected, 4)) || /* Win9X/ME */ + broken(nWidthSrc < 0 || nHeightSrc < 0), /* Win9X/ME */ + "StretchDIBits expected { %08X, %08X, %08X, %08X } got { %08X, %08X, %08X, %08X } " + "stretching { %d, %d, %d, %d } to { %d, %d, %d, %d } from line %d\n", + expected[0], expected[1], expected[2], expected[3], + dstBuffer[0], dstBuffer[1], dstBuffer[2], dstBuffer[3], + nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, + nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, line); +} + +static void test_StretchDIBits(void) +{ + HBITMAP bmpDst; + HBITMAP oldDst; + HDC hdcScreen, hdcDst; + UINT32 *dstBuffer, srcBuffer[4]; + HBRUSH hBrush, hOldBrush; + BITMAPINFO biDst; + UINT32 expected[4], legacy_expected[4]; + + memset(&biDst, 0, sizeof(BITMAPINFO)); + biDst.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + biDst.bmiHeader.biWidth = 2; + biDst.bmiHeader.biHeight = -2; + biDst.bmiHeader.biPlanes = 1; + biDst.bmiHeader.biBitCount = 32; + biDst.bmiHeader.biCompression = BI_RGB; + + hdcScreen = CreateCompatibleDC(0); + hdcDst = CreateCompatibleDC(hdcScreen); + + /* Pixel Tests */ + bmpDst = CreateDIBSection(hdcScreen, &biDst, DIB_RGB_COLORS, (void**)&dstBuffer, + NULL, 0); + oldDst = SelectObject(hdcDst, bmpDst); + + hBrush = CreateSolidBrush(0x012345678); + hOldBrush = SelectObject(hdcDst, hBrush); + + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, SRCCOPY, 0xFEDCBA98, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, SRCPAINT, 0xFFFFFFFF, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, SRCAND, 0x88888888, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, SRCINVERT, 0x77777777, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, SRCERASE, 0x76543210, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, NOTSRCCOPY, 0x01234567, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, NOTSRCERASE, 0x00000000, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, MERGECOPY, 0x00581210, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, MERGEPAINT, 0x89ABCDEF, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, PATCOPY, 0x00785634, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, PATPAINT, 0x89FBDFFF, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, PATINVERT, 0x89D39BDB, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, DSTINVERT, 0x76543210, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, BLACKNESS, 0x00000000, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, WHITENESS, 0xFFFFFFFF, __LINE__); + + SelectObject(hdcDst, hOldBrush); + DeleteObject(hBrush); + + /* Top-down destination tests */ + srcBuffer[0] = 0xCAFED00D, srcBuffer[1] = 0xFEEDFACE; + srcBuffer[2] = 0xFEDCBA98, srcBuffer[3] = 0x76543210; + + expected[0] = 0xCAFED00D, expected[1] = 0xFEEDFACE; + expected[2] = 0xFEDCBA98, expected[3] = 0x76543210; + check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 0, 0, 2, 2, expected, expected, __LINE__); + + expected[0] = 0xCAFED00D, expected[1] = 0x00000000; + expected[2] = 0x00000000, expected[3] = 0x00000000; + legacy_expected[0] = 0xFEDCBA98, legacy_expected[1] = 0x00000000; + legacy_expected[2] = 0x00000000, legacy_expected[3] = 0x00000000; + todo_wine check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 0, 0, 1, 1, expected, legacy_expected, __LINE__); + + expected[0] = 0xFEDCBA98, expected[1] = 0xFEDCBA98; + expected[2] = 0xFEDCBA98, expected[3] = 0xFEDCBA98; + check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 0, 0, 1, 1, expected, expected, __LINE__); + + expected[0] = 0x42441000, expected[1] = 0x00000000; + expected[2] = 0x00000000, expected[3] = 0x00000000; + legacy_expected[0] = 0x00543210, legacy_expected[1] = 0x00000000; + legacy_expected[2] = 0x00000000, legacy_expected[3] = 0x00000000; + todo_wine check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 0, 0, 2, 2, expected, legacy_expected, __LINE__); + + expected[0] = 0x00000000, expected[1] = 0x00000000; + expected[2] = 0x00000000, expected[3] = 0x00000000; + check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 1, 1, -2, -2, expected, expected, __LINE__); + + expected[0] = 0x00000000, expected[1] = 0x00000000; + expected[2] = 0x00000000, expected[3] = 0x00000000; + check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 1, 1, -2, -2, expected, expected, __LINE__); + + expected[0] = 0x00000000, expected[1] = 0x00000000; + expected[2] = 0x00000000, expected[3] = 0x00000000; + check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 1, 1, -2, -2, 1, 1, -2, -2, expected, expected, __LINE__); + + expected[0] = 0x00000000, expected[1] = 0x00000000; + expected[2] = 0x00000000, expected[3] = 0xCAFED00D; + check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 1, 1, 2, 2, 0, 0, 2, 2, expected, expected, __LINE__); + + SelectObject(hdcDst, oldDst); + DeleteObject(bmpDst); + + /* Bottom up destination tests */ + biDst.bmiHeader.biHeight = 2; + bmpDst = CreateDIBSection(hdcScreen, &biDst, DIB_RGB_COLORS, (void**)&dstBuffer, + NULL, 0); + oldDst = SelectObject(hdcDst, bmpDst); + + expected[0] = 0xFEDCBA98, expected[1] = 0x76543210; + expected[2] = 0xCAFED00D, expected[3] = 0xFEEDFACE; + check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 0, 0, 2, 2, expected, expected, __LINE__); + + /* Tidy up */ + SelectObject(hdcDst, oldDst); + DeleteObject(bmpDst); + DeleteDC(hdcDst); + + DeleteDC(hdcScreen); +} + static void test_GdiAlphaBlend(void) { /* test out-of-bound parameters for GdiAlphaBlend */ @@ -2691,6 +2862,7 @@ START_TEST(bitmap) test_CreateBitmap(); test_BitBlt(); test_StretchBlt(); + test_StretchDIBits(); test_GdiAlphaBlend(); test_bitmapinfoheadersize(); test_get16dibits();

1 0

Joel Holdsworth : gdi32: Added tests for StretchBlt.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: fb0b7381d06cba7d95950364b4e32c66dbe15815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb0b7381d06cba7d95950364b… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Wed Jul 15 22:16:31 2009 +0100 gdi32: Added tests for StretchBlt. --- dlls/gdi32/tests/bitmap.c | 215 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 215 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb0b7381d06cba7d95950…

1 0

Michael Stefaniuc : comctl32/tests: Silence some Win64 compile warnings.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 4ee851452bb02c4e68f19ef5ea9e08396a0b21fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ee851452bb02c4e68f19ef5e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 1 22:26:17 2009 +0200 comctl32/tests: Silence some Win64 compile warnings. "warning: cast to pointer from integer of different size" --- dlls/comctl32/tests/dpa.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index 022460a..c9e91c2 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -380,9 +380,9 @@ static void test_DPA_Merge(void) for (i = 0; i < 6; i++) { - ret = pDPA_InsertPtr(dpa2, i, (PVOID)(6-i)); + ret = pDPA_InsertPtr(dpa2, i, (PVOID)(INT_PTR)(6-i)); ok(ret == i, "ret=%d\n", ret); - ret = pDPA_InsertPtr(dpa3, i, (PVOID)(i+1)); + ret = pDPA_InsertPtr(dpa3, i, (PVOID)(INT_PTR)(i+1)); ok(ret == i, "ret=%d\n", ret); } @@ -404,7 +404,7 @@ static void test_DPA_Merge(void) for (i = 0; i < 6; i++) { - ret = pDPA_InsertPtr(dpa2, i, (PVOID)(6-i)); + ret = pDPA_InsertPtr(dpa2, i, (PVOID)(INT_PTR)(6-i)); ok(ret == i, "ret=%d\n", ret); } @@ -497,7 +497,7 @@ static void test_DPA_EnumCallback(void) for (i = 0; i < 6; i++) { - ret = pDPA_InsertPtr(dpa, i, (PVOID)(i+1)); + ret = pDPA_InsertPtr(dpa, i, (PVOID)(INT_PTR)(i+1)); ok(ret == i, "ret=%d\n", ret); } @@ -529,7 +529,7 @@ static void test_DPA_DestroyCallback(void) for (i = 0; i < 3; i++) { - ret = pDPA_InsertPtr(dpa, i, (PVOID)(i+1)); + ret = pDPA_InsertPtr(dpa, i, (PVOID)(INT_PTR)(i+1)); ok(ret == i, "ret=%d\n", ret); } @@ -706,7 +706,7 @@ if (0) { /* saving/loading */ for (i = 0; i < 6; i++) { - ret = pDPA_InsertPtr(dpa, i, (PVOID)(i+1)); + ret = pDPA_InsertPtr(dpa, i, (PVOID)(INT_PTR)(i+1)); ok(ret == i, "ret=%d\n", ret); }

1 0

Michael Stefaniuc : mapi32: Use 0 instead of (wrongly) casting NULL to an integer.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: e81286484e8e8ee3941286601ef31926d2001c24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e81286484e8e8ee3941286601… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 1 22:26:40 2009 +0200 mapi32: Use 0 instead of (wrongly) casting NULL to an integer. --- dlls/mapi32/sendmail.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index 592d762..6bf7b0f 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -358,7 +358,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM IMsgStore_Release(msg_store); logoff: ; - IMAPISession_Logoff(session, (ULONG) NULL, 0, 0); + IMAPISession_Logoff(session, 0, 0, 0); IMAPISession_Release(session); cleanup: ;

1 0

Michael Stefaniuc : winhttp: 'http1_1' is already defined in the private header.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 59be8e519fcf400166b263178bacef76b890e57a URL: http://source.winehq.org/git/wine.git/?a=commit;h=59be8e519fcf400166b263178… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 1 22:26:06 2009 +0200 winhttp: 'http1_1' is already defined in the private header. --- dlls/winhttp/request.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0d179a4..ea0ecda 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -839,7 +839,6 @@ static BOOL secure_proxy_connect( request_t *request ) { static const WCHAR verbConnect[] = {'C','O','N','N','E','C','T',0}; static const WCHAR fmt[] = {'%','s',':','%','d',0}; - static const WCHAR http1_1[] = {'H','T','T','P','/','1','.','1',0}; BOOL ret = FALSE; LPWSTR path; connect_t *connect = request->connect;

1 0

André Hentschel : jscript: Update German Translation.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: ad2b35b671b46944f6e566464cdaa6f50177c748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad2b35b671b46944f6e566464… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 1 19:54:24 2009 +0200 jscript: Update German Translation. --- dlls/jscript/jscript_De.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_De.rc b/dlls/jscript/jscript_De.rc index 80a150e..02b52f3 100644 --- a/dlls/jscript/jscript_De.rc +++ b/dlls/jscript/jscript_De.rc @@ -26,6 +26,7 @@ STRINGTABLE DISCARDABLE { IDS_TO_PRIMITIVE "Fehler beim umwandeln des Objektes in einen Grundtyp" IDS_INVALID_CALL_ARG "Ungültiger Funktionsaufruf oder Argument" + IDS_CREATE_OBJ_ERROR "Automatisierungsserver konnte das Objekt nicht erstellen" IDS_NO_PROPERTY "Das Objekt unterstützt diese Eigenschaft oder Methode nicht" IDS_ARG_NOT_OPT "Argument nicht optional" IDS_SYNTAX_ERROR "Syntax Fehler"

1 0

Alexandre Julliard : setupapi: Make setupx. dll into a stand-alone 16-bit module.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 66f6b786591e0d187967a26e9c9a1a8543ca91f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66f6b786591e0d187967a26e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 1 19:45:07 2009 +0200 setupapi: Make setupx.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 9 ++++++++ configure.ac | 1 + dlls/Makefile.in | 4 --- dlls/setupapi/Makefile.in | 8 ------- dlls/setupapi/stubs.c | 19 ------------------ dlls/setupx.dll16/Makefile.in | 18 +++++++++++++++++ dlls/{setupapi => setupx.dll16}/devinst16.c | 0 dlls/{setupapi => setupx.dll16}/infparse.c | 1 - .../setupx.spec => setupx.dll16/setupx.dll16.spec} | 0 dlls/{setupapi => setupx.dll16}/setupx16.h | 0 dlls/{setupapi => setupx.dll16}/setupx_main.c | 19 +++++++++++++++++- dlls/{setupapi => setupx.dll16}/virtcopy.c | 21 ++++++++++++++++--- 13 files changed, 63 insertions(+), 38 deletions(-) diff --git a/.gitignore b/.gitignore index 6c9437e..5d498c8 100644 --- a/.gitignore +++ b/.gitignore @@ -115,7 +115,6 @@ dlls/rpcrt4/epm_c.c dlls/rpcrt4/tests/server.h dlls/rpcrt4/tests/server_c.c dlls/rpcrt4/tests/server_s.c -dlls/setupx.dll16 dlls/shdocvw/shdocvw_v1.tlb dlls/stdole2.tlb/std_ole_v2.tlb dlls/stdole32.tlb/std_ole_v1.tlb diff --git a/configure b/configure index a68d6e8..c16637c 100755 --- a/configure +++ b/configure @@ -16444,6 +16444,14 @@ dlls/setupapi/tests/Makefile: dlls/setupapi/tests/Makefile.in dlls/Maketest.rule ac_config_files="$ac_config_files dlls/setupapi/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/setupx.dll16/Makefile" +test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + setupx.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/setupx.dll16/Makefile: dlls/setupx.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/setupx.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/sfc/Makefile" test "x$enable_sfc" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ sfc" @@ -19068,6 +19076,7 @@ do "dlls/serialui/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/serialui/tests/Makefile" ;; "dlls/setupapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/setupapi/Makefile" ;; "dlls/setupapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/setupapi/tests/Makefile" ;; + "dlls/setupx.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/setupx.dll16/Makefile" ;; "dlls/sfc/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sfc/Makefile" ;; "dlls/sfc_os/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sfc_os/Makefile" ;; "dlls/shdoclc/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/shdoclc/Makefile" ;; diff --git a/configure.ac b/configure.ac index 49aaa07..6210c2f 100644 --- a/configure.ac +++ b/configure.ac @@ -2418,6 +2418,7 @@ WINE_CONFIG_MAKEFILE([dlls/serialui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_D WINE_CONFIG_MAKEFILE([dlls/serialui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/setupapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/setupapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) +WINE_CONFIG_MAKEFILE([dlls/setupx.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/sfc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/sfc_os/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/shdoclc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 60dc2ba..8dcfdab 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -22,7 +22,6 @@ WIN16_FILES = \ gdi.exe16 \ krnl386.exe16 \ mmsystem.dll16 \ - setupx.dll16 \ user.exe16 \ wprocs.dll16 @@ -43,9 +42,6 @@ gdi.exe16: krnl386.exe16: echo "kernel32.dll" >$@ -setupx.dll16: - echo "setupapi.dll" >$@ - user.exe16: echo "user32.dll" >$@ diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in index 971a542..b72c612 100644 --- a/dlls/setupapi/Makefile.in +++ b/dlls/setupapi/Makefile.in @@ -23,14 +23,6 @@ C_SRCS = \ stringtable.c \ stubs.c -C_SRCS16 = \ - devinst16.c \ - infparse.c \ - setupx_main.c \ - virtcopy.c - -SPEC_SRCS16 = setupx.spec - RC_SRCS = \ Bg.rc \ Cs.rc \ diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 7ba85b6..1b217db 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -33,25 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(setupapi); /*********************************************************************** - * TPWriteProfileString (SETUPX.62) - */ -BOOL WINAPI TPWriteProfileString16( LPCSTR section, LPCSTR entry, LPCSTR string ) -{ - FIXME( "%s %s %s: stub\n", debugstr_a(section), debugstr_a(entry), debugstr_a(string) ); - return TRUE; -} - - -/*********************************************************************** - * suErrorToIds (SETUPX.61) - */ -DWORD WINAPI suErrorToIds16( WORD w1, WORD w2 ) -{ - FIXME( "%x %x: stub\n", w1, w2 ); - return 0; -} - -/*********************************************************************** * CM_Connect_MachineA (SETUPAPI.@) */ CONFIGRET WINAPI CM_Connect_MachineA(PCSTR name, PHMACHINE machine) diff --git a/dlls/setupx.dll16/Makefile.in b/dlls/setupx.dll16/Makefile.in new file mode 100644 index 0000000..78aca16 --- /dev/null +++ b/dlls/setupx.dll16/Makefile.in @@ -0,0 +1,18 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = setupx.dll16 +IMPORTS = setupapi user32 advapi32 kernel32 + +EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,setupapi.dll + +C_SRCS = \ + devinst16.c \ + infparse.c \ + setupx_main.c \ + virtcopy.c + +@MAKE_DLL_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/setupapi/devinst16.c b/dlls/setupx.dll16/devinst16.c similarity index 100% rename from dlls/setupapi/devinst16.c rename to dlls/setupx.dll16/devinst16.c diff --git a/dlls/setupapi/infparse.c b/dlls/setupx.dll16/infparse.c similarity index 99% rename from dlls/setupapi/infparse.c rename to dlls/setupx.dll16/infparse.c index 50aca20..d6cbed0 100644 --- a/dlls/setupapi/infparse.c +++ b/dlls/setupx.dll16/infparse.c @@ -38,7 +38,6 @@ #include "winnls.h" #include "setupapi.h" #include "setupx16.h" -#include "setupapi_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi); diff --git a/dlls/setupapi/setupx.spec b/dlls/setupx.dll16/setupx.dll16.spec similarity index 100% rename from dlls/setupapi/setupx.spec rename to dlls/setupx.dll16/setupx.dll16.spec diff --git a/dlls/setupapi/setupx16.h b/dlls/setupx.dll16/setupx16.h similarity index 100% rename from dlls/setupapi/setupx16.h rename to dlls/setupx.dll16/setupx16.h diff --git a/dlls/setupapi/setupx_main.c b/dlls/setupx.dll16/setupx_main.c similarity index 96% rename from dlls/setupapi/setupx_main.c rename to dlls/setupx.dll16/setupx_main.c index 0690333..de3a397 100644 --- a/dlls/setupapi/setupx_main.c +++ b/dlls/setupx.dll16/setupx_main.c @@ -66,7 +66,6 @@ #include "winnls.h" #include "setupapi.h" #include "setupx16.h" -#include "setupapi_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi); @@ -95,6 +94,24 @@ DWORD WINAPI SURegQueryValueEx( HKEY hkey, LPSTR lpszValueName, lpbData, lpcbData ); } +/*********************************************************************** + * TPWriteProfileString (SETUPX.62) + */ +BOOL WINAPI TPWriteProfileString16( LPCSTR section, LPCSTR entry, LPCSTR string ) +{ + FIXME( "%s %s %s: stub\n", debugstr_a(section), debugstr_a(entry), debugstr_a(string) ); + return TRUE; +} + + +/*********************************************************************** + * suErrorToIds (SETUPX.61) + */ +DWORD WINAPI suErrorToIds16( WORD w1, WORD w2 ) +{ + FIXME( "%x %x: stub\n", w1, w2 ); + return 0; +} /*********************************************************************** * InstallHinfSection (SETUPX.527) diff --git a/dlls/setupapi/virtcopy.c b/dlls/setupx.dll16/virtcopy.c similarity index 97% rename from dlls/setupapi/virtcopy.c rename to dlls/setupx.dll16/virtcopy.c index 2506a6a..a15f1a1 100644 --- a/dlls/setupapi/virtcopy.c +++ b/dlls/setupx.dll16/virtcopy.c @@ -31,11 +31,20 @@ #include "winnls.h" #include "setupapi.h" #include "setupx16.h" -#include "setupapi_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi); +/* copied from setupapi */ +#define COPYFILEDLGORD 1000 +#define SOURCESTRORD 500 +#define DESTSTRORD 501 +#define PROGRESSORD 502 + +#define REG_INSTALLEDFILES "System\\CurrentControlSet\\Control\\InstalledFiles" +#define REGPART_RENAME "\\Rename" +#define REG_VERSIONCONFLICT "Software\\Microsoft\\VersionConflictManager" + static FARPROC16 VCP_Proc = NULL; static LPARAM VCP_MsgRef = 0; @@ -43,6 +52,8 @@ static BOOL VCP_opened = FALSE; static VCPSTATUS vcp_status; +static HMODULE SETUPAPI_hInstance; + static WORD VCP_Callback( LPVOID obj, UINT16 msg, WPARAM16 wParam, LPARAM lParam, LPARAM lParamRef ) { WORD args[8]; @@ -214,10 +225,10 @@ static RETERR16 VCP_VirtnodeCreate(const VCPFILESPEC *vfsSrc, const VCPFILESPEC vn_num += 20; if (pvnlist) pvnlist = HeapReAlloc(heap, HEAP_ZERO_MEMORY, pvnlist, - sizeof(LPVIRTNODE *) * vn_num); + sizeof(LPVIRTNODE *) * vn_num); else - pvnlist = HeapAlloc(heap, HEAP_ZERO_MEMORY, - sizeof(LPVIRTNODE *) * vn_num); + pvnlist = HeapAlloc(heap, HEAP_ZERO_MEMORY, + sizeof(LPVIRTNODE *) * vn_num); } pvnlist[vn_last] = HeapAlloc(heap, HEAP_ZERO_MEMORY, sizeof(VIRTNODE)); lpvn = pvnlist[vn_last]; @@ -584,6 +595,8 @@ static void VCP_UI_RegisterProgressClass(void) wndClass.lpszClassName = "setupx_progress"; RegisterClassA (&wndClass); + + SETUPAPI_hInstance = LoadLibraryA( "setupapi.dll" ); } static RETERR16 VCP_UI_NodeCompare(LPVIRTNODE vn1, LPVIRTNODE vn2)

1 0

Alexandre Julliard : setupapi: Duplicate the string substitution code to implement GenFormStrWithoutPlaceHolders16 .
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: b70bbe3d29c5a4f151d1a9987f15fdb93490f4f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b70bbe3d29c5a4f151d1a9987… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 1 19:44:43 2009 +0200 setupapi: Duplicate the string substitution code to implement GenFormStrWithoutPlaceHolders16. --- dlls/setupapi/infparse.c | 91 ++++++++++++++++++++++++++++++++++++-- dlls/setupapi/parser.c | 4 +- dlls/setupapi/setupapi_private.h | 2 - 3 files changed, 89 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/infparse.c b/dlls/setupapi/infparse.c index d56e45b..50aca20 100644 --- a/dlls/setupapi/infparse.c +++ b/dlls/setupapi/infparse.c @@ -27,6 +27,7 @@ #include <stdarg.h> #include <string.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" @@ -96,6 +97,91 @@ static RETERR16 get_last_error(void) } } +/* string substitution support, duplicated from setupapi/parser.c */ + +static const char *get_string_subst( HINF hinf, const char *str, unsigned int *len, + char subst[MAX_INF_STRING_LENGTH], BOOL no_trailing_slash ) +{ + int dirid; + char *end; + INFCONTEXT context; + char buffer[MAX_INF_STRING_LENGTH]; + + if (!*len) /* empty string (%%) is replaced by single percent */ + { + *len = 1; + return "%"; + } + memcpy( buffer, str, *len ); + buffer[*len] = 0; + + if (SetupFindFirstLineA( hinf, "Strings", buffer, &context ) && + SetupGetStringFieldA( &context, 0, subst, MAX_INF_STRING_LENGTH, NULL )) + { + *len = strlen( subst ); + return subst; + } + + /* check for integer id */ + dirid = strtoul( buffer, &end, 10 ); + if (!*end && !CtlGetLddPath16( dirid, subst )) + { + *len = strlen( subst ); + if (no_trailing_slash && *len && subst[*len - 1] == '\\') *len -= 1; + return subst; + } + return NULL; +} + +static unsigned int string_subst( HINF hinf, const char *text, char *buffer ) +{ + const char *start, *subst, *p; + unsigned int len, total = 0; + int inside = 0; + unsigned int size = MAX_INF_STRING_LENGTH; + char tmp[MAX_INF_STRING_LENGTH]; + + for (p = start = text; *p; p++) + { + if (*p != '%') continue; + inside = !inside; + if (inside) /* start of a %xx% string */ + { + len = p - start; + if (len > size - 1) len = size - 1; + if (buffer) memcpy( buffer + total, start, len ); + total += len; + size -= len; + start = p; + } + else /* end of the %xx% string, find substitution */ + { + len = p - start - 1; + subst = get_string_subst( hinf, start + 1, &len, tmp, p[1] == '\\' ); + if (!subst) + { + subst = start; + len = p - start + 1; + } + if (len > size - 1) len = size - 1; + if (buffer) memcpy( buffer + total, subst, len ); + total += len; + size -= len; + start = p + 1; + } + } + + if (start != p) /* unfinished string, copy it */ + { + len = p - start; + if (len > size - 1) len = size - 1; + if (buffer) memcpy( buffer + total, start, len ); + total += len; + } + if (buffer && size) buffer[total] = 0; + return total; +} + /*********************************************************************** * IpOpen (SETUPX.2) @@ -146,14 +232,11 @@ RETERR16 WINAPI IpGetProfileString16( HINF16 hinf16, LPCSTR section, LPCSTR entr */ void WINAPI GenFormStrWithoutPlaceHolders16( LPSTR dst, LPCSTR src, HINF16 hinf16 ) { - UNICODE_STRING srcW; HINF hinf = get_hinf( hinf16 ); if (!hinf) return; - if (!RtlCreateUnicodeStringFromAsciiz( &srcW, src )) return; - PARSER_string_substA( hinf, srcW.Buffer, dst, MAX_INF_STRING_LENGTH ); - RtlFreeUnicodeString( &srcW ); + string_subst( hinf, src, dst ); TRACE( "%s -> %s\n", debugstr_a(src), debugstr_a(dst) ); } diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index 65a6a03..37b900f 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -418,8 +418,8 @@ static unsigned int PARSER_string_substW( const struct inf_file *file, const WCH /* do string substitutions on the specified text */ /* the buffer is assumed to be large enough */ /* returns necessary length not including terminating null */ -unsigned int PARSER_string_substA( const struct inf_file *file, const WCHAR *text, char *buffer, - unsigned int size ) +static unsigned int PARSER_string_substA( const struct inf_file *file, const WCHAR *text, + char *buffer, unsigned int size ) { WCHAR buffW[MAX_STRING_LEN+1]; DWORD ret; diff --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h index 307dbae..e505503 100644 --- a/dlls/setupapi/setupapi_private.h +++ b/dlls/setupapi/setupapi_private.h @@ -84,8 +84,6 @@ static inline WCHAR *strdupAtoW( const char *str ) struct inf_file; extern const WCHAR *DIRID_get_string( int dirid ); -extern unsigned int PARSER_string_substA( const struct inf_file *file, const WCHAR *text, - char *buffer, unsigned int size ); extern const WCHAR *PARSER_get_inf_filename( HINF hinf ); extern WCHAR *PARSER_get_src_root( HINF hinf ); extern WCHAR *PARSER_get_dest_dir( INFCONTEXT *context );

1 0

Alexandre Julliard : wineps.drv: Make wineps16. drv into a stand-alone 16-bit module.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: ac2a509722e24ef106beaf5e67b4967bc0a171bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac2a509722e24ef106beaf5e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 1 19:44:17 2009 +0200 wineps.drv: Make wineps16.drv into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 9 ++ configure.ac | 1 + dlls/Makefile.in | 4 - dlls/wineps.drv/Makefile.in | 2 - dlls/wineps.drv/driver.c | 51 ----------- dlls/wineps.drv/psdrv.h | 5 - dlls/wineps16.drv16/Makefile.in | 14 +++ dlls/wineps16.drv16/driver.c | 89 ++++++++++++++++++++ .../wineps16.drv16.spec} | 0 10 files changed, 113 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac2a509722e24ef106bea…

1 0

Owen Rudge : mapi32: Add attachment support to sendmail_extended_mapi.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 2bdcee13a083f68ef8482aa85f7859ee887a738b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bdcee13a083f68ef8482aa85… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Oct 1 14:11:31 2009 +0100 mapi32: Add attachment support to sendmail_extended_mapi. --- dlls/mapi32/sendmail.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 96 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index 550406b..592d762 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -44,6 +44,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mapi); +#define READ_BUF_SIZE 4096 + /* Internal function to send a message via Extended MAPI. Wrapper around the Simple MAPI function MAPISendMail. @@ -192,7 +194,100 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM /* Add message attachments */ if (message->nFileCount > 0) { - FIXME("TODO: %d attachments\n", message->nFileCount); + ULONG num_attach = 0; + int i, j; + + for (i = 0; i < message->nFileCount; i++) + { + IAttach* attachment = NULL; + SPropValue prop[4]; + LPCSTR filename; + HANDLE file; + + if (!message->lpFiles[i].lpszPathName) + continue; + + /* Open the attachment for reading */ + file = CreateFileA(message->lpFiles[i].lpszPathName, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + + if (file == INVALID_HANDLE_VALUE) + continue; + + /* Check if a display filename has been given; if not, get one ourselves from path name */ + filename = message->lpFiles[i].lpszFileName; + + if (!filename) + { + filename = message->lpFiles[i].lpszPathName; + + for (j = strlen(message->lpFiles[i].lpszPathName)-1; j >= 0; j--) + { + if (message->lpFiles[i].lpszPathName[i] == '\\' || + message->lpFiles[i].lpszPathName[i] == '/') + { + filename = &message->lpFiles[i].lpszPathName[i+1]; + break; + } + } + } + + TRACE("Attachment %d path: '%s'; filename: '%s'\n", i, debugstr_a(message->lpFiles[i].lpszPathName), + debugstr_a(filename)); + + /* Create the attachment */ + if (IMessage_CreateAttach(msg, NULL, 0, &num_attach, &attachment) != S_OK) + { + TRACE("Unable to create attachment\n"); + CloseHandle(file); + continue; + } + + /* Set the attachment properties */ + ZeroMemory(prop, sizeof(prop)); + + prop[0].ulPropTag = PR_ATTACH_METHOD; + prop[0].Value.ul = ATTACH_BY_VALUE; + prop[1].ulPropTag = PR_ATTACH_LONG_FILENAME_A; + prop[1].Value.lpszA = (LPSTR) filename; + prop[2].ulPropTag = PR_ATTACH_FILENAME_A; + prop[2].Value.lpszA = (LPSTR) filename; + prop[3].ulPropTag = PR_RENDERING_POSITION; + prop[3].Value.l = -1; + + if (IAttach_SetProps(attachment, 4, prop, NULL) == S_OK) + { + LPSTREAM stream = NULL; + + if (IAttach_OpenProperty(attachment, PR_ATTACH_DATA_BIN, &IID_IStream, 0, + MAPI_MODIFY | MAPI_CREATE, (LPUNKNOWN*) &stream) == S_OK) + { + BYTE data[READ_BUF_SIZE]; + DWORD size = 0, read, written; + + while (ReadFile(file, data, READ_BUF_SIZE, &read, NULL) && (read != 0)) + { + IStream_Write(stream, data, read, &written); + size += read; + } + + TRACE("%d bytes read, %d bytes written of attachment\n", read, written); + + IStream_Commit(stream, STGC_DEFAULT); + IStream_Release(stream); + + prop[0].ulPropTag = PR_ATTACH_SIZE; + prop[0].Value.ul = size; + IAttach_SetProps(attachment, 1, prop, NULL); + + IAttach_SaveChanges(attachment, KEEP_OPEN_READONLY); + num_attach++; + } + } + + CloseHandle(file); + IAttach_Release(attachment); + } } IMessage_SaveChanges(msg, KEEP_OPEN_READWRITE);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2009