October 2009 - Wine-Commits

Wim Lewis : winex11: Fix font metric cache filename generation.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: a1c66499bf6b93bc2c027b5786fe73615b1f8fb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1c66499bf6b93bc2c027b578… Author: Wim Lewis <wiml(a)hhhh.org> Date: Fri Oct 2 15:23:34 2009 -0700 winex11: Fix font metric cache filename generation. Recognize Mac OS X's launchd pathnames as being local. Avoid generating an invalid pathname if $DISPLAY contains slashes. Don't include the screen number in the cache filename. --- dlls/winex11.drv/xfont.c | 54 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 42 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index f761e9b..5e160cc 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -1830,18 +1830,10 @@ static char* XFONT_UserMetricsCache( char* buffer, int* buf_size ) const char *confdir = wine_get_config_dir(); const char *display_name = XDisplayName(NULL); int len = strlen(confdir) + strlen(INIFontMetrics) + strlen(display_name) + 8; - int display = 0; - int screen = 0; + unsigned int display = 0; + unsigned int screen = 0; char *p, *ext; - /* - ** Normalize the display name, since on Red Hat systems, DISPLAY - ** is commonly set to one of either 'unix:0.0' or ':0' or ':0.0'. - ** after this code, all of the above will resolve to ':0.0'. - */ - if (!strncmp( display_name, "unix:", 5 )) display_name += 4; - p = strchr(display_name, ':'); - if (p) sscanf(p + 1, "%d.%d", &display, &screen); if ((len > *buf_size) && !(buffer = HeapReAlloc( GetProcessHeap(), 0, buffer, *buf_size = len ))) @@ -1854,8 +1846,46 @@ static char* XFONT_UserMetricsCache( char* buffer, int* buf_size ) ext = buffer + strlen(buffer); strcpy( ext, display_name ); - if (!(p = strchr( ext, ':' ))) p = ext + strlen(ext); - sprintf( p, ":%d.%d", display, screen ); + /* + ** Normalize the display name. The format of DISPLAY is + ** [protocol/] [hostname] :[:] num [.num] + ** + ** - on Red Hat systems, DISPLAY is commonly set to one of + ** either 'unix:0.0' or ':0' or ':0.0'. + ** - on MacOS X systems, DISPLAY is commonly set to + ** /tmp/foo/:0 + ** + ** after this code, all of the above will resolve to ':0.0'. + */ + p = strrchr(ext, ':'); + if (p) + { + sscanf(p + 1, "%u.%u", &display, &screen); + *p = 0; + if (display > 9999) + { + WARN("unlikely X11 display number\n"); + *buffer = 0; + return buffer; + } + } + if (!strcmp( ext, "unix" ) || + !strcmp( ext, "localhost" )) + *ext = 0; + if (!strncmp( ext, "/tmp/", 5 )) + *ext = 0; /* assume pathnames are local */ + + /* Deal with the possibility of slashes in the display name */ + for( p = ext; *p; p++ ) + if ( *p == '/' ) + *p = '_'; + + /* X11 fonts are per-display, not per-screen, so don't + ** include the screen number in the font cache filename */ + sprintf( ext + strlen(ext), ":%u", display ); + + TRACE("display '%s' -> cachefile '%s'\n", display_name, buffer); + return buffer; }

1 0

Jörg Höhle : winecoreaudio: Accept up to 8 channels.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: b16fc0e163dd970665f6d37503c18e1b01f0452f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b16fc0e163dd970665f6d3750… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Oct 5 10:34:24 2009 +0200 winecoreaudio: Accept up to 8 channels. --- dlls/winecoreaudio.drv/audio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 7f7c1ee..72e523e 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -449,7 +449,7 @@ static BOOL supportedFormat(LPWAVEFORMATEX wf) WAVEFORMATEXTENSIBLE * wfex = (WAVEFORMATEXTENSIBLE *)wf; if (wf->cbSize == 22 && IsEqualGUID(&wfex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM)) { - if (wf->nChannels >=1 && wf->nChannels <= 2) { + if (wf->nChannels >=1 && wf->nChannels <= 8) { if (wf->wBitsPerSample==wfex->Samples.wValidBitsPerSample) { if (wf->wBitsPerSample==8||wf->wBitsPerSample==16) return TRUE;

1 0

Jörg Höhle : wineoss: Fix the buffer size check for more than 2 channels.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: 55fca7778bf593e4ddde583868ea514ae93edb11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55fca7778bf593e4ddde58386… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Oct 3 22:42:30 2009 +0200 wineoss: Fix the buffer size check for more than 2 channels. --- dlls/wineoss.drv/audio.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index ddf973f..98575f1 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -2169,6 +2169,7 @@ static DWORD wodClose(WORD wDevID) */ static DWORD wodWrite(WORD wDevID, LPWAVEHDR lpWaveHdr, DWORD dwSize) { + WORD delta; TRACE("(%u, %p, %08X);\n", wDevID, lpWaveHdr, dwSize); /* first, do the sanity checks... */ @@ -2187,10 +2188,11 @@ static DWORD wodWrite(WORD wDevID, LPWAVEHDR lpWaveHdr, DWORD dwSize) lpWaveHdr->dwFlags |= WHDR_INQUEUE; lpWaveHdr->lpNext = 0; - if ((lpWaveHdr->dwBufferLength & (WOutDev[wDevID].waveFormat.Format.nBlockAlign - 1)) != 0) + delta = lpWaveHdr->dwBufferLength % WOutDev[wDevID].waveFormat.Format.nBlockAlign; + if (delta != 0) { WARN("WaveHdr length isn't a multiple of the PCM block size: %d %% %d\n",lpWaveHdr->dwBufferLength,WOutDev[wDevID].waveFormat.Format.nBlockAlign); - lpWaveHdr->dwBufferLength &= ~(WOutDev[wDevID].waveFormat.Format.nBlockAlign - 1); + lpWaveHdr->dwBufferLength -= delta; } OSS_AddRingMessage(&WOutDev[wDevID].msgRing, WINE_WM_HEADER, (DWORD_PTR)lpWaveHdr, FALSE);

1 0

Joel Holdsworth : comdlg32: Replaced file dialog house icon with the shell icon for desktop.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: ee09534c27098bc8b00a7c0d5f9199232aab8fb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee09534c27098bc8b00a7c0d5… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sat Oct 3 10:12:55 2009 +0100 comdlg32: Replaced file dialog house icon with the shell icon for desktop. --- dlls/comdlg32/800.bmp | Bin 1334 -> 0 bytes dlls/comdlg32/cdlg_xx.rc | 3 --- dlls/comdlg32/filedlg.c | 27 +++++++++++++++++++-------- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/comdlg32/800.bmp b/dlls/comdlg32/800.bmp deleted file mode 100644 index 3b7dae2..0000000 Binary files a/dlls/comdlg32/800.bmp and /dev/null differ diff --git a/dlls/comdlg32/cdlg_xx.rc b/dlls/comdlg32/cdlg_xx.rc index 0797897..24139d2 100644 --- a/dlls/comdlg32/cdlg_xx.rc +++ b/dlls/comdlg32/cdlg_xx.rc @@ -71,9 +71,6 @@ PD32_PORTRAIT ICON pd32_portrait.ico /* @makedep: pd32_landscape.ico */ PD32_LANDSCAPE ICON pd32_landscape.ico -/* @makedep: 800.bmp */ -800 BITMAP DISCARDABLE LOADONCALL "800.bmp" - /* @makedep: folder.ico */ FOLDER ICON folder.ico diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index a28c457..d1147eb 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1320,15 +1320,16 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) {VIEW_LIST, FCIDM_TB_SMALLICON, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0 }, {VIEW_DETAILS, FCIDM_TB_REPORTVIEW, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0 }, }; - TBADDBITMAP tba[2]; + static const TBADDBITMAP tba = {HINST_COMMCTRL, IDB_VIEW_SMALL_COLOR}; + RECT rectTB; RECT rectlook; - FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); - tba[0].hInst = HINST_COMMCTRL; - tba[0].nID = IDB_VIEW_SMALL_COLOR; - tba[1].hInst = COMDLG32_hInstance; - tba[1].nID = 800; + HIMAGELIST toolbarImageList; + SHFILEINFOA shFileInfo; + ITEMIDLIST *desktopPidl; + + FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); TRACE("%p\n", fodInfos); @@ -1378,9 +1379,19 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) /* FIXME: use TB_LOADIMAGES when implemented */ /* SendMessageW(fodInfos->DlgInfos.hwndTB, TB_LOADIMAGES, IDB_VIEW_SMALL_COLOR, HINST_COMMCTRL);*/ SendMessageW(fodInfos->DlgInfos.hwndTB, TB_SETMAXTEXTROWS, 0, 0); - SendMessageW(fodInfos->DlgInfos.hwndTB, TB_ADDBITMAP, 12, (LPARAM) &tba[0]); - SendMessageW(fodInfos->DlgInfos.hwndTB, TB_ADDBITMAP, 1, (LPARAM) &tba[1]); + SendMessageW(fodInfos->DlgInfos.hwndTB, TB_ADDBITMAP, 12, (LPARAM) &tba); + + /* Retrieve and add desktop icon to the toolbar */ + toolbarImageList = (HIMAGELIST)SendMessageW(fodInfos->DlgInfos.hwndTB, TB_GETIMAGELIST, 0, 0L); + SHGetSpecialFolderLocation(hwnd, CSIDL_DESKTOP, &desktopPidl); + SHGetFileInfoA((LPCSTR)desktopPidl, 0, &shFileInfo, sizeof(shFileInfo), + SHGFI_PIDL | SHGFI_ICON | SHGFI_SMALLICON); + ImageList_AddIcon(toolbarImageList, shFileInfo.hIcon); + + DestroyIcon(shFileInfo.hIcon); + CoTaskMemFree(desktopPidl); + /* Finish Toolbar Construction */ SendMessageW(fodInfos->DlgInfos.hwndTB, TB_ADDBUTTONSW, 9, (LPARAM) tbb); SendMessageW(fodInfos->DlgInfos.hwndTB, TB_AUTOSIZE, 0, 0);

1 0

Gerald Pfeifer : winebuild: Add support for PLATFORM_FREEBSD.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: d222e8edf1983303a7f6ab1ba6bebf3770e00994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d222e8edf1983303a7f6ab1ba… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Oct 5 02:24:57 2009 +0200 winebuild: Add support for PLATFORM_FREEBSD. --- tools/winebuild/build.h | 6 +++++- tools/winebuild/main.c | 3 +++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 07ac347..b942934 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -124,7 +124,11 @@ enum target_cpu enum target_platform { - PLATFORM_UNSPECIFIED, PLATFORM_APPLE, PLATFORM_SOLARIS, PLATFORM_WINDOWS + PLATFORM_UNSPECIFIED, + PLATFORM_APPLE, + PLATFORM_FREEBSD, + PLATFORM_SOLARIS, + PLATFORM_WINDOWS }; extern char *target_alias; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 9fef1c4..4dfa63f 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -64,6 +64,8 @@ enum target_cpu target_cpu = CPU_POWERPC; #ifdef __APPLE__ enum target_platform target_platform = PLATFORM_APPLE; +#elif defined(__FreeBSD__) +enum target_platform target_platform = PLATFORM_FREEBSD; #elif defined(__sun) enum target_platform target_platform = PLATFORM_SOLARIS; #elif defined(_WIN32) @@ -111,6 +113,7 @@ static const struct { { "macos", PLATFORM_APPLE }, { "darwin", PLATFORM_APPLE }, + { "freebsd", PLATFORM_FREEBSD }, { "solaris", PLATFORM_SOLARIS }, { "windows", PLATFORM_WINDOWS }, { "winnt", PLATFORM_WINDOWS }

1 0

Alexandre Julliard : user32: Don't use a static dc for icon blitting.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: 5cdd8a2a4889f3f2556e57e020ba2a3eb5ff3142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cdd8a2a4889f3f2556e57e02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 5 15:18:10 2009 +0200 user32: Don't use a static dc for icon blitting. --- dlls/user32/cursoricon.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index a74b79d..fca04ce 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -674,10 +674,7 @@ static BOOL stretch_blt_icon(HBITMAP hDest, BITMAPINFO *pDestInfo, BITMAPINFO *p { HBITMAP hOld; BOOL res = FALSE; - static HDC hdcMem = NULL; - - if (!hdcMem) - hdcMem = CreateCompatibleDC(screen_dc); + HDC hdcMem = CreateCompatibleDC(screen_dc); if (hdcMem) { @@ -687,6 +684,7 @@ static BOOL stretch_blt_icon(HBITMAP hDest, BITMAPINFO *pDestInfo, BITMAPINFO *p 0, 0, pSrcInfo->bmiHeader.biWidth, pSrcInfo->bmiHeader.biHeight, pSrcBits, pSrcInfo, DIB_RGB_COLORS, SRCCOPY); SelectObject(hdcMem, hOld); + DeleteDC( hdcMem ); } return res;

1 0

Wim Lewis : winex11: Font metric cache file cleanups.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: d535419daa6409b3320e9f1c04ab939061492956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d535419daa6409b3320e9f1c0… Author: Wim Lewis <wiml(a)hhhh.org> Date: Fri Oct 2 14:04:52 2009 -0700 winex11: Font metric cache file cleanups. --- dlls/winex11.drv/xfont.c | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index d3d3e8c..f761e9b 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -34,7 +34,9 @@ #endif #include <sys/types.h> #include <fcntl.h> +#include <errno.h> #include <math.h> +#include <limits.h> #include "windef.h" #include "winbase.h" @@ -2156,8 +2158,10 @@ static int XFONT_BuildMetrics(char** x_pattern, int res, unsigned x_checksum, in * * INIT ONLY */ -static BOOL XFONT_ReadCachedMetrics( int fd, int res, unsigned x_checksum, int x_count ) +static BOOL XFONT_ReadCachedMetrics( const char *path, int res, unsigned x_checksum, int x_count ) { + int fd = open( path, O_RDONLY ); + if( fd >= 0 ) { unsigned u; @@ -2270,6 +2274,8 @@ fail: HeapFree( GetProcessHeap(), 0, fontList ); fontList = NULL; close( fd ); + } else { + TRACE("fontcache '%s': %s\n", path, strerror(errno)); } return FALSE; } @@ -2855,7 +2861,7 @@ static void X11DRV_FONT_InitX11Metrics( void ) { char** x_pattern; unsigned x_checksum; - int i, x_count, fd, buf_size; + int i, x_count, buf_size; char *buffer; HKEY hkey; @@ -2879,7 +2885,7 @@ static void X11DRV_FONT_InitX11Metrics( void ) if( j ) x_checksum ^= __genericCheckSum( x_pattern[i], j ); } x_checksum |= X_PFONT_MAGIC; - buf_size = 128; + buf_size = PATH_MAX; buffer = HeapAlloc( GetProcessHeap(), 0, buf_size ); /* deal with systemwide font metrics cache */ @@ -2895,8 +2901,8 @@ static void X11DRV_FONT_InitX11Metrics( void ) if( buffer[0] ) { - fd = open( buffer, O_RDONLY ); - XFONT_ReadCachedMetrics(fd, DefResolution, x_checksum, x_count); + TRACE("system fontcache is '%s'\n", buffer); + XFONT_ReadCachedMetrics(buffer, DefResolution, x_checksum, x_count); } if (fontList == NULL) { @@ -2904,8 +2910,8 @@ static void X11DRV_FONT_InitX11Metrics( void ) buffer = XFONT_UserMetricsCache( buffer, &buf_size ); if( buffer[0] ) { - fd = open( buffer, O_RDONLY ); - XFONT_ReadCachedMetrics(fd, DefResolution, x_checksum, x_count); + TRACE("user fontcache is '%s'\n", buffer); + XFONT_ReadCachedMetrics(buffer, DefResolution, x_checksum, x_count); } } @@ -2914,11 +2920,15 @@ static void X11DRV_FONT_InitX11Metrics( void ) int n_ff = XFONT_BuildMetrics(x_pattern, DefResolution, x_checksum, x_count); if( buffer[0] ) /* update cached metrics */ { - fd = open( buffer, O_CREAT | O_TRUNC | O_RDWR, 0644 ); /* -rw-r--r-- */ - if( XFONT_WriteCachedMetrics( fd, x_checksum, x_count, n_ff ) == FALSE ) + int fd = open( buffer, O_CREAT | O_TRUNC | O_RDWR, 0666 ); + if ( fd < 0 ) + { + WARN("Unable to create fontcache '%s': %s\n", buffer, strerror(errno)); + } + else if( XFONT_WriteCachedMetrics( fd, x_checksum, x_count, n_ff ) == FALSE ) { WARN("Unable to write to fontcache '%s'\n", buffer); - if( fd >= 0) remove( buffer ); /* couldn't write entire file */ + remove( buffer ); /* couldn't write entire file */ } } }

1 0

Eric Pouech : winedbg: Properly manage Wine' s dbghelp extensions for constant symbols which value is passed by ref.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: 700d9df4140596e3bd8cad60e42e2784ec7e2319 URL: http://source.winehq.org/git/wine.git/?a=commit;h=700d9df4140596e3bd8cad60e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 3 13:15:49 2009 +0200 winedbg: Properly manage Wine's dbghelp extensions for constant symbols which value is passed by ref. --- programs/winedbg/symbol.c | 37 ++++++++++++++++++++++++++----------- 1 files changed, 26 insertions(+), 11 deletions(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index e0553e7..abc7d2d 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -91,24 +91,39 @@ static BOOL fill_sym_lvalue(const SYMBOL_INFO* sym, ULONG base, { struct dbg_type type; VARIANT v; - DWORD* pdw; type.module = sym->ModBase; type.id = sym->info; - /* FIXME: this won't work for pointers, as we always for the - * dereference to be in debuggee address space while here - * it's in debugger address space - */ - if (!types_get_info(&type, TI_GET_VALUE, &v) || (v.n1.n2.vt & VT_BYREF)) + if (!types_get_info(&type, TI_GET_VALUE, &v)) { - if (buffer) snprintf(buffer, sz, "Couldn't dereference pointer for const value"); + if (buffer) snprintf(buffer, sz, "Couldn't get full value information for %s", sym->Name); return FALSE; } - pdw = (DWORD*)lexeme_alloc_size(sizeof(*pdw)); - lvalue->cookie = DLV_HOST; - lvalue->addr.Offset = (ULONG)(DWORD_PTR)pdw; - *pdw = sym->Value; + else if (v.n1.n2.vt & VT_BYREF) + { + /* FIXME: this won't work for pointers or arrays, as we don't always + * know, if the value to be dereferenced lies in debuggee or + * debugger address space. + */ + if (sym->Tag == SymTagPointerType || sym->Tag == SymTagArrayType) + { + if (buffer) snprintf(buffer, sz, "Couldn't dereference pointer for const value for %s", sym->Name); + return FALSE; + } + /* this is likely Wine's dbghelp which passes const values by reference + * (object is managed by dbghelp, hence in debugger address space) + */ + lvalue->cookie = DLV_HOST; + lvalue->addr.Offset = (DWORD_PTR)sym->Value; + } + else + { + DWORD* pdw = (DWORD*)lexeme_alloc_size(sizeof(*pdw)); + lvalue->cookie = DLV_HOST; + lvalue->addr.Offset = (DWORD_PTR)pdw; + *pdw = sym->Value; + } } else if (sym->Flags & SYMFLAG_LOCAL) {

1 0

Alexandre Julliard : loader: Build the loader with -D__WINESRC__.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: b1c235d364ac052fdc67d6323ca6fb09b12415e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1c235d364ac052fdc67d6323… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 5 14:55:34 2009 +0200 loader: Build the loader with -D__WINESRC__. --- loader/Makefile.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/loader/Makefile.in b/loader/Makefile.in index 8f4d2a2..5911159 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -2,6 +2,7 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = .. SRCDIR = @srcdir@ VPATH = @srcdir@ +DEFS = -D__WINESRC__ $(EXTRADEFS) C_SRCS = \ main.c \

1 0

Nikolay Sivov : comctl32/monthcal: Drop exstyle parameter, it isn't used.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: ec3e9308da35c614f67af17e36e82a8987885f43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec3e9308da35c614f67af17e3… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Oct 4 18:26:43 2009 +0400 comctl32/monthcal: Drop exstyle parameter, it isn't used. --- dlls/comctl32/tests/datetime.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index c449e45..a0f12f0 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -149,7 +149,7 @@ static LRESULT WINAPI datetime_subclass_proc(HWND hwnd, UINT message, WPARAM wPa return ret; } -static HWND create_datetime_control(DWORD style, DWORD exstyle) +static HWND create_datetime_control(DWORD style) { struct subclass_info *info; HWND hWndDateTime = NULL; @@ -187,7 +187,7 @@ static void test_dtm_set_format(void) SYSTEMTIME systime; LRESULT r; - hWnd = create_datetime_control(DTS_SHOWNONE, 0); + hWnd = create_datetime_control(DTS_SHOWNONE); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -238,7 +238,7 @@ static void test_dtm_set_and_get_mccolor(void) { HWND hWnd; - hWnd = create_datetime_control(DTS_SHOWNONE, 0); + hWnd = create_datetime_control(DTS_SHOWNONE); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -259,7 +259,7 @@ static void test_dtm_set_and_get_mcfont(void) HFONT hFontOrig, hFontNew; HWND hWnd; - hWnd = create_datetime_control(DTS_SHOWNONE, 0); + hWnd = create_datetime_control(DTS_SHOWNONE); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -277,7 +277,7 @@ static void test_dtm_get_monthcal(void) LRESULT r; HWND hWnd; - hWnd = create_datetime_control(DTS_SHOWNONE, 0); + hWnd = create_datetime_control(DTS_SHOWNONE); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -337,7 +337,7 @@ static void test_dtm_set_and_get_range(void) SYSTEMTIME getSt[2]; HWND hWnd; - hWnd = create_datetime_control(DTS_SHOWNONE, 0); + hWnd = create_datetime_control(DTS_SHOWNONE); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -423,7 +423,7 @@ static void test_dtm_set_range_swap_min_max(void) SYSTEMTIME origSt; HWND hWnd; - hWnd = create_datetime_control(DTS_SHOWNONE, 0); + hWnd = create_datetime_control(DTS_SHOWNONE); flush_sequences(sequences, NUM_MSG_SEQUENCES); fill_systime_struct(&st[0], 2007, 2, 4, 15, 2, 2, 2, 2); @@ -527,7 +527,7 @@ static void test_dtm_set_and_get_system_time(void) SYSTEMTIME st, getSt, ref; HWND hWnd, hWndDateTime_test_gdt_none; - hWndDateTime_test_gdt_none = create_datetime_control(0, 0); + hWndDateTime_test_gdt_none = create_datetime_control(0); ok(hWndDateTime_test_gdt_none!=NULL, "Expected non NULL, got %p\n", hWndDateTime_test_gdt_none); if(hWndDateTime_test_gdt_none) { @@ -543,7 +543,7 @@ static void test_dtm_set_and_get_system_time(void) DestroyWindow(hWndDateTime_test_gdt_none); - hWnd = create_datetime_control(DTS_SHOWNONE, 0); + hWnd = create_datetime_control(DTS_SHOWNONE); flush_sequences(sequences, NUM_MSG_SEQUENCES); r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_NONE, (LPARAM)&st);

1 0