December 2012 - Wine-commits

Ken Thomases : winemac.drv: Implement GetMonitorInfo.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: d8a0da9d8f28cb5aad99c35aa7398b77b1e9dd04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a0da9d8f28cb5aad99c35aa… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 20 19:02:32 2012 -0600 winemac.drv: Implement GetMonitorInfo. --- dlls/winemac.drv/display.c | 51 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 1b791e4..a1bea38 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -105,3 +105,54 @@ BOOL CDECL macdrv_EnumDisplayMonitors(HDC hdc, LPRECT rect, MONITORENUMPROC proc return ret; } + + +/*********************************************************************** + * GetMonitorInfo (MACDRV.@) + */ +BOOL CDECL macdrv_GetMonitorInfo(HMONITOR monitor, LPMONITORINFO info) +{ + static const WCHAR adapter_name[] = { '\\','\\','.','\\','D','I','S','P','L','A','Y','1',0 }; + struct macdrv_display *displays; + int num_displays; + CGDirectDisplayID display_id; + int i; + + TRACE("%p, %p\n", monitor, info); + + if (macdrv_get_displays(&displays, &num_displays)) + { + ERR("couldn't get display list\n"); + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + + display_id = monitor_to_display_id(monitor); + for (i = 0; i < num_displays; i++) + { + if (displays[i].displayID == display_id) + break; + } + + if (i < num_displays) + { + info->rcMonitor = rect_from_cgrect(displays[i].frame); + info->rcWork = rect_from_cgrect(displays[i].work_frame); + + info->dwFlags = (i == 0) ? MONITORINFOF_PRIMARY : 0; + + if (info->cbSize >= sizeof(MONITORINFOEXW)) + lstrcpyW(((MONITORINFOEXW*)info)->szDevice, adapter_name); + + TRACE(" -> rcMonitor %s rcWork %s dwFlags %08x\n", wine_dbgstr_rect(&info->rcMonitor), + wine_dbgstr_rect(&info->rcWork), info->dwFlags); + } + else + { + ERR("invalid monitor handle\n"); + SetLastError(ERROR_INVALID_HANDLE); + } + + macdrv_free_displays(displays); + return (i < num_displays); +} diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 25b43e0..03fa490 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -5,3 +5,4 @@ # USER driver @ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors +@ cdecl GetMonitorInfo(long ptr) macdrv_GetMonitorInfo

1 0

Nikolay Sivov : xmllite: Shrink buffer when enough data processed.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: beffac006ce867c51da145ec28648432eaa9fb66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beffac006ce867c51da145ec2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 21 09:35:30 2012 +0400 xmllite: Shrink buffer when enough data processed. --- dlls/xmllite/reader.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 9e32216..38c7a5e 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -481,6 +481,7 @@ static void readerinput_switchencoding(xmlreaderinput *readerinput, xml_encoding { readerinput_grow(readerinput, len); memcpy(dest->data, src->cur, len); + dest->written += len*sizeof(WCHAR); readerinput->buffer->code_page = cp; return; } @@ -491,6 +492,22 @@ static void readerinput_switchencoding(xmlreaderinput *readerinput, xml_encoding MultiByteToWideChar(cp, 0, src->cur, len, ptr, dest_len); ptr[dest_len] = 0; readerinput->buffer->code_page = cp; + dest->written += dest_len*sizeof(WCHAR); +} + +/* shrinks parsed data a buffer begins with */ +static void reader_shrink(xmlreader *reader) +{ + encoded_buffer *buffer = &reader->input->buffer->utf16; + + /* avoid to move too often using threshold shrink length */ + if (buffer->cur - buffer->data > buffer->written / 2) + { + buffer->written -= buffer->cur - buffer->data; + memmove(buffer->data, buffer->cur, buffer->written); + buffer->cur = buffer->data; + *(WCHAR*)&buffer->cur[buffer->written] = 0; + } } static inline const WCHAR *reader_get_cur(xmlreader *reader) @@ -772,6 +789,7 @@ static HRESULT reader_parse_comment(xmlreader *reader) /* skip '<!--' */ reader_skipn(reader, 4); + reader_shrink(reader); ptr = start = reader_get_cur(reader); while (*ptr)

1 0

Ričardas Barkauskas : comctl32: Use index value if property sheet page isn't found.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: 379d492b12b25e16b7c83872658042bf99d30c55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=379d492b12b25e16b7c838726… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Fri Dec 21 19:06:45 2012 +0200 comctl32: Use index value if property sheet page isn't found. --- dlls/comctl32/propsheet.c | 40 +++++++++++++------------------------- dlls/comctl32/tests/propsheet.c | 2 +- 2 files changed, 15 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index b73c448..c3db7e3 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -168,7 +168,7 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg, int index, int skipdir, HPROPSHEETPAGE hpage); -static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE hpage, const PropSheetInfo* psInfo); +static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE hpage, const PropSheetInfo* psInfo, int original_index); static PADDING_INFO PROPSHEET_GetPaddingInfoWizard(HWND hwndDlg, const PropSheetInfo* psInfo); static BOOL PROPSHEET_DoCommand(HWND hwnd, WORD wID); static BOOL PROPSHEET_RemovePage(HWND hwndDlg, int index, HPROPSHEETPAGE hpage); @@ -1998,9 +1998,8 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg, HWND hwndTabControl = GetDlgItem(hwndDlg, IDC_TABCONTROL); TRACE("index %d, skipdir %d, hpage %p\n", index, skipdir, hpage); - /* hpage takes precedence over index */ - if (hpage != NULL) - index = PROPSHEET_GetPageIndex(hpage, psInfo); + + index = PROPSHEET_GetPageIndex(hpage, psInfo, index); if (index < 0 || index >= psInfo->nPages) { @@ -2331,13 +2330,8 @@ static BOOL PROPSHEET_RemovePage(HWND hwndDlg, if (!psInfo) { return FALSE; } - /* - * hpage takes precedence over index. - */ - if (hpage != 0) - { - index = PROPSHEET_GetPageIndex(hpage, psInfo); - } + + index = PROPSHEET_GetPageIndex(hpage, psInfo, index); /* Make sure that index is within range */ if (index < 0 || index >= psInfo->nPages) @@ -2652,26 +2646,20 @@ static BOOL PROPSHEET_RecalcPageSizes(HWND hwndDlg) * PROPSHEET_GetPageIndex * * Given a HPROPSHEETPAGE, returns the index of the corresponding page from - * the array of PropPageInfo. + * the array of PropPageInfo. If page is not found original index is used + * (page takes precedence over index). */ -static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE hpage, const PropSheetInfo* psInfo) +static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE page, const PropSheetInfo* psInfo, int original_index) { - BOOL found = FALSE; - int index = 0; + int index; - TRACE("hpage %p\n", hpage); - while ((index < psInfo->nPages) && (found == FALSE)) - { - if (psInfo->proppage[index].hpage == hpage) - found = TRUE; - else - index++; - } + TRACE("page %p index %d\n", page, original_index); - if (found == FALSE) - index = -1; + for (index = 0; index < psInfo->nPages; index++) + if (psInfo->proppage[index].hpage == page) + return index; - return index; + return original_index; } /****************************************************************************** diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 992b60f..f235791 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -821,7 +821,7 @@ if (0) ok(r == 4, "got %d\n", r); /* select page that can't be created */ - ret = SendMessageA(hdlg, PSM_SETCURSEL, 3, 0); + ret = SendMessageA(hdlg, PSM_SETCURSEL, 3, 1); ok(ret == TRUE, "got %d\n", ret); r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0);

1 0

Ričardas Barkauskas : comctl32: Avoid code duplication by reusing PROPSHEET_GetPageIndex.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: 2c8ea6ebff21428dc407d85af3f516083d544bd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c8ea6ebff21428dc407d85af… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Fri Dec 21 19:07:17 2012 +0200 comctl32: Avoid code duplication by reusing PROPSHEET_GetPageIndex. --- dlls/comctl32/propsheet.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index c3db7e3..f2c55ab 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2561,16 +2561,11 @@ static LRESULT PROPSHEET_IndexToHwnd(HWND hwndDlg, int iPageIndex) */ static LRESULT PROPSHEET_PageToIndex(HWND hwndDlg, HPROPSHEETPAGE hPage) { - int index; PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr); TRACE("(%p, %p)\n", hwndDlg, hPage); - for (index = 0; index < psInfo->nPages; index++) - if (psInfo->proppage[index].hpage == hPage) - return index; - WARN("%p not found\n", hPage); - return -1; + return PROPSHEET_GetPageIndex(hPage, psInfo, -1); } /******************************************************************************

1 0

André Hentschel : cacls: Print out arguments.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: 04f40b7059ef99238573152d6257df450e0e6cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04f40b7059ef99238573152d6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 25 17:30:51 2012 +0100 cacls: Print out arguments. --- programs/cacls/cacls_main.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/programs/cacls/cacls_main.c b/programs/cacls/cacls_main.c index a6a2949..eebd6d0 100644 --- a/programs/cacls/cacls_main.c +++ b/programs/cacls/cacls_main.c @@ -26,6 +26,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(cacls); int main(int argc, char** argv) { + int i; + WINE_FIXME("This is dummy cacls, not performing ACL manipulations\n"); + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_a(argv[i])); + WINE_FIXME("\n"); + return 0; }

1 0

Piotr Caban : msvcrt: Added _strnicmp_l implementation.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: eaa1b7060375f819146cce127d401a2161db6ea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa1b7060375f819146cce127… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 26 12:04:59 2012 +0100 msvcrt: Added _strnicmp_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/string.c | 32 +++++++++++++++++++++++++------- 5 files changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 64b4105..4838a14 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1341,7 +1341,7 @@ @ cdecl _strncoll(str str long) msvcrt._strncoll @ cdecl _strncoll_l(str str long ptr) msvcrt._strncoll_l @ cdecl _strnicmp(str str long) msvcrt._strnicmp -@ stub _strnicmp_l +@ cdecl _strnicmp_l(str str long ptr) msvcrt._strnicmp_l @ cdecl _strnicoll(str str long) msvcrt._strnicoll @ cdecl _strnicoll_l(str str long ptr) msvcrt._strnicoll_l @ cdecl _strnset(str long long) msvcrt._strnset diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 91147cf..0144e08 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1003,7 +1003,7 @@ @ cdecl _strncoll(str str long) msvcrt._strncoll @ cdecl _strncoll_l(str str long ptr) msvcrt._strncoll_l @ cdecl _strnicmp(str str long) msvcrt._strnicmp -@ stub _strnicmp_l +@ cdecl _strnicmp_l(str str long ptr) msvcrt._strnicmp_l @ cdecl _strnicoll(str str long) msvcrt._strnicoll @ cdecl _strnicoll_l(str str long ptr) msvcrt._strnicoll_l @ cdecl _strnset(str long long) msvcrt._strnset diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index abde141..dd91d5e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -996,7 +996,7 @@ @ cdecl _strncoll(str str long) msvcrt._strncoll @ cdecl _strncoll_l(str str long ptr) msvcrt._strncoll_l @ cdecl _strnicmp(str str long) msvcrt._strnicmp -@ stub _strnicmp_l +@ cdecl _strnicmp_l(str str long ptr) msvcrt._strnicmp_l @ cdecl _strnicoll(str str long) msvcrt._strnicoll @ cdecl _strnicoll_l(str str long ptr) msvcrt._strnicoll_l @ cdecl _strnset(str long long) msvcrt._strnset diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 3d15a21..29b459b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -936,8 +936,8 @@ @ cdecl _strlwr_s_l(ptr long ptr) @ cdecl _strncoll(str str long) MSVCRT_strncoll_l @ cdecl _strncoll_l(str str long ptr) MSVCRT_strncoll -@ cdecl _strnicmp(str str long) ntdll._strnicmp -# stub _strnicmp_l(str str long ptr) +@ cdecl _strnicmp(str str long) MSVCRT__strnicmp +@ cdecl _strnicmp_l(str str long ptr) MSVCRT__strnicmp_l @ cdecl _strnicoll(str str long) MSVCRT__strnicoll @ cdecl _strnicoll_l(str str long ptr) MSVCRT__strnicoll_l @ cdecl _strnset(str long long) MSVCRT__strnset diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index b457510..d9ec353 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1559,9 +1559,10 @@ void * __cdecl MSVCRT_memcpy( void *dst, const void *src, size_t n ) } /********************************************************************* - * _stricmp_l (MSVCRT.@) + * _strnicmp_l (MSVCRT.@) */ -int __cdecl MSVCRT__stricmp_l(const char *s1, const char *s2, MSVCRT__locale_t locale) +int __cdecl MSVCRT__strnicmp_l(const char *s1, const char *s2, + MSVCRT_size_t count, MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo; char c1, c2; @@ -1569,28 +1570,45 @@ int __cdecl MSVCRT__stricmp_l(const char *s1, const char *s2, MSVCRT__locale_t l if(!MSVCRT_CHECK_PMT(s1!=NULL && s2!=NULL)) return MSVCRT__NLSCMPERROR; + if(!count) + return 0; + if(!locale) locinfo = get_locinfo(); else locinfo = locale->locinfo; if(!locinfo->lc_handle[MSVCRT_LC_CTYPE]) - return strcasecmp(s1, s2); + return strncasecmp(s1, s2, count); do { c1 = MSVCRT__tolower_l(*s1++, locale); c2 = MSVCRT__tolower_l(*s2++, locale); - if(c1 != c2) - break; - }while(c1 && c1==c2); + }while(--count && c1 && c1==c2); return c1-c2; } /********************************************************************* + * _stricmp_l (MSVCRT.@) + */ +int __cdecl MSVCRT__stricmp_l(const char *s1, const char *s2, MSVCRT__locale_t locale) +{ + return MSVCRT__strnicmp_l(s1, s2, -1, locale); +} + +/********************************************************************* + * _strnicmp (MSVCRT.@) + */ +int __cdecl MSVCRT__strnicmp(const char *s1, const char *s2, MSVCRT_size_t count) +{ + return MSVCRT__strnicmp_l(s1, s2, count, NULL); +} + +/********************************************************************* * _stricmp (MSVCRT.@) */ int __cdecl MSVCRT__stricmp(const char *s1, const char *s2) { - return MSVCRT__stricmp_l(s1, s2, NULL); + return MSVCRT__strnicmp_l(s1, s2, -1, NULL); }

1 0

Frédéric Delanoy : xdg: Fix a file handle leak ( coverity).
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: 04fb8a913cba1da03aeef0ca3dc4e4062316a306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04fb8a913cba1da03aeef0ca3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 26 12:09:58 2012 +0100 xdg: Fix a file handle leak (coverity). --- dlls/shell32/xdg.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c index ce8c203..d05539c 100644 --- a/dlls/shell32/xdg.c +++ b/dlls/shell32/xdg.c @@ -942,7 +942,10 @@ HRESULT XDG_UserDirLookup(const char * const *xdg_dirs, const unsigned int num_d if (FAILED(hr)) { if (hr == E_OUTOFMEMORY) + { + fclose(file); goto xdg_user_dir_lookup_error; + } continue; } }

1 0

Piotr Caban : msvcrt: NULL terminate program arguments list in __getmainargs.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: 6e485f13c011b8429a8b44afd53163ddb3c0bfd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e485f13c011b8429a8b44afd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 26 13:28:14 2012 +0100 msvcrt: NULL terminate program arguments list in __getmainargs. --- dlls/msvcrt/data.c | 16 ++++++++++------ dlls/msvcrt/tests/data.c | 2 ++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index a9505ed..b31e5f7 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -424,7 +424,7 @@ static int build_expanded_argv(int *argc, char **argv) len = strlen(data.cFileName)+1; if(argv) { - argv[args_no] = (char*)(argv+*argc)+size; + argv[args_no] = (char*)(argv+*argc+1)+size; memcpy(argv[args_no], __wine_main_argv[i], path_len*sizeof(char)); memcpy(argv[args_no]+path_len, data.cFileName, len*sizeof(char)); } @@ -437,7 +437,7 @@ static int build_expanded_argv(int *argc, char **argv) if(!len) { len = strlen(__wine_main_argv[i])+1; if(argv) { - argv[args_no] = (char*)(argv+*argc)+size; + argv[args_no] = (char*)(argv+*argc+1)+size; memcpy(argv[args_no], __wine_main_argv[i], len*sizeof(char)); } args_no++; @@ -445,7 +445,9 @@ static int build_expanded_argv(int *argc, char **argv) } } - size += args_no*sizeof(char*); + if(argv) + argv[args_no] = NULL; + size += (args_no+1)*sizeof(char*); *argc = args_no; return size; } @@ -519,7 +521,7 @@ static int build_expanded_wargv(int *argc, MSVCRT_wchar_t **argv) len = strlenW(data.cFileName)+1; if(argv) { - argv[args_no] = (MSVCRT_wchar_t*)(argv+*argc)+size; + argv[args_no] = (MSVCRT_wchar_t*)(argv+*argc+1)+size; memcpy(argv[args_no], __wine_main_wargv[i], path_len*sizeof(MSVCRT_wchar_t)); memcpy(argv[args_no]+path_len, data.cFileName, len*sizeof(MSVCRT_wchar_t)); } @@ -532,7 +534,7 @@ static int build_expanded_wargv(int *argc, MSVCRT_wchar_t **argv) if(!len) { len = strlenW(__wine_main_wargv[i])+1; if(argv) { - argv[args_no] = (MSVCRT_wchar_t*)(argv+*argc)+size; + argv[args_no] = (MSVCRT_wchar_t*)(argv+*argc+1)+size; memcpy(argv[args_no], __wine_main_wargv[i], len*sizeof(MSVCRT_wchar_t)); } args_no++; @@ -540,8 +542,10 @@ static int build_expanded_wargv(int *argc, MSVCRT_wchar_t **argv) } } + if(argv) + argv[args_no] = NULL; size *= sizeof(MSVCRT_wchar_t); - size += args_no*sizeof(MSVCRT_wchar_t*); + size += (args_no+1)*sizeof(MSVCRT_wchar_t*); *argc = args_no; return size; } diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index cdd65a7..e2adc34 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -146,6 +146,7 @@ static void test___getmainargs(void) ok(!strcmp(argv[2], filepath), "argv[2] = %s\n", argv[2]); sprintf(filepath, "%swine_test/*", tmppath); ok(!strcmp(argv[3], filepath), "argv[3] = %s\n", argv[3]); + ok(!argv[4], "argv[4] != NULL\n"); if(p___p___argc && p___p___argv) { new_argc = *p___p___argc(); @@ -172,6 +173,7 @@ static void test___getmainargs(void) sprintf(filepath, "%swine_test/test", tmppath); ok(!strcmp(argv[3], filepath), "argv[3] = %s\n", argv[3]); } + ok(!argv[5], "argv[5] != NULL\n"); if(p___p___argc && p___p___argv) { new_argc = *p___p___argc();

1 0

Jacek Caban : atl100: Fixed a typo.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: 1a111423dd432223d00e6e50cd72613143051ad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a111423dd432223d00e6e50c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 26 13:49:59 2012 +0100 atl100: Fixed a typo. --- dlls/atl100/tests/atl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index e7882fa..59268de 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -100,7 +100,7 @@ static void test_winmodule(void) ok(p == (void*)0xdead0001, "unexpected AtlWinModuleExtractCreateWndData result %p\n", p); ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); ok(!create_data[0].m_pNext, "unexpected create_data[0].m_pNext %p\n", create_data[0].m_pNext); - ok(!create_data[1].m_pNext+1, "unexpected create_data[1].m_pNext %p\n", create_data[1].m_pNext); + ok(!create_data[1].m_pNext, "unexpected create_data[1].m_pNext %p\n", create_data[1].m_pNext); p = AtlWinModuleExtractCreateWndData(&winmod); ok(!p, "unexpected AtlWinModuleExtractCreateWndData result %p\n", p);

1 0

Jacek Caban : atl: Use atlbase.h in tests.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: 65493cf137183635cecdb966800593a004c7a32c URL: http://source.winehq.org/git/wine.git/?a=commit;h=65493cf137183635cecdb9668… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 26 13:49:50 2012 +0100 atl: Use atlbase.h in tests. --- dlls/atl/tests/module.c | 87 ++++++++++++----------------------------------- 1 files changed, 22 insertions(+), 65 deletions(-) diff --git a/dlls/atl/tests/module.c b/dlls/atl/tests/module.c index 2a97ef9..ffa62ad 100644 --- a/dlls/atl/tests/module.c +++ b/dlls/atl/tests/module.c @@ -24,84 +24,41 @@ #define COBJMACROS -#include <wine/test.h> -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <wingdi.h> -#include <winnls.h> -#include <winerror.h> -#include <winnt.h> -#include <wtypes.h> -#include <olectl.h> -#include <ocidl.h> - -struct _ATL_OBJMAP_ENTRYW; -struct _AtlCreateWndData; -struct _ATL_TERMFUNC_ELEM; - -struct _ATL_MODULEW -{ - UINT cbSize; - HINSTANCE m_hInst; - HINSTANCE m_hInstResource; - HINSTANCE m_hInstTypeLib; - struct _ATL_OBJMAP_ENTRYW* m_pObjMap; - LONG m_nLockCnt; - HANDLE m_hHeap; - union - { - CRITICAL_SECTION m_csTypeInfoHolder; - CRITICAL_SECTION m_csStaticDataInit; - } u; - CRITICAL_SECTION m_csWindowCreate; - CRITICAL_SECTION m_csObjMap; - - DWORD dwAtlBuildVer; - struct _AtlCreateWndData* m_pCreateWndList; - BOOL m_bDestroyHeap; - GUID* pguidVer; - DWORD m_dwHeaps; - HANDLE* m_phHeaps; - int m_nHeap; - struct _ATL_TERMFUNC_ELEM* m_pTermFuncs; -}; +#include <atlbase.h> -HRESULT WINAPI AtlModuleInit(struct _ATL_MODULEW* pM, struct _ATL_OBJMAP_ENTRYW* p, HINSTANCE h); +#include <wine/test.h> #define MAXSIZE 512 static void test_StructSize(void) { - struct _ATL_MODULEW *tst; - HRESULT hres; - int i; + _ATL_MODULEW *tst; + HRESULT hres; + int i; - tst = HeapAlloc (GetProcessHeap(),HEAP_ZERO_MEMORY,MAXSIZE); + tst = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, MAXSIZE); - for (i=0;i<MAXSIZE;i++) { - tst->cbSize = i; - hres = AtlModuleInit(tst, NULL, NULL); + for (i=0;i<MAXSIZE;i++) { + tst->cbSize = i; + hres = AtlModuleInit(tst, NULL, NULL); - switch (i) { - case FIELD_OFFSET( struct _ATL_MODULEW, dwAtlBuildVer ): - case sizeof(struct _ATL_MODULEW): + switch (i) { + case FIELD_OFFSET(_ATL_MODULEW, dwAtlBuildVer): + case sizeof(_ATL_MODULEW): #ifdef _WIN64 - case sizeof(struct _ATL_MODULEW) + sizeof(void *): + case sizeof(_ATL_MODULEW) + sizeof(void *): #endif - ok (hres == S_OK, "AtlModuleInit with %d failed (0x%x).\n", i, (int)hres); - break; - default: - ok (FAILED(hres) || - broken((i > FIELD_OFFSET( struct _ATL_MODULEW, dwAtlBuildVer )) && (hres == S_OK)), /* Win95 */ - "AtlModuleInit with %d succeeded? (0x%x).\n", i, (int)hres); - break; - } - } + ok (hres == S_OK, "AtlModuleInit with %d failed (0x%x).\n", i, (int)hres); + break; + default: + ok (FAILED(hres), "AtlModuleInit with %d succeeded? (0x%x).\n", i, (int)hres); + break; + } + } - HeapFree (GetProcessHeap(), 0, tst); + HeapFree (GetProcessHeap(), 0, tst); } START_TEST(module) { - test_StructSize(); + test_StructSize(); }

1 0