October 2009 - Wine-Commits

Paul Vriens : comctl32/tests: Fix some test failures.
by Alexandre Julliard Oct. 2, 2009

Oct. 2, 2009

Module: wine Branch: master Commit: 46bba98bdf1a8984a2157f7e682482b3503721d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46bba98bdf1a8984a2157f7e6… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Oct 2 09:21:44 2009 +0200 comctl32/tests: Fix some test failures. --- dlls/comctl32/tests/monthcal.c | 114 ++++++++++++++++++++++------------------ 1 files changed, 63 insertions(+), 51 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index e0479cd..28b3646 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -216,9 +216,6 @@ static const struct message monthcal_hit_test_seq[] = { { MCM_HITTEST, sent|wparam, 0}, { MCM_HITTEST, sent|wparam, 0}, { MCM_HITTEST, sent|wparam, 0}, - { MCM_HITTEST, sent|wparam, 0}, - { MCM_HITTEST, sent|wparam, 0}, - { MCM_HITTEST, sent|wparam, 0}, { 0 } }; @@ -868,12 +865,14 @@ static void test_monthcal_hittest(void) } hittest_test_t; static const hittest_test_t title_hits[] = { - { MCHT_NOWHERE, 0 }, + /* Start is the same everywhere */ + { MCHT_TITLE, 0 }, { MCHT_TITLEBTNPREV, 0 }, - { MCHT_TITLEMONTH, 1 }, - { MCHT_TITLEYEAR, 1 }, + /* The middle piece is only tested for presence of items */ + /* End is the same everywhere */ { MCHT_TITLEBTNNEXT, 0 }, - { MCHT_NOWHERE, 0 } + { MCHT_TITLE, 0 }, + { MCHT_NOWHERE, 1 } }; MCHITTESTINFO mchit; @@ -883,6 +882,9 @@ static void test_monthcal_hittest(void) UINT title_index; HWND hwnd; RECT r; + char yearmonth[80], *locale_month, *locale_year; + int month_count, year_count; + BOOL in_the_middle; memset(&mchit, 0, sizeof(MCHITTESTINFO)); @@ -991,33 +993,6 @@ static void test_monthcal_hittest(void) expect(MCHT_CALENDARDATE, res); #endif - /* in active area - background section of the title */ - mchit.pt.x = 2 * r.right / 7; - mchit.pt.y = 2 * r.bottom / 19; - res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); - expect(2 * r.right / 7, mchit.pt.x); - expect(2 * r.bottom / 19, mchit.pt.y); - expect(mchit.uHit, res); - expect_hex(MCHT_TITLEBK, res); - - /* in active area - month section of the title */ - mchit.pt.x = r.right / 2; - mchit.pt.y = 2 * r.bottom / 19; - res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); - expect(r.right / 2, mchit.pt.x); - expect(2 * r.bottom / 19, mchit.pt.y); - expect(mchit.uHit, res); - expect_hex(MCHT_TITLE, res); - - /* in active area - year section of the title */ - mchit.pt.x = 3 * r.right / 4; - mchit.pt.y = 2 * r.bottom / 19; - res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); - expect(3 * r.right / 4, mchit.pt.x); - expect(2 * r.bottom / 19, mchit.pt.y); - expect(mchit.uHit, res); - expect_hex(MCHT_TITLE, res); - /* in active area - date from next month */ mchit.pt.x = 11 * r.right / 14; mchit.pt.y = 16 * r.bottom / 19; @@ -1059,38 +1034,75 @@ static void test_monthcal_hittest(void) /* The horizontal position of title bar elements depends on locale (y pos is constant), so we sample across a horizontal line and make sure we find all elements. */ + + /* Get the format of the title */ + GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SYEARMONTH, yearmonth, 80); + /* Find out if we have a month and/or year */ + locale_year = strstr(yearmonth, "y"); + locale_month = strstr(yearmonth, "M"); + mchit.pt.x = 0; mchit.pt.y = (5/2) * r.bottom / 19; title_index = 0; old_res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); + expect_hex(title_hits[title_index].ht, old_res); + in_the_middle = FALSE; + month_count = year_count = 0; for (x = 0; x < r.right; x++){ mchit.pt.x = x; res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); expect(x, mchit.pt.x); expect((5/2) * r.bottom / 19, mchit.pt.y); expect(mchit.uHit, res); - - if (res != MCHT_TITLEBK && res != old_res) { - title_index++; - old_res = res; - - if (sizeof(title_hits) / sizeof(title_hits[0]) <= title_index) - break; - - if (title_hits[title_index].todo) { - todo_wine - ok(title_hits[title_index].ht == res, "Expected %x, got %x, pos %d\n", - title_hits[title_index].ht, res, x); + if (res != old_res) { + + if (old_res == MCHT_TITLEBTNPREV) + in_the_middle = TRUE; + + if (res == MCHT_TITLEBTNNEXT) + in_the_middle = FALSE; + + if (in_the_middle) { + if (res == MCHT_TITLEMONTH) + month_count++; + else if (res == MCHT_TITLEYEAR) + year_count++; + } else { + title_index++; + + if (sizeof(title_hits) / sizeof(title_hits[0]) <= title_index) + break; + + if (title_hits[title_index].todo) { + todo_wine + ok(title_hits[title_index].ht == res, "Expected %x, got %x, pos %d\n", + title_hits[title_index].ht, res, x); + } else { + ok(title_hits[title_index].ht == res, "Expected %x, got %x, pos %d\n", + title_hits[title_index].ht, res, x); + } } - else ok(title_hits[title_index].ht == res, "Expected %x, got %x, pos %d\n", - title_hits[title_index].ht, res, x); + old_res = res; } } - todo_wine - ok(r.right <= x && title_index + 1 == sizeof(title_hits) / sizeof(title_hits[0]), - "Wrong title layout\n"); + /* There are some limits, even if LOCALE_SYEARMONTH contains rubbish + * or no month/year indicators at all */ + if (locale_month) + todo_wine ok(month_count == 1, "Expected 1 month item, got %d\n", month_count); + else + ok(month_count <= 1, "Too many month items: %d\n", month_count); + + if (locale_year) + todo_wine ok(year_count == 1, "Expected 1 year item, got %d\n", year_count); + else + ok(year_count <= 1, "Too many year items: %d\n", year_count); + + todo_wine ok(month_count + year_count >= 1, "Not enough month and year items\n"); + + ok(r.right <= x && title_index + 1 == sizeof(title_hits) / sizeof(title_hits[0]), + "Wrong title layout\n"); DestroyWindow(hwnd); }

1 0

André Hentschel : jscript: Update German Translation.
by Alexandre Julliard Oct. 2, 2009

Oct. 2, 2009

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 : wineps.drv: Make wineps16. drv into a stand-alone 16-bit module.
by Alexandre Julliard Oct. 2, 2009

Oct. 2, 2009

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

Michael Stefaniuc : mapi32: Use 0 instead of (wrongly) casting NULL to an integer.
by Alexandre Julliard Oct. 2, 2009

Oct. 2, 2009

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

Alexandre Julliard : setupapi: Duplicate the string substitution code to implement GenFormStrWithoutPlaceHolders16 .
by Alexandre Julliard Oct. 2, 2009

Oct. 2, 2009

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 : setupapi: Make setupx. dll into a stand-alone 16-bit module.
by Alexandre Julliard Oct. 2, 2009

Oct. 2, 2009

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 + +(a)MAKE_DLL_RULES@ + +(a)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

Michael Stefaniuc : comctl32/tests: Silence some Win64 compile warnings.
by Alexandre Julliard Oct. 2, 2009

Oct. 2, 2009

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 : winhttp: 'http1_1' is already defined in the private header.
by Alexandre Julliard Oct. 2, 2009

Oct. 2, 2009

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

Joel Holdsworth : gdi32: Added tests for StretchBlt.
by Alexandre Julliard Oct. 2, 2009

Oct. 2, 2009

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

Owen Rudge : mapi32: Add attachment support to sendmail_extended_mapi.
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

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