October 2009 - Wine-Commits

Alexandre Julliard : configure: Build with -Wstrict-prototypes if supported .
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 295806f9c081ea7ed8c325012860fac7547888cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=295806f9c081ea7ed8c325012… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 7 13:46:06 2009 +0200 configure: Build with -Wstrict-prototypes if supported. --- aclocal.m4 | 3 +- configure | 169 ++++++++++++++-------------------------------------------- configure.ac | 1 + 3 files changed, 44 insertions(+), 129 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 90e166d..f7beb5d 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -75,7 +75,8 @@ AC_DEFUN([WINE_TRY_CFLAGS], AC_CACHE_CHECK([whether the compiler supports $1], ac_var, [ac_wine_try_cflags_saved=$CFLAGS CFLAGS="$CFLAGS $1" -AC_LINK_IFELSE(AC_LANG_PROGRAM(), [AS_VAR_SET(ac_var,yes)], [AS_VAR_SET(ac_var,no)]) +AC_LINK_IFELSE(AC_LANG_SOURCE([int main(int argc, char *argv[]) { return 0; }]), + [AS_VAR_SET(ac_var,yes)], [AS_VAR_SET(ac_var,no)]) CFLAGS=$ac_wine_try_cflags_saved]) AS_IF([test AS_VAR_GET(ac_var) = yes], [m4_default([$2], [EXTRACFLAGS="$EXTRACFLAGS $1"])], [$3])dnl diff --git a/configure b/configure index 5a7516d..599d2f3 100755 --- a/configure +++ b/configure @@ -6608,14 +6608,7 @@ else CFLAGS="$CFLAGS -fPIC -shared -Wl,-soname,confest.so.1" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} +int main(int argc, char *argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1=yes @@ -6640,14 +6633,7 @@ else CFLAGS="$CFLAGS -fPIC -shared -Wl,-h,confest.so.1" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} +int main(int argc, char *argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__fPIC__shared__Wl__h_confest_so_1=yes @@ -6674,14 +6660,7 @@ else CFLAGS="$CFLAGS -fPIC -shared -Wl,-Bsymbolic,-z,defs" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} +int main(int argc, char *argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__z_defs=yes @@ -6707,14 +6686,7 @@ else CFLAGS="$CFLAGS -fPIC -shared -Wl,-Bsymbolic,-init,__wine_spec_init,-fini,__wine_spec_fini" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} +int main(int argc, char *argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__init___wine_spec_init__fini___wine_spec_fini=yes @@ -6741,14 +6713,7 @@ else CFLAGS="$CFLAGS -fPIC -shared -Wl,--version-script=conftest.map" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} +int main(int argc, char *argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__fPIC__shared__Wl___version_script_conftest_map=yes @@ -6775,14 +6740,7 @@ else CFLAGS="$CFLAGS -fPIC -Wl,--export-dynamic" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} +int main(int argc, char *argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__fPIC__Wl___export_dynamic=yes @@ -6810,14 +6768,7 @@ else CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} +int main(int argc, char *argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_var=yes" @@ -6845,14 +6796,7 @@ else CFLAGS="$CFLAGS -fPIC -Wl,-R,\$ORIGIN/../lib" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} +int main(int argc, char *argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_var=yes" @@ -6881,14 +6825,7 @@ else CFLAGS="$CFLAGS -Wl,--enable-new-dtags" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} +int main(int argc, char *argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__Wl___enable_new_dtags=yes @@ -6916,14 +6853,7 @@ else CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x7bf00400" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} +int main(int argc, char *argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__Wl___section_start__interp_0x7bf00400=yes @@ -11568,14 +11498,7 @@ else CFLAGS="$CFLAGS -fno-builtin" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} +int main(int argc, char *argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__fno_builtin=yes @@ -11601,14 +11524,7 @@ else CFLAGS="$CFLAGS -fno-strict-aliasing" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} +int main(int argc, char *argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__fno_strict_aliasing=yes @@ -11633,14 +11549,7 @@ else CFLAGS="$CFLAGS -Wdeclaration-after-statement" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} +int main(int argc, char *argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__Wdeclaration_after_statement=yes @@ -11656,6 +11565,31 @@ $as_echo "$ac_cv_cflags__Wdeclaration_after_statement" >&6; } if test $ac_cv_cflags__Wdeclaration_after_statement = yes; then : EXTRACFLAGS="$EXTRACFLAGS -Wdeclaration-after-statement" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wstrict-prototypes" >&5 +$as_echo_n "checking whether the compiler supports -Wstrict-prototypes... " >&6; } +if test "${ac_cv_cflags__Wstrict_prototypes+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wstrict-prototypes" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char *argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wstrict_prototypes=yes +else + ac_cv_cflags__Wstrict_prototypes=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wstrict_prototypes" >&5 +$as_echo "$ac_cv_cflags__Wstrict_prototypes" >&6; } +if test $ac_cv_cflags__Wstrict_prototypes = yes; then : + EXTRACFLAGS="$EXTRACFLAGS -Wstrict-prototypes" +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wwrite-strings" >&5 $as_echo_n "checking whether the compiler supports -Wwrite-strings... " >&6; } if test "${ac_cv_cflags__Wwrite_strings+set}" = set; then : @@ -11665,14 +11599,7 @@ else CFLAGS="$CFLAGS -Wwrite-strings" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} +int main(int argc, char *argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__Wwrite_strings=yes @@ -11697,14 +11624,7 @@ else CFLAGS="$CFLAGS -Wtype-limits" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} +int main(int argc, char *argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__Wtype_limits=yes @@ -11765,14 +11685,7 @@ else CFLAGS="$CFLAGS -Werror" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} +int main(int argc, char *argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__Werror=yes diff --git a/configure.ac b/configure.ac index 0cc339b..813b198 100644 --- a/configure.ac +++ b/configure.ac @@ -1485,6 +1485,7 @@ then WINE_TRY_CFLAGS([-fno-builtin],[AC_SUBST(BUILTINFLAG,"-fno-builtin")]) WINE_TRY_CFLAGS([-fno-strict-aliasing]) WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) + WINE_TRY_CFLAGS([-Wstrict-prototypes]) WINE_TRY_CFLAGS([-Wwrite-strings]) WINE_TRY_CFLAGS([-Wtype-limits])

1 0

Alexandre Julliard : winhlp32: Don' t use FARPROC for functions that take variable number of arguments.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 15751f2031fad77edcf7d389078110c30b3c4c7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=15751f2031fad77edcf7d3890… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 7 13:40:00 2009 +0200 winhlp32: Don't use FARPROC for functions that take variable number of arguments. --- programs/winhlp32/macro.c | 186 ++++++++++++++++++++-------------------- programs/winhlp32/macro.lex.l | 69 +++++++++++++--- 2 files changed, 150 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=15751f2031fad77edcf7d…

1 0

Henri Verbeet : d3d8: Use separate fields for data to check/ apply in the stateblock tests.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: fb5079815d51462c6a1e2f3bc3fc5a56f4072590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb5079815d51462c6a1e2f3bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 09:02:56 2009 +0200 d3d8: Use separate fields for data to check/apply in the stateblock tests. --- dlls/d3d8/tests/stateblock.c | 131 +++++++++++++++++++++++------------------- 1 files changed, 72 insertions(+), 59 deletions(-) diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c index 43996f6..a742fe5 100644 --- a/dlls/d3d8/tests/stateblock.c +++ b/dlls/d3d8/tests/stateblock.c @@ -138,12 +138,8 @@ struct state_test }; /* See below for explanation of the flags */ -#define EVENT_OK 0x00 -#define EVENT_CHECK_DEFAULT 0x01 -#define EVENT_CHECK_INITIAL 0x02 -#define EVENT_CHECK_TEST 0x04 -#define EVENT_ERROR 0x08 -#define EVENT_APPLY_DATA 0x10 +#define EVENT_OK 0 +#define EVENT_ERROR -1 struct event_data { @@ -152,64 +148,81 @@ struct event_data IDirect3DSwapChain8 *new_swap_chain; }; +enum stateblock_data +{ + SB_DATA_NONE = 0, + SB_DATA_DEFAULT, + SB_DATA_INITIAL, + SB_DATA_TEST_IN, + SB_DATA_TEST, +}; + struct event { int (*event_fn)(IDirect3DDevice8 *device, struct event_data *event_data); - int status; + enum stateblock_data check; + enum stateblock_data apply; }; +static const void *get_event_data(const struct state_test *test, enum stateblock_data data) +{ + switch (data) + { + case SB_DATA_DEFAULT: + return test->default_data; + + case SB_DATA_INITIAL: + return test->initial_data; + + case SB_DATA_TEST_IN: + return test->test_data_in; + + case SB_DATA_TEST: + return test->test_data_out; + + default: + return NULL; + } +} + /* This is an event-machine, which tests things. * It tests get and set operations for a batch of states, based on * results from the event function, which directs what's to be done */ static void execute_test_chain(IDirect3DDevice8 *device, struct state_test *test, unsigned int ntests, struct event *event, unsigned int nevents, struct event_data *event_data) { - unsigned int i = 0, j; - int outcome; + unsigned int i, j; /* For each queued event */ for (j = 0; j < nevents; ++j) { - /* Execute the next event handler (if available) or just set the supplied status */ - outcome = event[j].status; - if (event[j].event_fn) outcome |= event[j].event_fn(device, event_data); - - /* Now verify correct outcome depending on what was signaled by the handler. - * An EVENT_CHECK_TEST signal means check the returned data against the test_data (out). - * An EVENT_CHECK_DEFAULT signal means check the returned data against the default_data. - * An EVENT_CHECK_INITIAL signal means check the returned data against the initial_data. - * An EVENT_ERROR signal means the test isn't going to work, exit the event loop. - * An EVENT_APPLY_DATA signal means load the test data (after checks) */ - - if (outcome & EVENT_ERROR) + const void *data; + + /* Execute the next event handler (if available). */ + if (event[j].event_fn) { - trace("Test %s, Stage %u in error state, aborting\n", test[i].test_name, j); - break; + if (event[j].event_fn(device, event_data) == EVENT_ERROR) + { + trace("Stage %u in error state, aborting.\n", j); + break; + } } - else if (outcome & EVENT_CHECK_TEST || outcome & EVENT_CHECK_DEFAULT || outcome & EVENT_CHECK_INITIAL) + + if (event[j].check != SB_DATA_NONE) { for (i = 0; i < ntests; ++i) { - if (outcome & EVENT_CHECK_TEST) - { - test[i].check_data(device, j, &test[i], test[i].test_data_out); - } - else if (outcome & EVENT_CHECK_DEFAULT) - { - test[i].check_data(device, j, &test[i], test[i].default_data); - } - else if (outcome & EVENT_CHECK_INITIAL) - { - test[i].check_data(device, j, &test[i], test[i].initial_data); - } + data = get_event_data(&test[i], event[j].check); + test[i].check_data(device, j, &test[i], data); } } - if (outcome & EVENT_APPLY_DATA) + if (event[j].apply != SB_DATA_NONE) { for (i = 0; i < ntests; ++i) { - test[i].set_handler(device, &test[i], test[i].test_data_in); + data = get_event_data(&test[i], event[j].apply); + test[i].set_handler(device, &test[i], data); } } } @@ -341,51 +354,51 @@ static void execute_test_chain_all(IDirect3DDevice8 *device, struct state_test * struct event read_events[] = { - {NULL, EVENT_CHECK_INITIAL}, + {NULL, SB_DATA_INITIAL, SB_DATA_NONE}, }; struct event write_read_events[] = { - {NULL, EVENT_APPLY_DATA}, - {NULL, EVENT_CHECK_TEST}, + {NULL, SB_DATA_NONE, SB_DATA_TEST_IN}, + {NULL, SB_DATA_TEST, SB_DATA_NONE}, }; struct event abort_stateblock_events[] = { - {begin_stateblock, EVENT_APPLY_DATA}, - {end_stateblock, EVENT_OK}, - {abort_stateblock, EVENT_CHECK_DEFAULT}, + {begin_stateblock, SB_DATA_NONE, SB_DATA_TEST_IN}, + {end_stateblock, SB_DATA_NONE, SB_DATA_NONE}, + {abort_stateblock, SB_DATA_DEFAULT, SB_DATA_NONE}, }; struct event apply_stateblock_events[] = { - {begin_stateblock, EVENT_APPLY_DATA}, - {end_stateblock, EVENT_OK}, - {apply_stateblock, EVENT_CHECK_TEST}, + {begin_stateblock, SB_DATA_NONE, SB_DATA_TEST_IN}, + {end_stateblock, SB_DATA_NONE, SB_DATA_NONE}, + {apply_stateblock, SB_DATA_TEST, SB_DATA_NONE}, }; struct event capture_reapply_stateblock_events[] = { - {begin_stateblock, EVENT_APPLY_DATA}, - {end_stateblock, EVENT_OK}, - {capture_stateblock, EVENT_CHECK_DEFAULT | EVENT_APPLY_DATA}, - {apply_stateblock, EVENT_CHECK_DEFAULT}, + {begin_stateblock, SB_DATA_NONE, SB_DATA_TEST_IN}, + {end_stateblock, SB_DATA_NONE, SB_DATA_NONE}, + {capture_stateblock, SB_DATA_DEFAULT, SB_DATA_TEST_IN}, + {apply_stateblock, SB_DATA_DEFAULT, SB_DATA_NONE}, }; struct event rendertarget_switch_events[] = { - {NULL, EVENT_APPLY_DATA}, - {switch_render_target, EVENT_CHECK_TEST}, - {revert_render_target, EVENT_OK}, + {NULL, SB_DATA_NONE, SB_DATA_TEST_IN}, + {switch_render_target, SB_DATA_TEST, SB_DATA_NONE}, + {revert_render_target, SB_DATA_NONE, SB_DATA_NONE}, }; struct event rendertarget_stateblock_events[] = { - {begin_stateblock, EVENT_APPLY_DATA}, - {switch_render_target, EVENT_CHECK_DEFAULT}, - {end_stateblock, EVENT_OK}, - {revert_render_target, EVENT_OK}, - {apply_stateblock, EVENT_CHECK_TEST}, + {begin_stateblock, SB_DATA_NONE, SB_DATA_TEST_IN}, + {switch_render_target, SB_DATA_DEFAULT, SB_DATA_NONE}, + {end_stateblock, SB_DATA_NONE, SB_DATA_NONE}, + {revert_render_target, SB_DATA_NONE, SB_DATA_NONE}, + {apply_stateblock, SB_DATA_TEST, SB_DATA_NONE}, }; /* Setup each test for execution */

1 0

Rein Klazes : comdlg32: Make explorer type file dialogs without custom template or hook proc resizable .
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 3e76f88d2794e9979fe4a2dded7fed875c566fdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e76f88d2794e9979fe4a2dde… Author: Rein Klazes <wijn(a)online.nl> Date: Wed Oct 7 11:17:05 2009 +0200 comdlg32: Make explorer type file dialogs without custom template or hook proc resizable. --- dlls/comdlg32/filedlg.c | 7 ++++++ dlls/comdlg32/tests/filedlg.c | 47 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index d1147eb..afd02dc 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -271,6 +271,13 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) return FALSE; } + /* msdn: explorer style dialogs permit sizing by default. + * The OFN_ENABLESIZING flag is only needed when a hook or + * custom tmeplate is provided */ + if( (fodInfos->ofnInfos->Flags & OFN_EXPLORER) && + !(fodInfos->ofnInfos->Flags & ( OFN_ENABLEHOOK | OFN_ENABLETEMPLATE | OFN_ENABLETEMPLATEHANDLE))) + fodInfos->ofnInfos->Flags |= OFN_ENABLESIZING; + if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) { ((LPDLGTEMPLATEW)template)->style |= WS_SIZEBOX; diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 6583130..aca2841 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -29,6 +29,8 @@ /* ##### */ +static int resizesupported = TRUE; + static void toolbarcheck( HWND hDlg) { /* test toolbar properties */ @@ -349,6 +351,7 @@ static LONG_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L if( resize_testcases[index].flags & OFN_ENABLESIZING) if( !(style & WS_SIZEBOX)) { win_skip( "OFN_ENABLESIZING flag not supported.\n"); + resizesupported = FALSE; PostMessage( parent, WM_COMMAND, IDCANCEL, 0); } else ok( style & WS_SIZEBOX, @@ -934,6 +937,49 @@ static void test_getfolderpath(void) CommDlgExtendedError()); } +static void test_resizable2(void) +{ + OPENFILENAMEA ofn = {0}; + char filename[1024] = "pls press Enter if sizable, Esc otherwise"; + DWORD ret; + + /* interactive because there is no hook function */ + if( !winetest_interactive) { + skip( "some interactive resizable dialog tests (set WINETEST_INTERACTIVE=1)\n"); + return; + } + ofn.lStructSize = sizeof(ofn); + ofn.lpstrFile = filename; + ofn.nMaxFile = 1024; + ofn.lpfnHook = NULL; + ofn.hInstance = GetModuleHandleA(NULL); + ofn.lpTemplateName = "template1"; + ofn.Flags = OFN_EXPLORER; +#define ISSIZABLE 1 + ret = GetOpenFileNameA(&ofn); + ok( ret == ISSIZABLE, "File Dialog should have been sizable\n"); + ret = CommDlgExtendedError(); + ok(!ret, "CommDlgExtendedError returned %#x\n", ret); + ofn.Flags = OFN_EXPLORER | OFN_ENABLETEMPLATE; + ret = GetOpenFileNameA(&ofn); + ok( ret != ISSIZABLE, "File Dialog should NOT have been sizable\n"); + ret = CommDlgExtendedError(); + ok(!ret, "CommDlgExtendedError returned %#x\n", ret); + ofn.Flags = OFN_EXPLORER | OFN_ENABLETEMPLATEHANDLE; + ofn.hInstance = LoadResource( GetModuleHandle(NULL), FindResource( GetModuleHandle(NULL), "template1", (LPSTR)RT_DIALOG)); + ofn.lpTemplateName = NULL; + ret = GetOpenFileNameA(&ofn); + ok( ret != ISSIZABLE, "File Dialog should NOT have been sizable\n"); + ret = CommDlgExtendedError(); + ok(!ret, "CommDlgExtendedError returned %#x\n", ret); + ofn.Flags = OFN_EXPLORER | OFN_ENABLEHOOK; + ret = GetOpenFileNameA(&ofn); + ok( ret != ISSIZABLE, "File Dialog should NOT have been sizable\n"); + ret = CommDlgExtendedError(); + ok(!ret, "CommDlgExtendedError returned %#x\n", ret); +#undef ISSIZABLE +} + START_TEST(filedlg) { test_DialogCancel(); @@ -943,4 +989,5 @@ START_TEST(filedlg) test_resize(); test_ok(); test_getfolderpath(); + if( resizesupported) test_resizable2(); }

1 0

Jacek Caban : urlmon: Fixed tests for systems with stored cookie for winehq .org.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 8eada56b50af67b5ed878ea3eed01419b33dc643 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8eada56b50af67b5ed878ea3e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 7 11:33:34 2009 +0200 urlmon: Fixed tests for systems with stored cookie for winehq.org. --- dlls/urlmon/tests/protocol.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 0c7932a..5f48cfe 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -435,6 +435,8 @@ static void call_continue(PROTOCOLDATA *protocol_data) HRESULT hres; if(!state) { + if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) + CLEAR_CALLED(ReportProgress_COOKIE_SENT); if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST || tested_protocol == FTP_TEST) { if (http_is_first) { CLEAR_CALLED(ReportProgress_FINDINGRESOURCE); @@ -2423,6 +2425,7 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags) test_priority(async_protocol); test_http_info(async_protocol); + SET_EXPECT(ReportProgress_COOKIE_SENT); SET_EXPECT(ReportProgress_FINDINGRESOURCE); SET_EXPECT(ReportProgress_CONNECTING); SET_EXPECT(ReportProgress_SENDINGREQUEST);

1 0

Henri Verbeet : d3d8: Rename abort_stateblock() to delete_stateblock() in the stateblock tests.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: d6f48927227791b22da3bc6e5578479adce9f93b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f48927227791b22da3bc6e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 09:02:58 2009 +0200 d3d8: Rename abort_stateblock() to delete_stateblock() in the stateblock tests. --- dlls/d3d8/tests/stateblock.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c index a742fe5..e31a964 100644 --- a/dlls/d3d8/tests/stateblock.c +++ b/dlls/d3d8/tests/stateblock.c @@ -317,7 +317,7 @@ static int end_stateblock(IDirect3DDevice8 *device, struct event_data *event_dat return EVENT_OK; } -static int abort_stateblock(IDirect3DDevice8 *device, struct event_data *event_data) +static int delete_stateblock(IDirect3DDevice8 *device, struct event_data *event_data) { IDirect3DDevice8_DeleteStateBlock(device, event_data->stateblock); return EVENT_OK; @@ -367,7 +367,7 @@ static void execute_test_chain_all(IDirect3DDevice8 *device, struct state_test * { {begin_stateblock, SB_DATA_NONE, SB_DATA_TEST_IN}, {end_stateblock, SB_DATA_NONE, SB_DATA_NONE}, - {abort_stateblock, SB_DATA_DEFAULT, SB_DATA_NONE}, + {delete_stateblock, SB_DATA_DEFAULT, SB_DATA_NONE}, }; struct event apply_stateblock_events[] =

1 0

Alexandre Julliard : winhlp32: Use explicit prototypes for the dll callbacks.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: e2d22db7b9ec325d614806f2ef97cd3587a11506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2d22db7b9ec325d614806f2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 7 13:31:32 2009 +0200 winhlp32: Use explicit prototypes for the dll callbacks. --- programs/winhlp32/callback.c | 38 +++++++++++++++++++------------------- programs/winhlp32/macro.c | 2 +- programs/winhlp32/winhelp.h | 24 ++++++++++++++++++++++-- 3 files changed, 42 insertions(+), 22 deletions(-) diff --git a/programs/winhlp32/callback.c b/programs/winhlp32/callback.c index 0b3e62e..5193861 100644 --- a/programs/winhlp32/callback.c +++ b/programs/winhlp32/callback.c @@ -158,23 +158,23 @@ static LONG CALLBACK WHD_API(LPSTR x, WORD xx, DWORD xxx) return 0; } -FARPROC Callbacks[] = -{ - (FARPROC)WHD_GetFSError, - (FARPROC)WHD_Open, - (FARPROC)WHD_Close, - (FARPROC)WHD_OpenBag, - (FARPROC)WHD_CloseBag, - (FARPROC)WHD_ReadBag, - (FARPROC)WHD_TellBag, - (FARPROC)WHD_SeekBag, - (FARPROC)WHD_IsEofBag, - (FARPROC)WHD_SizeBag, - (FARPROC)WHD_Access, - (FARPROC)WHD_LLInfoFromBag, - (FARPROC)WHD_LLInfoFromFile, - (FARPROC)WHD_Error, - (FARPROC)WHD_ErrorString, - (FARPROC)WHD_GetInfo, - (FARPROC)WHD_API +const struct winhelp_callbacks Callbacks = +{ + WHD_GetFSError, + WHD_Open, + WHD_Close, + WHD_OpenBag, + WHD_CloseBag, + WHD_ReadBag, + WHD_TellBag, + WHD_SeekBag, + WHD_IsEofBag, + WHD_SizeBag, + WHD_Access, + WHD_LLInfoFromBag, + WHD_LLInfoFromFile, + WHD_Error, + WHD_ErrorString, + WHD_GetInfo, + WHD_API }; diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c index fdec6b3..9fa99ec 100644 --- a/programs/winhlp32/macro.c +++ b/programs/winhlp32/macro.c @@ -735,7 +735,7 @@ static void CALLBACK MACRO_RegisterRoutine(LPCSTR dll_name, LPCSTR proc, LPCSTR dll->class = dll->handler ? (dll->handler)(DW_WHATMSG, 0, 0) : DC_NOMSG; WINE_TRACE("Got class %x for DLL %s\n", dll->class, dll_name); if (dll->class & DC_INITTERM) dll->handler(DW_INIT, 0, 0); - if (dll->class & DC_CALLBACKS) dll->handler(DW_CALLBACKS, (DWORD)Callbacks, 0); + if (dll->class & DC_CALLBACKS) dll->handler(DW_CALLBACKS, (LONG_PTR)&Callbacks, 0); } else WINE_WARN("OOM\n"); } diff --git a/programs/winhlp32/winhelp.h b/programs/winhlp32/winhelp.h index e770cb5..e163d90 100644 --- a/programs/winhlp32/winhelp.h +++ b/programs/winhlp32/winhelp.h @@ -115,7 +115,7 @@ typedef struct tagWinHelp #define DW_ACTIVATE 9 #define DW_CALLBACKS 10 -typedef long (CALLBACK *WINHELP_LDLLHandler)(WORD, LONG, LONG); +typedef LONG (CALLBACK *WINHELP_LDLLHandler)(WORD, LONG_PTR, LONG_PTR); typedef struct tagDll { @@ -140,8 +140,28 @@ typedef struct HFONT hButtonFont; } WINHELP_GLOBALS; +extern const struct winhelp_callbacks +{ + WORD (WINAPI *GetFSError)(void); + HANDLE (WINAPI *HfsOpenSz)(LPSTR,BYTE); + WORD (WINAPI *RcCloseHfs)(HANDLE); + HANDLE (WINAPI *HfOpenHfs)(HANDLE,LPSTR,BYTE); + HANDLE (WINAPI *RcCloseHf)(HANDLE); + LONG (WINAPI *LcbReadHf)(HANDLE,BYTE*,LONG); + LONG (WINAPI *LTellHf)(HANDLE); + LONG (WINAPI *LSeekHf)(HANDLE,LONG,WORD); + BOOL (WINAPI *FEofHf)(HANDLE); + LONG (WINAPI *LcbSizeHf)(HANDLE); + BOOL (WINAPI *FAccessHfs)(HANDLE,LPSTR,BYTE); + WORD (WINAPI *RcLLInfoFromHf)(HANDLE,WORD,LPWORD,LPLONG,LPLONG); + WORD (WINAPI *RcLLInfoFromHfs)(HANDLE,LPSTR,WORD,LPWORD,LPLONG,LPLONG); + void (WINAPI *ErrorW)(int); + void (WINAPI *ErrorSz)(LPSTR); + ULONG_PTR (WINAPI *GetInfo)(WORD,HWND); + LONG (WINAPI *API)(LPSTR,WORD,DWORD); +} Callbacks; + extern WINHELP_GLOBALS Globals; -extern FARPROC Callbacks[]; BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE*, int, BOOL); BOOL WINHELP_OpenHelpWindow(HLPFILE_PAGE* (*)(HLPFILE*, LONG, ULONG*),

1 0

Ge van Geldorp : mapi32/tests: Skip tests if no default email client is installed.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 61c69e55e4ba2ce7b6d1056b2669fef5cfd4b361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61c69e55e4ba2ce7b6d1056b2… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Sep 17 00:00:00 2001 +0200 mapi32/tests: Skip tests if no default email client is installed. --- dlls/mapi32/tests/Makefile.in | 2 +- dlls/mapi32/tests/imalloc.c | 7 ++++ dlls/mapi32/tests/mapi32_test.h | 62 +++++++++++++++++++++++++++++++++++++++ dlls/mapi32/tests/prop.c | 7 ++++ dlls/mapi32/tests/util.c | 7 ++++ 5 files changed, 84 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/tests/Makefile.in b/dlls/mapi32/tests/Makefile.in index 6c4482e..bd3c1a1 100644 --- a/dlls/mapi32/tests/Makefile.in +++ b/dlls/mapi32/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = mapi32.dll -IMPORTS = kernel32 +IMPORTS = advapi32 kernel32 CTESTS = \ imalloc.c \ diff --git a/dlls/mapi32/tests/imalloc.c b/dlls/mapi32/tests/imalloc.c index ec7557b..485180c 100644 --- a/dlls/mapi32/tests/imalloc.c +++ b/dlls/mapi32/tests/imalloc.c @@ -26,6 +26,7 @@ #include "winerror.h" #include "winnt.h" #include "mapiutil.h" +#include "mapi32_test.h" static HMODULE hMapi32 = 0; @@ -88,6 +89,12 @@ START_TEST(imalloc) { SCODE ret; + if (!HaveDefaultMailClient()) + { + win_skip("No default mail client installed\n"); + return; + } + hMapi32 = LoadLibraryA("mapi32.dll"); pScInitMapiUtil = (void*)GetProcAddress(hMapi32, "ScInitMapiUtil(a)4"); diff --git a/dlls/mapi32/tests/mapi32_test.h b/dlls/mapi32/tests/mapi32_test.h new file mode 100644 index 0000000..5002dbc --- /dev/null +++ b/dlls/mapi32/tests/mapi32_test.h @@ -0,0 +1,62 @@ +/* + * 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 + */ + +/* + * Return FALSE if no default mail client is installed. + */ +static BOOL HaveDefaultMailClient(void) +{ + HKEY Key; + DWORD Type, Size; + BYTE Buffer[64]; + BOOL HasHKCUKey; + + /* We check the default value of both HKCU\Software\Clients\Mail and + * HKLM\Software\Clients\Mail, if one of them is present there is a default + * mail client. If neither of these keys is present, we might be running + * on an old Windows version (W95, NT4) and we assume a default mail client + * might be available. Only if one of the keys is present, but there is + * no default value do we assume there is no default client. */ + if (RegOpenKeyExA(HKEY_CURRENT_USER, "SOFTWARE\\Clients\\Mail", 0, KEY_QUERY_VALUE, &Key) == ERROR_SUCCESS) + { + Size = sizeof(Buffer); + /* Any return value besides ERROR_FILE_NOT_FOUND (including success, + ERROR_MORE_DATA) indicates the value is present */ + if (RegQueryValueExA(Key, NULL, NULL, &Type, Buffer, &Size) != ERROR_FILE_NOT_FOUND) + { + RegCloseKey(Key); + return TRUE; + } + RegCloseKey(Key); + HasHKCUKey = TRUE; + } + else + HasHKCUKey = FALSE; + + if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Clients\\Mail", 0, KEY_QUERY_VALUE, &Key) == ERROR_SUCCESS) + { + Size = sizeof(Buffer); + if (RegQueryValueExA(Key, NULL, NULL, &Type, Buffer, &Size) != ERROR_FILE_NOT_FOUND) + { + RegCloseKey(Key); + return TRUE; + } + RegCloseKey(Key); + return FALSE; + } + + return ! HasHKCUKey; +} diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index 8f4ff1e..237134b 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -27,6 +27,7 @@ #include "initguid.h" #include "mapiutil.h" #include "mapitags.h" +#include "mapi32_test.h" static HMODULE hMapi32 = 0; @@ -1360,6 +1361,12 @@ START_TEST(prop) { SCODE ret; + if (!HaveDefaultMailClient()) + { + win_skip("No default mail client installed\n"); + return; + } + if(!InitFuncPtrs()) { win_skip("Needed functions are not available\n"); diff --git a/dlls/mapi32/tests/util.c b/dlls/mapi32/tests/util.c index af4fc57..feb2c6d 100644 --- a/dlls/mapi32/tests/util.c +++ b/dlls/mapi32/tests/util.c @@ -26,6 +26,7 @@ #include "winnt.h" #include "mapiutil.h" #include "mapitags.h" +#include "mapi32_test.h" static HMODULE hMapi32 = 0; @@ -172,6 +173,12 @@ START_TEST(util) { SCODE ret; + if (!HaveDefaultMailClient()) + { + win_skip("No default mail client installed\n"); + return; + } + hMapi32 = LoadLibraryA("mapi32.dll"); pScInitMapiUtil = (void*)GetProcAddress(hMapi32, "ScInitMapiUtil(a)4");

1 0

Alexandre Julliard : advapi32: Use strict prototypes in the VTableProvStruc definition.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: a54bd70bac52e8901be77b23a62d5ec35a0f8ab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a54bd70bac52e8901be77b23a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 7 13:31:12 2009 +0200 advapi32: Use strict prototypes in the VTableProvStruc definition. --- dlls/advapi32/crypt.c | 11 ++++------- include/wincrypt.h | 9 +++++++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index d1fc25d..a26770e 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -182,12 +182,9 @@ static BOOL CALLBACK CRYPT_VerifyImage(LPCSTR lpszImage, BYTE* pData) return TRUE; } -static BOOL CALLBACK CRYPT_ReturnhWnd(HWND *phWnd) +static void CALLBACK CRYPT_ReturnhWnd(HWND *phWnd) { - if (!phWnd) - return FALSE; - *phWnd = crypt_hWindow; - return TRUE; + if (phWnd) *phWnd = crypt_hWindow; } #define CRYPT_GetProvFunc(name) \ @@ -242,8 +239,8 @@ static PCRYPTPROV CRYPT_LoadProvider(PCWSTR pImage) * Does it need memory allocation? */ provider->pVTable->Version = 3; - provider->pVTable->pFuncVerifyImage = (FARPROC)CRYPT_VerifyImage; - provider->pVTable->pFuncReturnhWnd = (FARPROC)CRYPT_ReturnhWnd; + provider->pVTable->FuncVerifyImage = CRYPT_VerifyImage; + provider->pVTable->FuncReturnhWnd = CRYPT_ReturnhWnd; provider->pVTable->dwProvType = 0; provider->pVTable->pbContextInfo = NULL; provider->pVTable->cbContextInfo = 0; diff --git a/include/wincrypt.h b/include/wincrypt.h index 067dd7c..0aef72e 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -680,8 +680,13 @@ typedef struct _CRYPT_SMIME_CAPABILITIES { typedef struct _VTableProvStruc { DWORD Version; - FARPROC pFuncVerifyImage; - FARPROC pFuncReturnhWnd; +#ifdef WINE_STRICT_PROTOTYPES + BOOL (WINAPI *FuncVerifyImage)(LPCSTR,BYTE*); + void (WINAPI *FuncReturnhWnd)(HWND*); +#else + FARPROC FuncVerifyImage; + FARPROC FuncReturnhWnd; +#endif DWORD dwProvType; BYTE *pbContextInfo; DWORD cbContextInfo;

1 0

Paul Vriens : kernel32/tests: Don't crash on WinMe.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 6d416e6934c707a6962cd48702e49da1b675cc6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d416e6934c707a6962cd4870… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 7 12:05:00 2009 +0200 kernel32/tests: Don't crash on WinMe. --- dlls/kernel32/tests/module.c | 36 ++++++++++++++++++++++-------------- 1 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 374a18e..4cb30a8 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -228,13 +228,18 @@ static void testLoadLibraryEx(void) ok(hfile != INVALID_HANDLE_VALUE, "Expected a valid file handle\n"); /* NULL lpFileName */ - SetLastError(0xdeadbeef); - hmodule = LoadLibraryExA(NULL, NULL, 0); - ok(hmodule == 0, "Expected 0, got %p\n", hmodule); - ok(GetLastError() == ERROR_MOD_NOT_FOUND || - GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */ - "Expected ERROR_MOD_NOT_FOUND or ERROR_INVALID_PARAMETER, got %d\n", - GetLastError()); + if (is_unicode_enabled) + { + SetLastError(0xdeadbeef); + hmodule = LoadLibraryExA(NULL, NULL, 0); + ok(hmodule == 0, "Expected 0, got %p\n", hmodule); + ok(GetLastError() == ERROR_MOD_NOT_FOUND || + GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */ + "Expected ERROR_MOD_NOT_FOUND or ERROR_INVALID_PARAMETER, got %d\n", + GetLastError()); + } + else + win_skip("NULL filename crashes on WinMe\n"); /* empty lpFileName */ SetLastError(0xdeadbeef); @@ -281,13 +286,16 @@ static void testLoadLibraryEx(void) } /* lpFileName does not matter */ - SetLastError(0xdeadbeef); - hmodule = LoadLibraryExA(NULL, hfile, 0); - ok(hmodule == 0, "Expected 0, got %p\n", hmodule); - ok(GetLastError() == ERROR_MOD_NOT_FOUND || - GetLastError() == ERROR_INVALID_PARAMETER, /* win2k3 */ - "Expected ERROR_MOD_NOT_FOUND or ERROR_INVALID_PARAMETER, got %d\n", - GetLastError()); + if (is_unicode_enabled) + { + SetLastError(0xdeadbeef); + hmodule = LoadLibraryExA(NULL, hfile, 0); + ok(hmodule == 0, "Expected 0, got %p\n", hmodule); + ok(GetLastError() == ERROR_MOD_NOT_FOUND || + GetLastError() == ERROR_INVALID_PARAMETER, /* win2k3 */ + "Expected ERROR_MOD_NOT_FOUND or ERROR_INVALID_PARAMETER, got %d\n", + GetLastError()); + } CloseHandle(hfile);

1 0