October 2009 - Wine-commits

Francois Gouget : ws2_32: Make wsaErrno() and wsaHerrno() static.
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: 78d413d4246811df77630c182d8caddf6bbd69e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78d413d4246811df77630c182… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Oct 7 14:49:17 2009 +0200 ws2_32: Make wsaErrno() and wsaHerrno() static. --- dlls/ws2_32/socket.c | 189 ++++++++++++++++++++++++------------------------- 1 files changed, 93 insertions(+), 96 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fdc7aec..7c81bc9 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -288,9 +288,6 @@ static struct WS_servent *WS_dup_se(const struct servent* p_se); int WSAIOCTL_GetInterfaceCount(void); int WSAIOCTL_GetInterfaceName(int intNumber, char *intName); -UINT wsaErrno(void); -UINT wsaHerrno(int errnr); - #define MAP_OPTION(opt) { WS_##opt, opt } static const int ws_sock_map[][2] = @@ -415,6 +412,99 @@ static const int ws_eai_map[][2] = static const char magic_loopback_addr[] = {127, 12, 34, 56}; +/* ----------------------------------- error handling */ + +static UINT wsaErrno(void) +{ + int loc_errno = errno; + WARN("errno %d, (%s).\n", loc_errno, strerror(loc_errno)); + + switch(loc_errno) + { + case EINTR: return WSAEINTR; + case EBADF: return WSAEBADF; + case EPERM: + case EACCES: return WSAEACCES; + case EFAULT: return WSAEFAULT; + case EINVAL: return WSAEINVAL; + case EMFILE: return WSAEMFILE; + case EWOULDBLOCK: return WSAEWOULDBLOCK; + case EINPROGRESS: return WSAEINPROGRESS; + case EALREADY: return WSAEALREADY; + case ENOTSOCK: return WSAENOTSOCK; + case EDESTADDRREQ: return WSAEDESTADDRREQ; + case EMSGSIZE: return WSAEMSGSIZE; + case EPROTOTYPE: return WSAEPROTOTYPE; + case ENOPROTOOPT: return WSAENOPROTOOPT; + case EPROTONOSUPPORT: return WSAEPROTONOSUPPORT; + case ESOCKTNOSUPPORT: return WSAESOCKTNOSUPPORT; + case EOPNOTSUPP: return WSAEOPNOTSUPP; + case EPFNOSUPPORT: return WSAEPFNOSUPPORT; + case EAFNOSUPPORT: return WSAEAFNOSUPPORT; + case EADDRINUSE: return WSAEADDRINUSE; + case EADDRNOTAVAIL: return WSAEADDRNOTAVAIL; + case ENETDOWN: return WSAENETDOWN; + case ENETUNREACH: return WSAENETUNREACH; + case ENETRESET: return WSAENETRESET; + case ECONNABORTED: return WSAECONNABORTED; + case EPIPE: + case ECONNRESET: return WSAECONNRESET; + case ENOBUFS: return WSAENOBUFS; + case EISCONN: return WSAEISCONN; + case ENOTCONN: return WSAENOTCONN; + case ESHUTDOWN: return WSAESHUTDOWN; + case ETOOMANYREFS: return WSAETOOMANYREFS; + case ETIMEDOUT: return WSAETIMEDOUT; + case ECONNREFUSED: return WSAECONNREFUSED; + case ELOOP: return WSAELOOP; + case ENAMETOOLONG: return WSAENAMETOOLONG; + case EHOSTDOWN: return WSAEHOSTDOWN; + case EHOSTUNREACH: return WSAEHOSTUNREACH; + case ENOTEMPTY: return WSAENOTEMPTY; +#ifdef EPROCLIM + case EPROCLIM: return WSAEPROCLIM; +#endif +#ifdef EUSERS + case EUSERS: return WSAEUSERS; +#endif +#ifdef EDQUOT + case EDQUOT: return WSAEDQUOT; +#endif +#ifdef ESTALE + case ESTALE: return WSAESTALE; +#endif +#ifdef EREMOTE + case EREMOTE: return WSAEREMOTE; +#endif + + /* just in case we ever get here and there are no problems */ + case 0: return 0; + default: + WARN("Unknown errno %d!\n", loc_errno); + return WSAEOPNOTSUPP; + } +} + +static UINT wsaHerrno(int loc_errno) +{ + + WARN("h_errno %d.\n", loc_errno); + + switch(loc_errno) + { + case HOST_NOT_FOUND: return WSAHOST_NOT_FOUND; + case TRY_AGAIN: return WSATRY_AGAIN; + case NO_RECOVERY: return WSANO_RECOVERY; + case NO_DATA: return WSANO_DATA; + case ENOBUFS: return WSAENOBUFS; + + case 0: return 0; + default: + WARN("Unknown h_errno %d!\n", loc_errno); + return WSAEOPNOTSUPP; + } +} + static inline DWORD NtStatusToWSAError( const DWORD status ) { /* We only need to cover the status codes set by server async request handling */ @@ -4423,99 +4513,6 @@ static struct WS_servent *WS_dup_se(const struct servent* p_se) return p_to; } -/* ----------------------------------- error handling */ - -UINT wsaErrno(void) -{ - int loc_errno = errno; - WARN("errno %d, (%s).\n", loc_errno, strerror(loc_errno)); - - switch(loc_errno) - { - case EINTR: return WSAEINTR; - case EBADF: return WSAEBADF; - case EPERM: - case EACCES: return WSAEACCES; - case EFAULT: return WSAEFAULT; - case EINVAL: return WSAEINVAL; - case EMFILE: return WSAEMFILE; - case EWOULDBLOCK: return WSAEWOULDBLOCK; - case EINPROGRESS: return WSAEINPROGRESS; - case EALREADY: return WSAEALREADY; - case ENOTSOCK: return WSAENOTSOCK; - case EDESTADDRREQ: return WSAEDESTADDRREQ; - case EMSGSIZE: return WSAEMSGSIZE; - case EPROTOTYPE: return WSAEPROTOTYPE; - case ENOPROTOOPT: return WSAENOPROTOOPT; - case EPROTONOSUPPORT: return WSAEPROTONOSUPPORT; - case ESOCKTNOSUPPORT: return WSAESOCKTNOSUPPORT; - case EOPNOTSUPP: return WSAEOPNOTSUPP; - case EPFNOSUPPORT: return WSAEPFNOSUPPORT; - case EAFNOSUPPORT: return WSAEAFNOSUPPORT; - case EADDRINUSE: return WSAEADDRINUSE; - case EADDRNOTAVAIL: return WSAEADDRNOTAVAIL; - case ENETDOWN: return WSAENETDOWN; - case ENETUNREACH: return WSAENETUNREACH; - case ENETRESET: return WSAENETRESET; - case ECONNABORTED: return WSAECONNABORTED; - case EPIPE: - case ECONNRESET: return WSAECONNRESET; - case ENOBUFS: return WSAENOBUFS; - case EISCONN: return WSAEISCONN; - case ENOTCONN: return WSAENOTCONN; - case ESHUTDOWN: return WSAESHUTDOWN; - case ETOOMANYREFS: return WSAETOOMANYREFS; - case ETIMEDOUT: return WSAETIMEDOUT; - case ECONNREFUSED: return WSAECONNREFUSED; - case ELOOP: return WSAELOOP; - case ENAMETOOLONG: return WSAENAMETOOLONG; - case EHOSTDOWN: return WSAEHOSTDOWN; - case EHOSTUNREACH: return WSAEHOSTUNREACH; - case ENOTEMPTY: return WSAENOTEMPTY; -#ifdef EPROCLIM - case EPROCLIM: return WSAEPROCLIM; -#endif -#ifdef EUSERS - case EUSERS: return WSAEUSERS; -#endif -#ifdef EDQUOT - case EDQUOT: return WSAEDQUOT; -#endif -#ifdef ESTALE - case ESTALE: return WSAESTALE; -#endif -#ifdef EREMOTE - case EREMOTE: return WSAEREMOTE; -#endif - - /* just in case we ever get here and there are no problems */ - case 0: return 0; - default: - WARN("Unknown errno %d!\n", loc_errno); - return WSAEOPNOTSUPP; - } -} - -UINT wsaHerrno(int loc_errno) -{ - - WARN("h_errno %d.\n", loc_errno); - - switch(loc_errno) - { - case HOST_NOT_FOUND: return WSAHOST_NOT_FOUND; - case TRY_AGAIN: return WSATRY_AGAIN; - case NO_RECOVERY: return WSANO_RECOVERY; - case NO_DATA: return WSANO_DATA; - case ENOBUFS: return WSAENOBUFS; - - case 0: return 0; - default: - WARN("Unknown h_errno %d!\n", loc_errno); - return WSAEOPNOTSUPP; - } -} - /*********************************************************************** * WSARecv (WS2_32.67)

1 0

Henri Verbeet : d3d8: Use separate fields for data to check/ apply in the stateblock tests.
by Alexandre Julliard 07 Oct '09

07 Oct '09

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

Henri Verbeet : d3d9: Use separate fields for data to check/ apply in the stateblock tests.
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: 3cb7e872845ad8627ae4b844485a36c5a81f4c69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cb7e872845ad8627ae4b8444… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 09:02:57 2009 +0200 d3d9: Use separate fields for data to check/apply in the stateblock tests. --- dlls/d3d9/tests/stateblock.c | 140 +++++++++++++++++++++++------------------- 1 files changed, 77 insertions(+), 63 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index 5479bb8..5a22b4a 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -139,13 +139,8 @@ struct state_test void* test_context; }; -/* 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 { @@ -154,12 +149,43 @@ struct event_data IDirect3DSwapChain9 *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)(IDirect3DDevice9 *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 */ @@ -167,51 +193,39 @@ struct event static void execute_test_chain(IDirect3DDevice9 *device, struct state_test *test, unsigned int ntests, struct event *event, unsigned int nevents, struct event_data *event_data) { - int outcome; - unsigned int i = 0, j; + unsigned int i, j; /* For each queued event */ - for (j=0; j < nevents; j++) { + for (j = 0; j < nevents; ++j) + { + const void *data; - /* Execute the next event handler (if available) or just set the supplied status */ - outcome = event[j].status; + /* Execute the next event handler (if available). */ 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) { - 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 | EVENT_CHECK_DEFAULT | 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) { - for (i=0; i < ntests; i++) - test[i].set_handler(device, &test[i], test[i].test_data_in); + if (event[j].apply != SB_DATA_NONE) + { + for (i = 0; i < ntests; ++i) + { + data = get_event_data(&test[i], event[j].apply); + test[i].set_handler(device, &test[i], data); + } } } @@ -341,51 +355,51 @@ static void execute_test_chain_all(IDirect3DDevice9 *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

Henri Verbeet : d3d8: Rename abort_stateblock() to delete_stateblock() in the stateblock tests.
by Alexandre Julliard 07 Oct '09

07 Oct '09

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 : Fix empty function prototypes.
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: fa6ffb4d5d61581ded02e144cc0c8d7d015b995f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa6ffb4d5d61581ded02e144c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 7 12:24:53 2009 +0200 Fix empty function prototypes. --- dlls/d3dx9_36/tests/texture.c | 2 +- dlls/imm32/tests/imm32.c | 2 +- dlls/mscms/tests/profile.c | 4 ++-- dlls/msctf/tests/inputprocessor.c | 2 +- dlls/msi/tests/msi.c | 2 +- dlls/msxml3/msxml_private.h | 2 +- dlls/winedos/relay.c | 2 +- dlls/winex11.drv/x11drv.h | 2 +- loader/preloader.c | 2 +- programs/secedit/main.c | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 7f10e2d..7e4fdae 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -78,7 +78,7 @@ static HRESULT create_file(const char *filename, const unsigned char *data, cons return D3DERR_INVALIDCALL; } -static void test_D3DXGetImageInfo() +static void test_D3DXGetImageInfo(void) { HRESULT hr; D3DXIMAGE_INFO info; diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 7b76226..ccbbc06 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -118,7 +118,7 @@ static void msg_spy_init(HWND hwnd) { msg_spy_flush_msgs(); } -static void msg_spy_cleanup() { +static void msg_spy_cleanup(void) { if (msg_spy.get_msg_hook) UnhookWindowsHookEx(msg_spy.get_msg_hook); if (msg_spy.call_wnd_proc_hook) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 4f71789..470e10e 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -453,7 +453,7 @@ static void test_GetCountColorProfileElements(void) } } -static void test_GetStandardColorSpaceProfileA() +static void test_GetStandardColorSpaceProfileA(void) { BOOL ret; DWORD size; @@ -533,7 +533,7 @@ static void test_GetStandardColorSpaceProfileA() ok( ret, "SetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); } -static void test_GetStandardColorSpaceProfileW() +static void test_GetStandardColorSpaceProfileW(void) { BOOL ret; DWORD size; diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index ffbdbad..edf5cc0 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -770,7 +770,7 @@ static HRESULT RegisterTextService(REFCLSID rclsid) return CoRegisterClassObject(rclsid, (IUnknown*) cf, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &regid); } -static HRESULT UnregisterTextService() +static HRESULT UnregisterTextService(void) { return CoRevokeClassObject(regid); } diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index fdbb253..f25d580 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -8510,7 +8510,7 @@ static void test_MsiEnumPatchesEx_userunmanaged(LPCSTR usersid, LPCSTR expecteds RegCloseKey(prodkey); } -static void test_MsiEnumPatchesEx_machine() +static void test_MsiEnumPatchesEx_machine(void) { CHAR keypath[MAX_PATH], patch[MAX_PATH]; CHAR patch_squashed[MAX_PATH], patchcode[MAX_PATH]; diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index c4568f4..4a991ae 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -118,7 +118,7 @@ extern IUnknown *create_comment( xmlNodePtr comment ); extern IUnknown *create_cdata( xmlNodePtr text ); extern IXMLDOMNodeList *create_children_nodelist( xmlNodePtr ); extern IXMLDOMNamedNodeMap *create_nodemap( IXMLDOMNode *node ); -extern IUnknown *create_doc_Implementation(); +extern IUnknown *create_doc_Implementation(void); extern IUnknown *create_doc_fragment( xmlNodePtr fragment ); extern IUnknown *create_doc_entity_ref( xmlNodePtr entity ); diff --git a/dlls/winedos/relay.c b/dlls/winedos/relay.c index 39978fa..acadd77 100644 --- a/dlls/winedos/relay.c +++ b/dlls/winedos/relay.c @@ -167,7 +167,7 @@ void DOSVM_RelayHandler( CONTEXT86 *context ) */ void DOSVM_BuildCallFrame( CONTEXT86 *context, DOSRELAY relay, LPVOID data ) { - static void (*__wine_call_from_16_regs_ptr)(); + static void (*__wine_call_from_16_regs_ptr)(void); WORD code_sel = DOSVM_dpmi_segments->relay_code_sel; /* diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 922855d..3faffdf 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -300,7 +300,7 @@ extern BOOL destroy_glxpixmap(Display *display, XID glxpixmap); /* IME support */ extern void IME_UnregisterClasses(void); extern void IME_SetOpenStatus(BOOL fOpen); -extern INT IME_GetCursorPos(); +extern INT IME_GetCursorPos(void); extern void IME_SetCursorPos(DWORD pos); extern void IME_UpdateAssociation(HWND focus); extern BOOL IME_SetCompositionString(DWORD dwIndex, LPCVOID lpComp, diff --git a/loader/preloader.c b/loader/preloader.c index 087d04b..9f9b083 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -192,7 +192,7 @@ struct * It calls wld_start, passing a pointer to the args it receives * then jumps to the address wld_start returns. */ -void _start(); +void _start(void); extern char _end[]; __ASM_GLOBAL_FUNC(_start, "\tmovl $243,%eax\n" /* SYS_set_thread_area */ diff --git a/programs/secedit/main.c b/programs/secedit/main.c index 878adc9..597db5a 100644 --- a/programs/secedit/main.c +++ b/programs/secedit/main.c @@ -16,7 +16,7 @@ #include <stdlib.h> -int main() +int main( int argc, char *argv[] ) { return 0; }

1 0

Dmitry Timoshkov : gdi32: Rework the test for too large width/ height font ratio to pass with different font heights, make it pass under Wine.
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: 21589993826cdb1cb2f87ceb94c8a188bd4a3090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21589993826cdb1cb2f87ceb9… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Oct 7 17:50:32 2009 +0900 gdi32: Rework the test for too large width/height font ratio to pass with different font heights, make it pass under Wine. --- dlls/gdi32/freetype.c | 16 ++++++--- dlls/gdi32/tests/font.c | 87 ++++++++++++++++++++-------------------------- 2 files changed, 49 insertions(+), 54 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 4723be9..9b5f44f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5430,12 +5430,18 @@ BOOL WineEngGetTextMetrics(GdiFont *font, LPTEXTMETRICW ptm) LeaveCriticalSection( &freetype_cs ); return FALSE; } + + /* Make sure that the font has sane width/height ratio */ + if (font->aveWidth) + { + if ((font->aveWidth + font->potm->otmTextMetrics.tmHeight - 1) / font->potm->otmTextMetrics.tmHeight > 100) + { + WARN("Ignoring too large font->aveWidth %d\n", font->aveWidth); + font->aveWidth = 0; + } + } } - if(!font->potm) - { - LeaveCriticalSection( &freetype_cs ); - return FALSE; - } + *ptm = font->potm->otmTextMetrics; scale_font_metrics(font, ptm); LeaveCriticalSection( &freetype_cs ); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 3d0e81d..b67670f 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2920,14 +2920,13 @@ static void test_GetGlyphOutline(void) } /* bug #9995: there is a limit to the character width that can be specified */ -static void test_GetTextMetrics2( const char *fontname) +static void test_GetTextMetrics2(const char *fontname, int font_height) { HFONT of, hf; HDC hdc; TEXTMETRICA tm; - LOGFONTA lf; BOOL ret; - int avecharw[3], maxcharw[3]; + int ave_width, height, width, ratio, scale; if (!is_truetype_font_installed( fontname)) { skip("%s is not installed\n", fontname); @@ -2936,60 +2935,46 @@ static void test_GetTextMetrics2( const char *fontname) hdc = CreateCompatibleDC(0); ok( hdc != NULL, "CreateCompatibleDC failed\n"); /* select width = 0 */ - hf = CreateFontA( -11, 0, 0, 0, FW_REGULAR, FALSE, FALSE, FALSE, - DEFAULT_CHARSET, OUT_TT_PRECIS, CLIP_LH_ANGLES, - DEFAULT_QUALITY, VARIABLE_PITCH, - fontname); - ok( hf != NULL, "CreateFontA failed\n"); - of = SelectObject( hdc, hf); - ret = GetObjectA( hf, sizeof( lf), &lf); - ret = GetTextMetricsA( hdc, &tm); - ok(ret, "GetTextMetricsA error %u\n", GetLastError()); - avecharw[0] =tm.tmAveCharWidth; - maxcharw[0] =tm.tmMaxCharWidth; - SelectObject( hdc, of); - DeleteObject( hf); - /* select LARGE width = 1023 */ - hf = CreateFontA( -11, 1023, 0, 0, FW_REGULAR, FALSE, FALSE, FALSE, + hf = CreateFontA(font_height, 0, 0, 0, FW_REGULAR, FALSE, FALSE, FALSE, DEFAULT_CHARSET, OUT_TT_PRECIS, CLIP_LH_ANGLES, DEFAULT_QUALITY, VARIABLE_PITCH, fontname); ok( hf != NULL, "CreateFontA failed\n"); of = SelectObject( hdc, hf); - ret = GetObjectA( hf, sizeof( lf), &lf); ret = GetTextMetricsA( hdc, &tm); ok(ret, "GetTextMetricsA error %u\n", GetLastError()); - avecharw[1] =tm.tmAveCharWidth; - maxcharw[1] =tm.tmMaxCharWidth; + height = tm.tmHeight; + ave_width = tm.tmAveCharWidth; SelectObject( hdc, of); DeleteObject( hf); - /* select TOOLARGE width = 1536 */ - hf = CreateFontA( -11, 1536, 0, 0, FW_REGULAR, FALSE, FALSE, FALSE, - DEFAULT_CHARSET, OUT_TT_PRECIS, CLIP_LH_ANGLES, - DEFAULT_QUALITY, VARIABLE_PITCH, - fontname); - ok( hf != NULL, "CreateFontA failed\n"); - of = SelectObject( hdc, hf); - ret = GetObjectA( hf, sizeof( lf), &lf); - ret = GetTextMetricsA( hdc, &tm); - ok(ret, "GetTextMetricsA error %u\n", GetLastError()); - avecharw[2] =tm.tmAveCharWidth; - maxcharw[2] =tm.tmMaxCharWidth; - SelectObject( hdc, of); - DeleteObject( hf); - /* tests */ - ok( avecharw[1] > 10 * avecharw[0], "Av. charwidth not large ( %d cmp.to %d)\n", - avecharw[1], avecharw[0]); - ok( maxcharw[1] > 10 * maxcharw[0], "Max charwidth not large ( %d cmp.to %d)\n", - maxcharw[1], maxcharw[0]); -todo_wine { - ok( avecharw[2] == avecharw[0], "Unexpected Av. charwidth ( %d cmp.to %d)\n", - avecharw[2], avecharw[0]); - ok( maxcharw[2] == maxcharw[0], "Unexpected Max charwidth ( %d cmp.to %d)\n", - maxcharw[2], maxcharw[0]); -} - /* clean up */ + + trace("height %d, ave width %d\n", height, ave_width); + + for (width = ave_width * 2; /* nothing*/; width += ave_width) + { + hf = CreateFont(height, width, 0, 0, FW_REGULAR, FALSE, FALSE, FALSE, + DEFAULT_CHARSET, OUT_TT_PRECIS, CLIP_LH_ANGLES, + DEFAULT_QUALITY, VARIABLE_PITCH, fontname); + ok(hf != 0, "CreateFont failed\n"); + of = SelectObject(hdc, hf); + ret = GetTextMetrics(hdc, &tm); + ok(ret, "GetTextMetrics error %u\n", GetLastError()); + SelectObject(hdc, of); + DeleteObject(hf); + + if (tm.tmAveCharWidth == ave_width || width / height > 200) + break; + } + DeleteDC(hdc); + + ratio = width / height; + scale = width / ave_width; + + trace("max width/height ratio (%d / %d) %d, max width scale (%d / %d) %d\n", + width, height, ratio, width, ave_width, scale); + + ok(ratio >= 90 && ratio <= 110, "expected width/height ratio 90-110, got %d\n", ratio); } START_TEST(font) @@ -3029,6 +3014,10 @@ START_TEST(font) test_GdiRealizationInfo(); test_GetTextFace(); test_GetGlyphOutline(); - test_GetTextMetrics2( "Tahoma"); - test_GetTextMetrics2( "Arial"); + test_GetTextMetrics2("Tahoma", -11); + test_GetTextMetrics2("Tahoma", -55); + test_GetTextMetrics2("Tahoma", -110); + test_GetTextMetrics2("Arial", -11); + test_GetTextMetrics2("Arial", -55); + test_GetTextMetrics2("Arial", -110); }

1 0

Rein Klazes : comdlg32: Make explorer type file dialogs without custom template or hook proc resizable .
by Alexandre Julliard 07 Oct '09

07 Oct '09

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 07 Oct '09

07 Oct '09

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

Ge van Geldorp : mapi32/tests: Skip tests if no default email client is installed.
by Alexandre Julliard 07 Oct '09

07 Oct '09

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

Paul Vriens : kernel32/tests: Don't crash on WinMe.
by Alexandre Julliard 07 Oct '09

07 Oct '09

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