October 2011 - Wine-commits

Andrew Eikum : winecfg: Don't reload winmm for each audio test.
by Alexandre Julliard 28 Oct '11

28 Oct '11

Module: wine Branch: master Commit: 00629cb0b3c7c3b25d8ccbfc56755344dc9a1e89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00629cb0b3c7c3b25d8ccbfc5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 28 09:24:28 2011 -0500 winecfg: Don't reload winmm for each audio test. --- programs/winecfg/Makefile.in | 2 +- programs/winecfg/audio.c | 22 +--------------------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in index 382eb94..4b1a001 100644 --- a/programs/winecfg/Makefile.in +++ b/programs/winecfg/Makefile.in @@ -1,6 +1,6 @@ MODULE = winecfg.exe APPMODE = -mwindows -IMPORTS = uuid comdlg32 comctl32 shell32 ole32 shlwapi uxtheme user32 gdi32 advapi32 +IMPORTS = uuid comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 gdi32 advapi32 C_SRCS = \ about.c \ diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index dc3e2bc..f2d4fe3 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -305,25 +305,7 @@ static void set_reg_device(HWND hDlg, int dlgitem, const WCHAR *key_name) static void test_sound(void) { - BOOL (WINAPI *pPlaySoundW)(const WCHAR *, HMODULE, DWORD); - HMODULE winmm; - - static const WCHAR winmmW[] = {'w','i','n','m','m','.','d','l','l',0}; - - winmm = LoadLibraryW(winmmW); - if(!winmm){ - WINE_ERR("LoadLibrary failed: %u\n", GetLastError()); - return; - } - - pPlaySoundW = (void*)GetProcAddress(winmm, "PlaySoundW"); - if(!pPlaySoundW){ - WINE_ERR("GetProcAddress failed: %u\n", GetLastError()); - FreeLibrary(winmm); - return; - } - - if(!pPlaySoundW(MAKEINTRESOURCEW(IDW_TESTSOUND), NULL, SND_RESOURCE | SND_SYNC)){ + if(!PlaySoundW(MAKEINTRESOURCEW(IDW_TESTSOUND), NULL, SND_RESOURCE | SND_SYNC)){ WCHAR error_str[256], title_str[256]; LoadStringW(GetModuleHandle(NULL), IDS_AUDIO_TEST_FAILED, @@ -333,8 +315,6 @@ static void test_sound(void) MessageBoxW(NULL, error_str, title_str, MB_OK | MB_ICONERROR); } - - FreeLibrary(winmm); } INT_PTR CALLBACK

1 0

Andrew Eikum : winmm: Fix clock position calculation.
by Alexandre Julliard 28 Oct '11

28 Oct '11

Module: wine Branch: master Commit: 0a20ec093597a669ef178569e93bc5200b0b9c41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a20ec093597a669ef178569e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 28 09:51:51 2011 -0500 winmm: Fix clock position calculation. --- dlls/winmm/waveform.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index e9ee007..cb0762c 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1247,7 +1247,7 @@ static WAVEHDR *WOD_MarkDoneHeaders(WINMM_Device *device) return NULL; } - clock_frames = (clock_pos / (double)clock_freq) * device->samples_per_sec; + clock_frames = (clock_pos * device->samples_per_sec) / clock_freq; nloops = device->loop_counter; while(queue &&

1 0

Michael Stefaniuc : kernel32/ntdll: Mark a variable as unused.
by Alexandre Julliard 28 Oct '11

28 Oct '11

Module: wine Branch: master Commit: 68f90d9697f66f4b0d928c899a5caf70fbce2187 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68f90d9697f66f4b0d928c899… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 28 17:04:33 2011 +0200 kernel32/ntdll: Mark a variable as unused. --- dlls/kernel32/virtual.c | 2 +- dlls/ntdll/virtual.c | 2 +- include/wine/exception.h | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 6328399..c878ed8 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -650,7 +650,7 @@ BOOL WINAPI IsBadReadPtr( LPCVOID ptr, UINT size ) __TRY { volatile const char *p = ptr; - char dummy; + char dummy __attribute__((unused)); UINT count = size; while (count > page_size) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 054b924..7185f14 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1651,7 +1651,7 @@ BOOL virtual_check_buffer_for_read( const void *ptr, SIZE_T size ) __TRY { volatile const char *p = ptr; - char dummy; + char dummy __attribute__((unused)); SIZE_T count = size; while (count > page_size) diff --git a/include/wine/exception.h b/include/wine/exception.h index 469083f..9115fc9 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -69,6 +69,10 @@ extern "C" { * -- AJ */ +#ifndef __GNUC__ +#define __attribute__(x) /* nothing */ +#endif + /* Define this if you want to use your compiler built-in __try/__except support. * This is only useful when compiling to a native Windows binary, as the built-in * compiler exceptions will most certainly not work under Winelib. @@ -84,10 +88,6 @@ extern "C" { #else /* USE_COMPILER_EXCEPTIONS */ -#ifndef __GNUC__ -#define __attribute__(x) /* nothing */ -#endif - #if defined(__MINGW32__) || defined(__CYGWIN__) #define sigjmp_buf jmp_buf #define sigsetjmp(buf,sigs) setjmp(buf)

1 0

Ken Sharp : po: Update English (Neutral) resource.
by Alexandre Julliard 28 Oct '11

28 Oct '11

Module: wine Branch: master Commit: 7df024529541128719ed09a7ed69bda0b11beadb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7df024529541128719ed09a7e… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Fri Oct 28 15:55:10 2011 +0100 po: Update English (Neutral) resource. --- po/en.po | 72 ++++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 40 insertions(+), 32 deletions(-) diff --git a/po/en.po b/po/en.po index aad88b7..ca783cd 100644 --- a/po/en.po +++ b/po/en.po @@ -744,11 +744,11 @@ msgstr "Country/Region" #: crypt32.rc:72 msgid "Organization" -msgstr "Organization" +msgstr "Organisation" #: crypt32.rc:73 msgid "Organizational Unit" -msgstr "Organizational Unit" +msgstr "Organisational Unit" #: crypt32.rc:74 msgid "Common Name" @@ -800,7 +800,7 @@ msgstr "Cross CA Version" #: crypt32.rc:86 msgid "Serialized Signature Serial Number" -msgstr "Serialized Signature Serial Number" +msgstr "Serialised Signature Serial Number" #: crypt32.rc:87 msgid "Principal Name" @@ -812,7 +812,7 @@ msgstr "Windows Product Update" #: crypt32.rc:89 msgid "Enrollment Name Value Pair" -msgstr "Enrollment Name Value Pair" +msgstr "Enrolment Name Value Pair" #: crypt32.rc:90 msgid "OS Version" @@ -820,7 +820,7 @@ msgstr "OS Version" #: crypt32.rc:91 msgid "Enrollment CSP" -msgstr "Enrollment CSP" +msgstr "Enrolment CSP" #: crypt32.rc:92 msgid "CRL Number" @@ -1068,11 +1068,11 @@ msgstr "Embedded Windows System Component Verification" #: crypt32.rc:153 cryptui.rc:140 msgid "Key Pack Licenses" -msgstr "Key Pack Licenses" +msgstr "Key Pack Licences" #: crypt32.rc:154 cryptui.rc:141 msgid "License Server Verification" -msgstr "License Server Verification" +msgstr "Licence Server Verification" #: crypt32.rc:155 cryptui.rc:143 msgid "Smart Card Logon" @@ -1415,7 +1415,7 @@ msgstr "Notice Reference" #: cryptdlg.rc:35 msgid "Organization=" -msgstr "Organization=" +msgstr "Organisation=" #: cryptdlg.rc:36 msgid "Notice Number=" @@ -1647,7 +1647,7 @@ msgstr "" #: cryptui.rc:82 msgid "The file format is not recognized. Please select another file." -msgstr "" +msgstr "The file format is not recognised. Please select another file." #: cryptui.rc:83 msgid "Could not open " @@ -3507,7 +3507,7 @@ msgstr "" #: winerror.mc:1546 msgid "The device needs reinitialization\n" -msgstr "" +msgstr "The device needs reinitialisation\n" #: winerror.mc:1551 msgid "The device requires cleaning\n" @@ -6622,7 +6622,7 @@ msgstr "" #: shell32.rc:266 msgid "Wine License" -msgstr "Wine License" +msgstr "Wine Licence" #: shell32.rc:155 msgid "Trash" @@ -6662,11 +6662,11 @@ msgstr "" #: user32.rc:30 user32.rc:43 msgid "Mi&nimize" -msgstr "" +msgstr "Mi&nimise" #: user32.rc:31 user32.rc:44 taskmgr.rc:83 taskmgr.rc:99 taskmgr.rc:126 msgid "Ma&ximize" -msgstr "" +msgstr "Ma&ximise" #: user32.rc:33 msgid "&Close\tAlt-F4" @@ -6852,11 +6852,11 @@ msgstr "" #: winmm.rc:57 msgid "The driver cannot recognize the specified command parameter." -msgstr "The driver cannot recognize the specified command parameter." +msgstr "The driver cannot recognise the specified command parameter." #: winmm.rc:58 msgid "The driver cannot recognize the specified command." -msgstr "The driver cannot recognize the specified command." +msgstr "The driver cannot recognise the specified command." #: winmm.rc:59 msgid "" @@ -6868,7 +6868,7 @@ msgstr "" #: winmm.rc:60 msgid "The specified device is not open or is not recognized by MCI." -msgstr "The specified device is not open or is not recognized by MCI." +msgstr "The specified device is not open or is not recognised by MCI." #: winmm.rc:61 msgid "" @@ -7217,7 +7217,7 @@ msgid "" "The device you are trying to play to cannot recognize the current file " "format." msgstr "" -"The device you are trying to play to cannot recognize the current file " +"The device you are trying to play to cannot recognise the current file " "format." #: winmm.rc:116 @@ -8015,6 +8015,8 @@ msgid "" "ENDLOCAL ends localization of environment changes in a batch file\n" "which were introduced by a preceding SETLOCAL.\n" msgstr "" +"ENDLOCAL ends localisation of environment changes in a batch file\n" +"which were introduced by a preceding SETLOCAL.\n" #: cmd.rc:217 msgid "" @@ -8025,6 +8027,12 @@ msgid "" "file, whichever comes first), at which point the previous environment\n" "settings are restored.\n" msgstr "" +"SETLOCAL starts localisation of environment changes in a batch file.\n" +"\n" +"Environment changes done after a SETLOCAL are local to the batch file, and\n" +"are preserved until the next ENDLOCAL is encountered (or at the end of the\n" +"file, whichever comes first), at which point the previous environment\n" +"settings are restored.\n" #: cmd.rc:220 msgid "" @@ -8143,7 +8151,7 @@ msgstr "" "DEL (ERASE)\tDelete a file or set of files\n" "DIR\t\tList the contents of a directory\n" "ECHO\t\tCopy text directly to the console output\n" -"ENDLOCAL\tEnd localization of environment changes in a batch file\n" +"ENDLOCAL\tEnd localisation of environment changes in a batch file\n" "FTYPE\t\tShow or modify open commands associated with file types\n" "HELP\t\tShow brief help details on a topic\n" "MD (MKDIR)\tCreate a subdirectory\n" @@ -9010,7 +9018,7 @@ msgstr "" #: progman.rc:43 msgid "&Minimize on run" -msgstr "" +msgstr "&Minimise on run" #: progman.rc:44 winefile.rc:73 msgid "&Save settings on exit" @@ -9456,14 +9464,14 @@ msgstr "" "start [options] document_filename\n" "\n" "Options:\n" -"/M[inimized] Start the program minimized.\n" -"/MAX[imized] Start the program maximized.\n" -"/R[estored] Start the program normally (neither minimized nor maximized).\n" +"/M[inimised] Start the program minimised.\n" +"/MAX[imised] Start the program maximised.\n" +"/R[estored] Start the program normally (neither minimised nor maximised).\n" "/W[ait] Wait for started program to finish, then exit with its exit " "code.\n" "/Unix Use a Unix filename and start the file like windows explorer.\n" "/ProgIDOpen Open a document using the following progID.\n" -"/L Show end-user license.\n" +"/L Show end-user licence.\n" "/? Display this help and exit.\n" "\n" "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" @@ -9589,11 +9597,11 @@ msgstr "" #: taskmgr.rc:45 msgid "&Minimize On Use" -msgstr "" +msgstr "&Minimise On Use" #: taskmgr.rc:47 msgid "&Hide When Minimized" -msgstr "" +msgstr "&Hide When Minimised" #: taskmgr.rc:49 taskmgr.rc:257 msgid "&Show 16-bit tasks" @@ -9653,7 +9661,7 @@ msgstr "" #: taskmgr.rc:82 taskmgr.rc:98 taskmgr.rc:125 msgid "&Minimize" -msgstr "" +msgstr "&Minimise" #: taskmgr.rc:84 taskmgr.rc:100 taskmgr.rc:127 msgid "&Cascade" @@ -9729,15 +9737,15 @@ msgstr "" #: taskmgr.rc:188 msgid "Task Manager remains in front of all other windows unless minimized" -msgstr "" +msgstr "Task Manager remains in front of all other windows unless minimised" #: taskmgr.rc:190 msgid "Task Manager is minimized when a SwitchTo operation is performed" -msgstr "" +msgstr "Task Manager is minimised when a SwitchTo operation is performed" #: taskmgr.rc:191 msgid "Hide the Task Manager when it is minimized" -msgstr "" +msgstr "Hide the Task Manager when it is minimised" #: taskmgr.rc:192 msgid "Force Task Manager to update now, regardless of Update Speed setting" @@ -9781,11 +9789,11 @@ msgstr "" #: taskmgr.rc:207 msgid "Minimizes the windows" -msgstr "" +msgstr "Minimises the windows" #: taskmgr.rc:208 msgid "Maximizes the windows" -msgstr "" +msgstr "Maximises the windows" #: taskmgr.rc:209 msgid "Cascades the windows diagonally on the desktop" @@ -10503,7 +10511,7 @@ msgstr "" #: wineconsole.rc:43 msgid "wineconsole: Unrecognized command line option\n" -msgstr "" +msgstr "wineconsole: Unrecognised command line option\n" #: wineconsole.rc:44 msgid "Starts a program in a Wine console\n"

1 0

Alexandre Julliard : gdi32: Fix a misplaced release_dc_ptr call.
by Alexandre Julliard 28 Oct '11

28 Oct '11

Module: wine Branch: master Commit: 26aaaa1269b1055935b65164759375477113a148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26aaaa1269b1055935b651647… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 28 11:29:34 2011 +0200 gdi32: Fix a misplaced release_dc_ptr call. --- dlls/gdi32/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 44f1af4..10a7f1d 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -653,8 +653,8 @@ static INT FONT_EnumFontFamiliesEx( HDC hDC, LPLOGFONTW plf, FONTENUMPROCW efpro fe.unicode = unicode; fe.hdc = hDC; ret = physdev->funcs->pEnumFonts( physdev, plf, FONT_EnumInstance, (LPARAM)&fe ); + release_dc_ptr( dc ); } - release_dc_ptr( dc ); return ret; }

1 0

Alexandre Julliard : winex11: Mask FPU exceptions around fontconfig calls.
by Alexandre Julliard 28 Oct '11

28 Oct '11

Module: wine Branch: master Commit: 171183c77b2ac7c808d5090f7c46a71b7d033eb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=171183c77b2ac7c808d5090f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 28 12:41:14 2011 +0200 winex11: Mask FPU exceptions around fontconfig calls. --- dlls/winex11.drv/xrender.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 8ee3f59..3157d8c 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -952,11 +952,18 @@ static int GetCacheEntry( HDC hdc, LFANDSIZE *plfsz ) #ifdef SONAME_LIBFONTCONFIG if (fontconfig_installed) { - FcPattern *match, *pattern = pFcPatternCreate(); + FcPattern *match, *pattern; FcResult result; char family[LF_FACESIZE * 4]; +#if defined(__i386__) && defined(__GNUC__) + /* fontconfig generates floating point exceptions, mask them */ + WORD cw, default_cw = 0x37f; + __asm__ __volatile__("fnstcw %0; fldcw %1" : "=m" (cw) : "m" (default_cw)); +#endif + WideCharToMultiByte( CP_UTF8, 0, plfsz->lf.lfFaceName, -1, family, sizeof(family), NULL, NULL ); + pattern = pFcPatternCreate(); pFcPatternAddString( pattern, FC_FAMILY, (FcChar8 *)family ); if (plfsz->lf.lfWeight != FW_DONTCARE) { @@ -1007,6 +1014,10 @@ static int GetCacheEntry( HDC hdc, LFANDSIZE *plfsz ) pFcPatternDestroy( match ); } pFcPatternDestroy( pattern ); + +#if defined(__i386__) && defined(__GNUC__) + __asm__ __volatile__("fnclex; fldcw %0" : : "m" (cw)); +#endif } #endif /* SONAME_LIBFONTCONFIG */

1 0

Frédéric Delanoy : cmd: Make 'if errorlevel' only recognize integer values.
by Alexandre Julliard 28 Oct '11

28 Oct '11

Module: wine Branch: master Commit: 45c1dff5521a71d09c368ed3216f21eea71ee10d URL: http://source.winehq.org/git/wine.git/?a=commit;h=45c1dff5521a71d09c368ed32… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 26 16:57:52 2011 +0200 cmd: Make 'if errorlevel' only recognize integer values. --- programs/cmd/builtins.c | 9 ++++++++- programs/cmd/tests/test_builtins.cmd | 6 ++++++ programs/cmd/tests/test_builtins.cmd.exp | 2 ++ 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 721fb02..22e0342 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1513,7 +1513,14 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) { WINE_TRACE("Condition: %s\n", wine_dbgstr_w(condition)); if (!lstrcmpiW (condition, errlvlW)) { - test = (errorlevel >= atoiW(WCMD_parameter(p, 1+negate, NULL, NULL))); + WCHAR *param = WCMD_parameter(p, 1+negate, NULL, NULL); + WCHAR *endptr; + long int param_int = strtolW(param, &endptr, 10); + if (*endptr) { + WCMD_output_stderr(WCMD_LoadMessage(WCMD_SYNTAXERR)); + return; + } + test = ((long int)errorlevel >= param_int); WCMD_parameter(p, 2+negate, &command, NULL); } else if (!lstrcmpiW (condition, existW)) { diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 02e264d..a56d0a3 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1485,10 +1485,16 @@ call :setError 1 echo %ErrorLevel% if errorlevel 2 echo errorlevel too high, bad if errorlevel 1 echo errorlevel just right, good +if errorlevel 01 echo errorlevel with leading zero just right, good +if errorlevel -1 echo errorlevel with negative number OK +if errorlevel 0x1 echo hexa should not be recognized! +if errorlevel 1a echo invalid error level recognized! call :setError 0 echo abc%ErrorLevel%def if errorlevel 1 echo errorlevel nonzero, bad if not errorlevel 1 echo errorlevel zero, good +if not errorlevel 0x1 echo hexa should not be recognized! +if not errorlevel 1a echo invalid error level recognized! rem Now verify that setting a real variable hides its magic variable set errorlevel=7 echo %ErrorLevel% should be 7 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 20e5d12..7a0eec3 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -792,6 +792,8 @@ localval 9009 1 errorlevel just right, good +errorlevel with leading zero just right, good +errorlevel with negative number OK abc0def(a)or_broken@abc1def errorlevel zero, good(a)or_broken@errorlevel nonzero, bad 7 should be 7

1 0

Austin English : winex11: Only declare the winediag debug channel if OpenGL is enabled.
by Alexandre Julliard 28 Oct '11

28 Oct '11

Module: wine Branch: master Commit: abfb9211c8ce3c2f770c4a4df9fa7cd49e0cd4b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abfb9211c8ce3c2f770c4a4df… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Oct 27 13:17:34 2011 -0500 winex11: Only declare the winediag debug channel if OpenGL is enabled. --- dlls/winex11.drv/opengl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 78a717d..0d4d822 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -42,10 +42,11 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wgl); -WINE_DECLARE_DEBUG_CHANNEL(winediag); #ifdef SONAME_LIBGL +WINE_DECLARE_DEBUG_CHANNEL(winediag); + #undef APIENTRY #undef CALLBACK #undef WINAPI

1 0

Austin English : winex11: Only declare X11DRV_DIB_QueryXShm if XShm is supported.
by Alexandre Julliard 28 Oct '11

28 Oct '11

Module: wine Branch: master Commit: 31f8a525c8ce42b815d0824ffd213e15f4776c6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f8a525c8ce42b815d0824ff… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Oct 27 13:25:26 2011 -0500 winex11: Only declare X11DRV_DIB_QueryXShm if XShm is supported. --- dlls/winex11.drv/dib.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index b70dcfa..7e30530 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -3849,7 +3849,6 @@ static XImage *X11DRV_XShmCreateImage( int width, int height, int bpp, } return image; } -#endif /* HAVE_LIBXXSHM */ static Bool X11DRV_DIB_QueryXShm( Bool *pixmaps ) { @@ -3858,17 +3857,16 @@ static Bool X11DRV_DIB_QueryXShm( Bool *pixmaps ) if (!initialized) { -#ifdef HAVE_LIBXXSHM int major, minor; have_xshm = XShmQueryVersion( gdi_display, &major, &minor, &have_xshm_pixmaps ); -#endif initialized = TRUE; } *pixmaps = have_xshm_pixmaps; return have_xshm; } +#endif /* HAVE_LIBXXSHM */ /*********************************************************************** * X11DRV_CreateDIBSection (X11DRV.@)

1 0

Aric Stewart : user32: Handle PosFromChar if the string is empty and so we have no ssa.
by Alexandre Julliard 28 Oct '11

28 Oct '11

Module: wine Branch: master Commit: 820460fccecb3eb25e983a85088ed8c9ec2b785f URL: http://source.winehq.org/git/wine.git/?a=commit;h=820460fccecb3eb25e983a850… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 27 13:38:00 2011 -0500 user32: Handle PosFromChar if the string is empty and so we have no ssa. --- dlls/user32/edit.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index f8cf757..71df7e6 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1069,11 +1069,16 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) EDIT_UpdateUniscribeData(es, NULL, 0); if (es->x_offset) { - if (es->x_offset>= get_text_length(es)) + if (es->x_offset >= get_text_length(es)) { - const SIZE *size; - size = ScriptString_pSize(es->ssa); - xoff = size->cx; + if (es->ssa) + { + const SIZE *size; + size = ScriptString_pSize(es->ssa); + xoff = size->cx; + } + else + xoff = 0; } ScriptStringCPtoX(es->ssa, es->x_offset, FALSE, &xoff); } @@ -1081,9 +1086,14 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) { if (index >= get_text_length(es)) { - const SIZE *size; - size = ScriptString_pSize(es->ssa); - xi = size->cx; + if (es->ssa) + { + const SIZE *size; + size = ScriptString_pSize(es->ssa); + xi = size->cx; + } + else + xi = 0; } else ScriptStringCPtoX(es->ssa, index, FALSE, &xi);

1 0