wine-commits May 2008

wine-commits@winehq.org

4 participants
722 discussions

Nikolay Sivov : gdiplus: Let GdipDrawArcI use float args version.
by Alexandre Julliard 08 May '08

08 May '08

Module: wine Branch: master Commit: a77dc34b41482c31989e9b664dc35bb7570c8692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77dc34b41482c31989e9b664… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu May 8 00:39:05 2008 +0400 gdiplus: Let GdipDrawArcI use float args version. --- dlls/gdiplus/graphics.c | 17 +---------------- 1 files changed, 1 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 416741c..a86a015 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -932,22 +932,7 @@ GpStatus WINGDIPAPI GdipDrawArc(GpGraphics *graphics, GpPen *pen, REAL x, GpStatus WINGDIPAPI GdipDrawArcI(GpGraphics *graphics, GpPen *pen, INT x, INT y, INT width, INT height, REAL startAngle, REAL sweepAngle) { - INT save_state, num_pts; - GpPointF points[MAX_ARC_PTS]; - GpStatus retval; - - if(!graphics || !pen || width <= 0 || height <= 0) - return InvalidParameter; - - num_pts = arc2polybezier(points, x, y, width, height, startAngle, sweepAngle); - - save_state = prepare_dc(graphics, pen); - - retval = draw_polybezier(graphics, pen, points, num_pts, TRUE); - - restore_dc(graphics, save_state); - - return retval; + return GdipDrawArc(graphics,pen,(REAL)x,(REAL)y,(REAL)width,(REAL)height,startAngle,sweepAngle); } GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1,

1 0

Vitaly Lipatov : wineboot: Add missed short option -u.
by Alexandre Julliard 08 May '08

08 May '08

Module: wine Branch: master Commit: 6bca330d4d41b86a9703a124489196fd90eed9a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bca330d4d41b86a9703a1244… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Wed May 7 23:02:56 2008 +0400 wineboot: Add missed short option -u. --- programs/wineboot/wineboot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index a682e65..717a175 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -798,7 +798,7 @@ static void usage(void) WINE_MESSAGE( " -u,--update Update the wineprefix directory\n" ); } -static const char short_options[] = "efhikrs"; +static const char short_options[] = "efhikrsu"; static const struct option long_options[] = {

1 0

Alexandre Julliard : ntdll: Ignore failures to retrieve serial status for events we are not interested in .
by Alexandre Julliard 08 May '08

08 May '08

Module: wine Branch: master Commit: 03fbe0163294d1af2418ade46210f6ed6dc37e39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03fbe0163294d1af2418ade46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 7 21:10:39 2008 +0200 ntdll: Ignore failures to retrieve serial status for events we are not interested in. Based on a patch by Valentine Sinitsyn. --- dlls/ntdll/serial.c | 41 +++++++++++++++++++++++------------------ 1 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 3e1c071..bdb47e4 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -287,18 +287,13 @@ static NTSTATUS get_line_control(int fd, SERIAL_LINE_CONTROL* slc) static NTSTATUS get_modem_status(int fd, DWORD* lpModemStat) { - NTSTATUS status = STATUS_SUCCESS; + NTSTATUS status = STATUS_NOT_SUPPORTED; int mstat; + *lpModemStat = 0; #ifdef TIOCMGET - if (ioctl(fd, TIOCMGET, &mstat) == -1) - { - WARN("ioctl failed\n"); - status = FILE_GetNtStatus(); - } - else + if (!ioctl(fd, TIOCMGET, &mstat)) { - *lpModemStat = 0; #ifdef TIOCM_CTS if (mstat & TIOCM_CTS) *lpModemStat |= MS_CTS_ON; #endif @@ -317,9 +312,10 @@ static NTSTATUS get_modem_status(int fd, DWORD* lpModemStat) (*lpModemStat & MS_RING_ON) ? "MS_RING_ON " : "", (*lpModemStat & MS_DSR_ON) ? "MS_DSR_ON " : "", (*lpModemStat & MS_CTS_ON) ? "MS_CTS_ON " : ""); + return STATUS_SUCCESS; } -#else - status = STATUS_NOT_SUPPORTED; + WARN("ioctl failed\n"); + status = FILE_GetNtStatus(); #endif return status; } @@ -873,6 +869,7 @@ typedef struct async_commio */ static NTSTATUS get_irq_info(int fd, serial_irq_info *irq_info) { + NTSTATUS status = STATUS_NOT_IMPLEMENTED; #ifdef TIOCGICOUNT struct serial_icounter_struct einfo; if (!ioctl(fd, TIOCGICOUNT, &einfo)) @@ -887,11 +884,10 @@ static NTSTATUS get_irq_info(int fd, serial_irq_info *irq_info) return STATUS_SUCCESS; } TRACE("TIOCGICOUNT err %s\n", strerror(errno)); - return FILE_GetNtStatus(); -#else - memset(irq_info,0, sizeof(serial_irq_info)); - return STATUS_NOT_IMPLEMENTED; + status = FILE_GetNtStatus(); #endif + memset(irq_info,0, sizeof(serial_irq_info)); + return status; } @@ -1050,15 +1046,24 @@ static NTSTATUS wait_on(HANDLE hDevice, int fd, HANDLE hEvent, DWORD* events) #endif if (commio->evtmask & EV_RXFLAG) FIXME("EV_RXFLAG not handled\n"); - if ((status = get_irq_info(fd, &commio->irq_info)) || - (status = get_modem_status(fd, &commio->mstat))) - goto out_now; + + if ((status = get_irq_info(fd, &commio->irq_info)) && + (commio->evtmask & (EV_BREAK | EV_ERR))) + goto out_now; + + if ((status = get_modem_status(fd, &commio->mstat)) && + (commio->evtmask & (EV_CTS | EV_DSR| EV_RING| EV_RLSD))) + goto out_now; /* We might have received something or the TX buffer is delivered */ *events = check_events(fd, commio->evtmask, &commio->irq_info, &commio->irq_info, commio->mstat, commio->mstat); - if (*events) goto out_now; + if (*events) + { + status = STATUS_SUCCESS; + goto out_now; + } /* create the worker for the task */ status = RtlQueueWorkItem(wait_for_event, commio, 0 /* FIXME */);

1 0

Maarten Lankhorst : ntdll: Fix file test to not free memory allocated on the stack.
by Alexandre Julliard 07 May '08

07 May '08

Module: wine Branch: master Commit: b574c11582eac45499e7a78fcbe654ad897dd94b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b574c11582eac45499e7a78fc… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed May 7 11:05:13 2008 -0700 ntdll: Fix file test to not free memory allocated on the stack. --- dlls/ntdll/tests/file.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 8d2ffc3..7b88b01 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -39,7 +39,6 @@ #endif static VOID (WINAPI *pRtlInitUnicodeString)( PUNICODE_STRING, LPCWSTR ); -static VOID (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); static NTSTATUS (WINAPI *pNtCreateMailslotFile)( PHANDLE, ULONG, POBJECT_ATTRIBUTES, PIO_STATUS_BLOCK, ULONG, ULONG, ULONG, PLARGE_INTEGER ); static NTSTATUS (WINAPI *pNtReadFile)(HANDLE hFile, HANDLE hEvent, @@ -467,8 +466,6 @@ static void nt_mailslot_test(void) rc = pNtClose(hslot); ok( rc == STATUS_SUCCESS, "NtClose failed\n"); - - pRtlFreeUnicodeString(&str); } static void test_iocp_setcompletion(HANDLE h) @@ -611,7 +608,6 @@ START_TEST(file) return; } - pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); pRtlInitUnicodeString = (void *)GetProcAddress(hntdll, "RtlInitUnicodeString"); pNtCreateMailslotFile = (void *)GetProcAddress(hntdll, "NtCreateMailslotFile"); pNtReadFile = (void *)GetProcAddress(hntdll, "NtReadFile");

1 0

Maarten Lankhorst : ntdll: Fix some exception tests to pass on Windows.
by Alexandre Julliard 07 May '08

07 May '08

Module: wine Branch: master Commit: 9c509234bc7d3d615da60b80e5c7c528d5858c0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c509234bc7d3d615da60b80e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed May 7 10:41:52 2008 -0700 ntdll: Fix some exception tests to pass on Windows. --- dlls/ntdll/tests/exception.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index d6168ee..80a8fbd 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -105,7 +105,7 @@ static const struct exception /* test loading an invalid selector */ { { 0xb8, 0xef, 0xbe, 0x00, 0x00, 0x8e, 0xe8, 0xc3 }, /* mov $beef,%ax; mov %ax,%gs; ret */ - 5, 2, STATUS_ACCESS_VIOLATION, 2, { 0, 0xbee8 } }, + 5, 2, STATUS_ACCESS_VIOLATION, 2, { 0, 0xbee8 } }, /* 0xbee8 or 0xffffffff */ /* test accessing a zero selector */ { { 0x06, 0x31, 0xc0, 0x8e, 0xc0, 0x26, 0xa1, 0, 0, 0, 0, 0x07, 0xc3 }, @@ -358,6 +358,14 @@ static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *fram goto skip_params; } + /* Seems that both 0xbee8 and 0xfffffffff can be returned in windows */ + if (except->nb_params == 2 && rec->NumberParameters == 2 + && except->params[1] == 0xbee8 && rec->ExceptionInformation[1] == 0xffffffff + && except->params[0] == rec->ExceptionInformation[0]) + { + goto skip_params; + } + for (i = 0; i < rec->NumberParameters; i++) ok( rec->ExceptionInformation[i] == except->params[i], "%u: Wrong parameter %d: %lx/%x\n", @@ -485,7 +493,8 @@ static DWORD direction_flag_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATI #ifdef __GNUC__ unsigned int flags; __asm__("pushfl; popl %0" : "=r" (flags) ); - ok( !(flags & 0x400), "eflags has DF bit set\n" ); + /* older windows versions don't clear DF properly so don't test */ + if (flags & 0x400) trace( "eflags has DF bit set\n" ); #endif ok( context->EFlags & 0x400, "context eflags has DF bit cleared\n" ); got_exception++;

1 0

Maarten Lankhorst : rpcrt4: Fix ndr_marshall test failures.
by Alexandre Julliard 07 May '08

07 May '08

Module: wine Branch: master Commit: fd7b277d8ac23706b1c819d2ed1fd0ee9833fd06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd7b277d8ac23706b1c819d2e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue May 6 15:06:17 2008 -0700 rpcrt4: Fix ndr_marshall test failures. Created with help from Robert Shearman. --- dlls/rpcrt4/tests/ndr_marshall.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 72fd1be..1ff5e3b 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -514,7 +514,9 @@ static void test_nontrivial_pointer_types(void) NdrPointerBufferSize( &StubMsg, (unsigned char *)p1, &fmtstr_ref_unique_out[4] ); - ok(StubMsg.BufferLength == 5, "length %d\n", StubMsg.BufferLength); + + /* Windows overestimates the buffer size */ + ok(StubMsg.BufferLength >= 5, "length %d\n", StubMsg.BufferLength); /*NdrGetBuffer(&_StubMsg, _StubMsg.BufferLength, NULL);*/ StubMsg.RpcMsg->Buffer = StubMsg.BufferStart = StubMsg.Buffer = HeapAlloc(GetProcessHeap(), 0, StubMsg.BufferLength); @@ -1706,7 +1708,7 @@ static void test_nonconformant_string(void) static void test_ndr_buffer(void) { static unsigned char ncalrpc[] = "ncalrpc"; - static unsigned char endpoint[] = "winetest:" __FILE__; + static unsigned char endpoint[] = "winetest:test_ndr_buffer"; RPC_MESSAGE RpcMessage; MIDL_STUB_MESSAGE StubMsg; MIDL_STUB_DESC StubDesc = Object_StubDesc; @@ -1717,9 +1719,17 @@ static void test_ndr_buffer(void) StubDesc.RpcInterfaceInformation = (void *)&IFoo___RpcServerInterface; - ok(RPC_S_OK == RpcServerUseProtseqEp(ncalrpc, 20, endpoint, NULL), "RpcServerUseProtseqEp\n"); - ok(RPC_S_OK == RpcServerRegisterIf(IFoo_v0_0_s_ifspec, NULL, NULL), "RpcServerRegisterIf\n"); - ok(RPC_S_OK == RpcServerListen(1, 20, TRUE), "RpcServerListen\n"); + status = RpcServerUseProtseqEp(ncalrpc, 20, endpoint, NULL); + ok(RPC_S_OK == status, "RpcServerUseProtseqEp failed with status %lu\n", status); + status = RpcServerRegisterIf(IFoo_v0_0_s_ifspec, NULL, NULL); + ok(RPC_S_OK == status, "RpcServerRegisterIf failed with status %lu\n", status); + status = RpcServerListen(1, 20, TRUE); + ok(RPC_S_OK == status, "RpcServerListen failed with status %lu\n", status); + if (status != RPC_S_OK) + { + /* Failed to create a server, running client tests is useless */ + return; + } status = RpcStringBindingCompose(NULL, ncalrpc, NULL, endpoint, NULL, &binding); ok(status == RPC_S_OK, "RpcStringBindingCompose failed (%lu)\n", status);

1 0

Rob Shearman : crypt32: Add stub for CertVerifyCTLUsage.
by Alexandre Julliard 07 May '08

07 May '08

Module: wine Branch: master Commit: 9e717aa2e8b03fd1b4a389022571251c99c10933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e717aa2e8b03fd1b4a389022… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed May 7 17:03:25 2008 +0100 crypt32: Add stub for CertVerifyCTLUsage. --- dlls/crypt32/cert.c | 12 ++++++++++++ dlls/crypt32/crypt32.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 84780cb..41d3998 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2574,3 +2574,15 @@ PCCERT_CONTEXT WINAPI CertCreateSelfSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HAN CryptReleaseContext(hProv, 0); return context; } + +BOOL WINAPI CertVerifyCTLUsage(DWORD dwEncodingType, DWORD dwSubjectType, + void *pvSubject, PCTL_USAGE pSubjectUsage, DWORD dwFlags, + PCTL_VERIFY_USAGE_PARA pVerifyUsagePara, + PCTL_VERIFY_USAGE_STATUS pVerifyUsageStatus) +{ + FIXME("(0x%x, %d, %p, %p, 0x%x, %p, %p): stub\n", dwEncodingType, + dwSubjectType, pvSubject, pSubjectUsage, dwFlags, pVerifyUsagePara, + pVerifyUsageStatus); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 870ee48..b7f45d0 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -89,7 +89,7 @@ @ stdcall CertVerifyCertificateChainPolicy(str ptr ptr ptr) @ stdcall CertVerifyCRLRevocation(long ptr long ptr) @ stdcall CertVerifyCRLTimeValidity(ptr ptr) -@ stub CertVerifyCTLUsage +@ stdcall CertVerifyCTLUsage(long long ptr ptr long ptr ptr) @ stdcall CertVerifyRevocation(long long long ptr long ptr ptr) @ stdcall CertVerifySubjectCertificateContext(ptr ptr ptr) @ stdcall CertVerifyTimeValidity(ptr ptr)

1 0

Alexandre Julliard : ntdll: Don' t consider a 0-byte read from a serial port as a broken pipe.
by Alexandre Julliard 07 May '08

07 May '08

Module: wine Branch: master Commit: 152d65c6f34c9973e6d6acece883443746e9b78a URL: http://source.winehq.org/git/wine.git/?a=commit;h=152d65c6f34c9973e6d6acece… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 7 20:18:09 2008 +0200 ntdll: Don't consider a 0-byte read from a serial port as a broken pipe. --- dlls/ntdll/file.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index fd72a61..972d600 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -599,10 +599,22 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, if (!result || total == length) { if (total) + { status = STATUS_SUCCESS; - else - status = (type == FD_TYPE_FILE || type == FD_TYPE_CHAR) ? STATUS_END_OF_FILE : STATUS_PIPE_BROKEN; - goto done; + goto done; + } + switch (type) + { + case FD_TYPE_FILE: + case FD_TYPE_CHAR: + status = STATUS_END_OF_FILE; + goto done; + case FD_TYPE_SERIAL: + break; + default: + status = STATUS_PIPE_BROKEN; + goto done; + } } } else

1 0

Alexandre Julliard : ntdll: Always set VTIME to 0 to avoid blocking, don' t try to set it from the comm timeouts.
by Alexandre Julliard 07 May '08

07 May '08

Module: wine Branch: master Commit: b1ace4490e8ee820977af528df02117f3583dcfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1ace4490e8ee820977af528d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 7 20:17:32 2008 +0200 ntdll: Always set VTIME to 0 to avoid blocking, don't try to set it from the comm timeouts. --- dlls/ntdll/serial.c | 42 +++++++++--------------------------------- 1 files changed, 9 insertions(+), 33 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 8155d67..3e1c071 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -664,6 +664,10 @@ static NTSTATUS set_line_control(int fd, const SERIAL_LINE_CONTROL* slc) port.c_cflag &= ~(PARENB | PARODD); #endif + /* make sure that reads don't block */ + port.c_cc[VMIN] = 0; + port.c_cc[VTIME] = 0; + switch (slc->Parity) { case NOPARITY: port.c_iflag &= ~INPCK; break; @@ -751,9 +755,6 @@ static NTSTATUS set_special_chars(int fd, const SERIAL_CHARS* sc) return FILE_GetNtStatus(); } - port.c_cc[VMIN ] = 0; - port.c_cc[VTIME ] = 1; - port.c_cc[VEOF ] = sc->EofChar; /* FIXME: sc->ErrorChar is not supported */ /* FIXME: sc->BreakChar is not supported */ @@ -769,11 +770,9 @@ static NTSTATUS set_special_chars(int fd, const SERIAL_CHARS* sc) return STATUS_SUCCESS; } -static NTSTATUS set_timeouts(HANDLE handle, int fd, const SERIAL_TIMEOUTS* st) +static NTSTATUS set_timeouts(HANDLE handle, const SERIAL_TIMEOUTS* st) { NTSTATUS status; - struct termios port; - unsigned int ux_timeout; SERVER_START_REQ( set_serial_info ) { @@ -787,31 +786,7 @@ static NTSTATUS set_timeouts(HANDLE handle, int fd, const SERIAL_TIMEOUTS* st) status = wine_server_call( req ); } SERVER_END_REQ; - if (status) return status; - - if (tcgetattr(fd, &port) == -1) - { - FIXME("tcgetattr on fd %d failed (%s)!\n", fd, strerror(errno)); - return FILE_GetNtStatus(); - } - - /* VTIME is in 1/10 seconds */ - if (st->ReadIntervalTimeout == 0) /* 0 means no timeout */ - ux_timeout = 0; - else - { - ux_timeout = (st->ReadIntervalTimeout + 99) / 100; - if (ux_timeout == 0) - ux_timeout = 1; /* must be at least some timeout */ - } - port.c_cc[VTIME] = ux_timeout; - - if (tcsetattr(fd, 0, &port) == -1) - { - FIXME("tcsetattr on fd %d failed (%s)!\n", fd, strerror(errno)); - return FILE_GetNtStatus(); - } - return STATUS_SUCCESS; + return status; } static NTSTATUS set_wait_mask(HANDLE hDevice, DWORD mask) @@ -1132,7 +1107,8 @@ static inline NTSTATUS io_control(HANDLE hDevice, piosb->Information = 0; - if (dwIoControlCode != IOCTL_SERIAL_GET_TIMEOUTS) + if (dwIoControlCode != IOCTL_SERIAL_GET_TIMEOUTS && + dwIoControlCode != IOCTL_SERIAL_SET_TIMEOUTS) if ((status = server_get_unix_fd( hDevice, access, &fd, &needs_close, NULL, NULL ))) goto error; @@ -1307,7 +1283,7 @@ static inline NTSTATUS io_control(HANDLE hDevice, break; case IOCTL_SERIAL_SET_TIMEOUTS: if (lpInBuffer && nInBufferSize == sizeof(SERIAL_TIMEOUTS)) - status = set_timeouts(hDevice, fd, (const SERIAL_TIMEOUTS*)lpInBuffer); + status = set_timeouts(hDevice, (const SERIAL_TIMEOUTS*)lpInBuffer); else status = STATUS_INVALID_PARAMETER; break;

1 0

Dmitry Timoshkov : gdi32: Implement EMFDRV_SelectPalette.
by Alexandre Julliard 07 May '08

07 May '08

Module: wine Branch: master Commit: 2820682202886cb1fc438ab55b3c39f13baef9bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2820682202886cb1fc438ab55… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed May 7 20:35:04 2008 +0900 gdi32: Implement EMFDRV_SelectPalette. --- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 + dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/enhmfdrv/objects.c | 55 ++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index f1c81a2..c00c653 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -122,6 +122,7 @@ extern HBRUSH EMFDRV_SelectBrush( PHYSDEV dev, HBRUSH handle ) DECLSPEC_HIDDEN extern BOOL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) DECLSPEC_HIDDEN; extern HFONT EMFDRV_SelectFont( PHYSDEV dev, HFONT handle, HANDLE gdiFont ) DECLSPEC_HIDDEN; extern HPEN EMFDRV_SelectPen( PHYSDEV dev, HPEN handle ) DECLSPEC_HIDDEN; +extern HPALETTE EMFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPal, BOOL force ) DECLSPEC_HIDDEN; extern INT EMFDRV_SetArcDirection( PHYSDEV dev, INT arcDirection ) DECLSPEC_HIDDEN; extern COLORREF EMFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern INT EMFDRV_SetBkMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index dafac60..de135d2 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -114,7 +114,7 @@ static const DC_FUNCTIONS EMFDRV_Funcs = EMFDRV_SelectBrush, /* pSelectBrush */ EMFDRV_SelectClipPath, /* pSelectClipPath */ EMFDRV_SelectFont, /* pSelectFont */ - NULL, /* pSelectPalette */ + EMFDRV_SelectPalette, /* pSelectPalette */ EMFDRV_SelectPen, /* pSelectPen */ EMFDRV_SetArcDirection, /* pSetArcDirection */ NULL, /* pSetBitmapBits */ diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index c7ecd54..54c34bf 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -465,6 +465,61 @@ HPEN EMFDRV_SelectPen(PHYSDEV dev, HPEN hPen ) /****************************************************************** + * EMFDRV_CreatePalette + */ +static DWORD EMFDRV_CreatePalette(PHYSDEV dev, HPALETTE hPal) +{ + WORD i; + struct { + EMRCREATEPALETTE hdr; + PALETTEENTRY entry[255]; + } pal; + + memset( &pal, 0, sizeof(pal) ); + + if (!GetObjectW( hPal, sizeof(pal.hdr.lgpl) + sizeof(pal.entry), &pal.hdr.lgpl )) + return 0; + + for (i = 0; i < pal.hdr.lgpl.palNumEntries; i++) + pal.hdr.lgpl.palPalEntry[i].peFlags = 0; + + pal.hdr.emr.iType = EMR_CREATEPALETTE; + pal.hdr.emr.nSize = sizeof(pal.hdr) + pal.hdr.lgpl.palNumEntries * sizeof(PALETTEENTRY); + pal.hdr.ihPal = EMFDRV_AddHandle( dev, hPal ); + + if (!EMFDRV_WriteRecord( dev, &pal.hdr.emr )) + pal.hdr.ihPal = 0; + return pal.hdr.ihPal; +} + +/****************************************************************** + * EMFDRV_SelectPalette + */ +HPALETTE EMFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPal, BOOL force ) +{ + EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*)dev; + EMRSELECTPALETTE emr; + DWORD index; + + if (hPal == GetStockObject( DEFAULT_PALETTE )) + index = DEFAULT_PALETTE | 0x80000000; + goto found; + + if ((index = EMFDRV_FindObject( dev, hPal )) != 0) + goto found; + + if (!(index = EMFDRV_CreatePalette( dev, hPal ))) return 0; + GDI_hdc_using_object( hPal, physDev->hdc ); + +found: + emr.emr.iType = EMR_SELECTPALETTE; + emr.emr.nSize = sizeof(emr); + emr.ihPal = index; + return EMFDRV_WriteRecord( dev, &emr.emr ) ? hPal : 0; +} + + +/****************************************************************** * EMFDRV_GdiComment */ BOOL EMFDRV_GdiComment(PHYSDEV dev, UINT bytes, CONST BYTE *buffer)

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
73
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 May 2008