wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Alexandre Julliard : wineps: Fix the output of indexed bitmaps in PutImage.
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: dd3721c0f99dc0becc26674adfcd22cfff17c58e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd3721c0f99dc0becc26674ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 28 23:04:53 2011 +0200 wineps: Fix the output of indexed bitmaps in PutImage. --- dlls/wineps.drv/ps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 7b8a0bf..4b70f79 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -680,7 +680,7 @@ BOOL PSDRV_WriteRGBQUAD(PHYSDEV dev, const RGBQUAD *rgb, int number) int i; ptr = buf; - for(i = 0; i < number; i++) + for(i = 0; i < number; i++, rgb++) ptr += sprintf(ptr, "%02x%02x%02x%c", rgb->rgbRed, rgb->rgbGreen, rgb->rgbBlue, ((i & 0x7) == 0x7) || (i == number - 1) ? '\n' : ' ');

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

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

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

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

Michael Stefaniuc : include: Fix numeric constants in mmsystem. h for LLP64 compilers.
by Alexandre Julliard 28 Oct '11

28 Oct '11

Module: wine Branch: master Commit: cb1dd010ef3d11c8cbea77e27a6563f2aad5114d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb1dd010ef3d11c8cbea77e27… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 28 16:25:54 2011 +0200 include: Fix numeric constants in mmsystem.h for LLP64 compilers. Fixup for 5439aede62e40511703784eca5d01b16678b680a --- include/mmsystem.h | 516 ++++++++++++++++++++++++++-------------------------- 1 files changed, 258 insertions(+), 258 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb1dd010ef3d11c8cbea7…

1 0

Huw Davies : comctl32: Initialise the mask's colour table.
by Alexandre Julliard 28 Oct '11

28 Oct '11

Module: wine Branch: master Commit: 66fe4e74cb9c07e9639f388d0135efa056f8c49e URL: http://source.winehq.org/git/wine.git/?a=commit;h=66fe4e74cb9c07e9639f388d0… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 28 14:55:08 2011 +0100 comctl32: Initialise the mask's colour table. --- dlls/comctl32/imagelist.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 83b8b44..bd706ac 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1226,6 +1226,14 @@ static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int des /* generate alpha channel from the mask */ info->bmiHeader.biBitCount = 1; info->bmiHeader.biSizeImage = width_bytes * cy; + info->bmiColors[0].rgbRed = 0; + info->bmiColors[0].rgbGreen = 0; + info->bmiColors[0].rgbBlue = 0; + info->bmiColors[0].rgbReserved = 0; + info->bmiColors[1].rgbRed = 0xff; + info->bmiColors[1].rgbGreen = 0xff; + info->bmiColors[1].rgbBlue = 0xff; + info->bmiColors[1].rgbReserved = 0; if (!(mask = CreateDIBSection( himl->hdcMask, info, DIB_RGB_COLORS, &mask_bits, 0, 0 ))) goto done; SelectObject( hdc, mask );

1 0

Huw Davies : gdi32: Pass a NULL user-style array to ExtCreatePen if the user-style count is zero .
by Alexandre Julliard 28 Oct '11

28 Oct '11

Module: wine Branch: master Commit: 1c1fff557d725971c2af4cb49fa77ee0a210b5d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c1fff557d725971c2af4cb49… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 28 14:25:48 2011 +0100 gdi32: Pass a NULL user-style array to ExtCreatePen if the user-style count is zero. --- dlls/gdi32/enhmetafile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 62faa89..ea0ce3b 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -945,7 +945,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( (handletable->objectHandle)[pPen->ihPen] = ExtCreatePen(pPen->elp.elpPenStyle, pPen->elp.elpWidth, &lb, - pPen->elp.elpNumEntries, pPen->elp.elpStyleEntry); + pPen->elp.elpNumEntries, pPen->elp.elpNumEntries ? pPen->elp.elpStyleEntry : NULL); break; } case EMR_CREATEBRUSHINDIRECT:

1 0

Alexandre Julliard : gdi32: Add path entry points for functions that behave differently with an open path .
by Alexandre Julliard 28 Oct '11

28 Oct '11

Module: wine Branch: master Commit: 418424d36264e0508f123352d9769649c878c10d URL: http://source.winehq.org/git/wine.git/?a=commit;h=418424d36264e0508f123352d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 28 13:16:11 2011 +0200 gdi32: Add path entry points for functions that behave differently with an open path. --- dlls/gdi32/path.c | 54 ++++++++++++++++++++++++++++++++-------------------- 1 files changed, 33 insertions(+), 21 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index afb5660..65b2544 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -804,6 +804,16 @@ BOOL WINAPI SelectClipPath(HDC hdc, INT iMode) /*********************************************************************** + * pathdrv_BeginPath + */ +static BOOL pathdrv_BeginPath( PHYSDEV dev ) +{ + /* path already open, nothing to do */ + return TRUE; +} + + +/*********************************************************************** * pathdrv_AbortPath */ static BOOL pathdrv_AbortPath( PHYSDEV dev ) @@ -1588,6 +1598,21 @@ static BOOL pathdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const REC } +/************************************************************* + * pathdrv_CloseFigure + */ +static BOOL pathdrv_CloseFigure( PHYSDEV dev ) +{ + struct path_physdev *physdev = get_path_physdev( dev ); + + /* Set PT_CLOSEFIGURE on the last entry and start a new stroke */ + /* It is not necessary to draw a line, PT_CLOSEFIGURE is a virtual closing line itself */ + if (physdev->path->numEntriesUsed) + physdev->path->pFlags[physdev->path->numEntriesUsed - 1] |= PT_CLOSEFIGURE; + return TRUE; +} + + /******************************************************************* * FlattenPath [GDI32.@] * @@ -2113,14 +2138,10 @@ BOOL nulldrv_BeginPath( PHYSDEV dev ) { DC *dc = get_nulldrv_dc( dev ); - /* If path is already open, do nothing */ - if (dc->path.state != PATH_Open) - { - if (!path_driver.pCreateDC( &dc->physDev, NULL, NULL, NULL, NULL )) return FALSE; - PATH_EmptyPath(&dc->path); - dc->path.newStroke = TRUE; - dc->path.state = PATH_Open; - } + if (!path_driver.pCreateDC( &dc->physDev, NULL, NULL, NULL, NULL )) return FALSE; + PATH_EmptyPath(&dc->path); + dc->path.newStroke = TRUE; + dc->path.state = PATH_Open; return TRUE; } @@ -2140,17 +2161,8 @@ BOOL nulldrv_AbortPath( PHYSDEV dev ) BOOL nulldrv_CloseFigure( PHYSDEV dev ) { - DC *dc = get_nulldrv_dc( dev ); - - if (dc->path.state != PATH_Open) - { - SetLastError( ERROR_CAN_NOT_COMPLETE ); - return FALSE; - } - /* Set PT_CLOSEFIGURE on the last entry and start a new stroke */ - /* It is not necessary to draw a line, PT_CLOSEFIGURE is a virtual closing line itself */ - if (dc->path.numEntriesUsed) dc->path.pFlags[dc->path.numEntriesUsed - 1] |= PT_CLOSEFIGURE; - return TRUE; + SetLastError( ERROR_CAN_NOT_COMPLETE ); + return FALSE; } BOOL nulldrv_SelectClipPath( PHYSDEV dev, INT mode ) @@ -2248,11 +2260,11 @@ const struct gdi_dc_funcs path_driver = pathdrv_AngleArc, /* pAngleArc */ pathdrv_Arc, /* pArc */ pathdrv_ArcTo, /* pArcTo */ - NULL, /* pBeginPath */ + pathdrv_BeginPath, /* pBeginPath */ NULL, /* pBlendImage */ NULL, /* pChoosePixelFormat */ pathdrv_Chord, /* pChord */ - NULL, /* pCloseFigure */ + pathdrv_CloseFigure, /* pCloseFigure */ NULL, /* pCreateBitmap */ NULL, /* pCreateCompatibleDC */ pathdrv_CreateDC, /* pCreateDC */

1 0

Alexandre Julliard : gdi32: Always start a new stroke when the path ends with a closed figure.
by Alexandre Julliard 28 Oct '11

28 Oct '11

Module: wine Branch: master Commit: e5db8969acd5260ad499c4d229f08cf3357fce48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5db8969acd5260ad499c4d22… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 27 09:36:41 2011 +0200 gdi32: Always start a new stroke when the path ends with a closed figure. --- dlls/gdi32/path.c | 21 +++++++-------------- 1 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 1d78bd2..afb5660 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -225,11 +225,6 @@ static BOOL PATH_AddEntry(GdiPath *pPath, const POINT *pPoint, BYTE flags) pPath->pPoints[pPath->numEntriesUsed]=*pPoint; pPath->pFlags[pPath->numEntriesUsed]=flags; - /* If this is PT_CLOSEFIGURE, we have to start a new stroke next time */ - if((flags & PT_CLOSEFIGURE) == PT_CLOSEFIGURE) - pPath->newStroke=TRUE; - - /* Increment entry count */ pPath->numEntriesUsed++; return TRUE; @@ -256,9 +251,13 @@ static BYTE *add_log_points( struct path_physdev *physdev, const POINT *points, static BOOL start_new_stroke( struct path_physdev *physdev ) { POINT pos; + GdiPath *path = physdev->path; - if (!physdev->path->newStroke) return TRUE; - physdev->path->newStroke = FALSE; + if (!path->newStroke && path->numEntriesUsed && + !(path->pFlags[path->numEntriesUsed - 1] & PT_CLOSEFIGURE)) + return TRUE; + + path->newStroke = FALSE; GetCurrentPositionEx( physdev->dev.hdc, &pos ); return add_log_points( physdev, &pos, 1, PT_MOVETO ) != NULL; } @@ -1359,7 +1358,6 @@ static BOOL pathdrv_Polygon( PHYSDEV dev, const POINT *pts, INT cbPoints ) if (!type) return FALSE; if (cbPoints) type[0] = PT_MOVETO; if (cbPoints > 1) type[cbPoints - 1] = PT_LINETO | PT_CLOSEFIGURE; - physdev->path->newStroke = TRUE; return TRUE; } @@ -1381,7 +1379,6 @@ static BOOL pathdrv_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* count add_log_points( physdev, pts, 1, PT_LINETO | PT_CLOSEFIGURE ); pts += counts[poly]; } - physdev->path->newStroke = TRUE; return TRUE; } @@ -2152,11 +2149,7 @@ BOOL nulldrv_CloseFigure( PHYSDEV dev ) } /* Set PT_CLOSEFIGURE on the last entry and start a new stroke */ /* It is not necessary to draw a line, PT_CLOSEFIGURE is a virtual closing line itself */ - if (dc->path.numEntriesUsed) - { - dc->path.pFlags[dc->path.numEntriesUsed - 1] |= PT_CLOSEFIGURE; - dc->path.newStroke = TRUE; - } + if (dc->path.numEntriesUsed) dc->path.pFlags[dc->path.numEntriesUsed - 1] |= PT_CLOSEFIGURE; return TRUE; }

1 0

← Newer
1
2
3
4
5
6
7
8
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2011