wine-commits October 2008

wine-commits@winehq.org

3 participants
1216 discussions

Nikolay Sivov : gdiplus: Some tests for GdipCreateRegionHrgn added.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 2fd51e94bdb16b98852018522d5d3d50f8902c28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fd51e94bdb16b98852018522… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Oct 19 21:13:23 2008 +0400 gdiplus: Some tests for GdipCreateRegionHrgn added. --- dlls/gdiplus/region.c | 3 + dlls/gdiplus/tests/region.c | 93 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 90aaf9e..1cda0b7 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -573,6 +573,9 @@ GpStatus WINGDIPAPI GdipCreateRegionHrgn(HRGN hrgn, GpRegion **region) { FIXME("(%p, %p): stub\n", hrgn, region); + if(!hrgn || !region) + return InvalidParameter; + *region = NULL; return NotImplemented; } diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 63d0086..d2477ce 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -651,6 +651,98 @@ static void test_combinereplace(void) GdipDeleteRegion(region); } +static void test_fromhrgn(void) +{ + GpStatus status; + GpRegion *region; + HRGN hrgn; + UINT needed; + DWORD buf[220]; + RegionDataPoint *point; + + /* NULL */ + status = GdipCreateRegionHrgn(NULL, NULL); + expect(InvalidParameter, status); + status = GdipCreateRegionHrgn(NULL, &region); + expect(InvalidParameter, status); + status = GdipCreateRegionHrgn((HRGN)0xdeadbeef, &region); + todo_wine expect(InvalidParameter, status); + + /* rectangle */ + hrgn = CreateRectRgn(0, 0, 100, 10); + status = GdipCreateRegionHrgn(hrgn, &region); + todo_wine expect(Ok, status); + + status = GdipGetRegionDataSize(region, &needed); +todo_wine{ + expect(Ok, status); + expect(56, needed); +} + + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + todo_wine expect(Ok, status); + + if(status == Ok){ +todo_wine{ + expect(56, needed); + expect_dword(buf, 48); + expect_magic((DWORD*)(buf + 2)); + expect_dword(buf + 3, 0); + expect_dword(buf + 4, RGNDATA_PATH); + expect_dword(buf + 5, 0x00000020); + expect_magic((DWORD*)(buf + 6)); + expect_dword(buf + 7, 0x00000004); + expect_dword(buf + 8, 0x00006000); /* ?? */ +} + point = (RegionDataPoint*)buf + 9; + + expect(0, point[0].X); + expect(0, point[0].Y); + +todo_wine{ + expect(100,point[1].X); /* buf + 10 */ + expect(0, point[1].Y); + expect(100,point[2].X); /* buf + 11 */ + expect(10, point[2].Y); +} + expect(0, point[3].X); /* buf + 12 */ + +todo_wine{ + expect(10, point[3].Y); + expect_dword(buf + 13, 0x81010100); /* closed */ +} + } + + GdipDeleteRegion(region); + DeleteObject((HGDIOBJ)hrgn); + + /* ellipse */ + hrgn = CreateEllipticRgn(0, 0, 100, 10); + status = GdipCreateRegionHrgn(hrgn, &region); + todo_wine expect(Ok, status); + + status = GdipGetRegionDataSize(region, &needed); +todo_wine{ + expect(Ok, status); + expect(216, needed); +} + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); +todo_wine{ + expect(Ok, status); + expect(216, needed); + expect_dword(buf, 208); + expect_magic((DWORD*)(buf + 2)); + expect_dword(buf + 3, 0); + expect_dword(buf + 4, RGNDATA_PATH); + expect_dword(buf + 5, 0x000000C0); + expect_magic((DWORD*)(buf + 6)); + expect_dword(buf + 7, 0x00000024); + expect_dword(buf + 8, 0x00006000); /* ?? */ +} + GdipDeleteRegion(region); + DeleteObject((HGDIOBJ)hrgn); +} + START_TEST(region) { struct GdiplusStartupInput gdiplusStartupInput; @@ -667,6 +759,7 @@ START_TEST(region) test_isinfinite(); test_isempty(); test_combinereplace(); + test_fromhrgn(); GdiplusShutdown(gdiplusToken);

1 0

Muneyuki Noguchi : winex11: Prevent XCreateIC from returning NULL when input style isn't "root".
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: edd24b613ff8605cd5b0c7baae04434a28c29068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edd24b613ff8605cd5b0c7baa… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Sat Oct 18 23:03:48 2008 +0900 winex11: Prevent XCreateIC from returning NULL when input style isn't "root". --- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 1 + dlls/winex11.drv/xim.c | 23 +++++++++++++++++++++++ 3 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e5a40aa..90ec95a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -515,6 +515,7 @@ struct x11drv_thread_data Window grab_window; /* window that currently grabs the mouse */ HWND last_focus; /* last window that had focus */ XIM xim; /* input method */ + XFontSet font_set; /* international text drawing font set */ Window selection_wnd; /* window used for selection interactions */ }; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index fc9996a..1569481 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -562,6 +562,7 @@ static void thread_detach(void) X11DRV_ResetSelectionOwner(); wine_tsx11_lock(); if (data->xim) XCloseIM( data->xim ); + if (data->font_set) XFreeFontSet( data->display, data->font_set ); XCloseDisplay( data->display ); wine_tsx11_unlock(); HeapFree( GetProcessHeap(), 0, data ); diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 5e413f0..7c3c9d1 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -477,6 +477,26 @@ static BOOL open_xim( Display *display ) thread_data->xim = xim; + if ((ximStyle & (XIMPreeditNothing | XIMPreeditNone)) == 0 || + (ximStyle & (XIMStatusNothing | XIMStatusNone)) == 0) + { + char **list; + int count; + thread_data->font_set = XCreateFontSet(display, "fixed", + &list, &count, NULL); + TRACE("ximFontSet = %p\n", thread_data->font_set); + TRACE("list = %p, count = %d\n", list, count); + if (list != NULL) + { + int i; + for (i = 0; i < count; ++i) + TRACE("list[%d] = %s\n", i, list[i]); + XFreeStringList(list); + } + } + else + thread_data->font_set = NULL; + wine_tsx11_unlock(); IME_UpdateAssociation(NULL); wine_tsx11_lock(); @@ -518,6 +538,7 @@ XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) XICCallback P_StartCB, P_DoneCB, P_DrawCB, P_CaretCB; LANGID langid = PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())); Window win = data->whole_window; + XFontSet fontSet = x11drv_thread_data()->font_set; TRACE("xim = %p\n", xim); @@ -552,6 +573,7 @@ XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) if ((ximStyle & (XIMPreeditNothing | XIMPreeditNone)) == 0) { preedit = XVaCreateNestedList(0, + XNFontSet, fontSet, XNSpotLocation, &spot, XNPreeditStartCallback, &P_StartCB, XNPreeditDoneCallback, &P_DoneCB, @@ -575,6 +597,7 @@ XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) if ((ximStyle & (XIMStatusNothing | XIMStatusNone)) == 0) { status = XVaCreateNestedList(0, + XNFontSet, fontSet, NULL); TRACE("status = %p\n", status); }

1 0

Aric Stewart : ntdll: Implement SystemProcessorPerformanceInformation for Linux (/ proc filesystems) and Mac OS X.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: a226f6609f6fcec61331cbe4b47c9bc4e5f56d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a226f6609f6fcec61331cbe4b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 17 15:25:30 2008 -0500 ntdll: Implement SystemProcessorPerformanceInformation for Linux (/proc filesystems) and Mac OS X. --- dlls/ntdll/nt.c | 120 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/tests/info.c | 20 +++++++- 2 files changed, 134 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 3ca1755..a8365dc 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -37,6 +37,12 @@ #include "ntdll_misc.h" #include "wine/server.h" +#ifdef __APPLE__ +#include <mach/mach_init.h> +#include <mach/mach_host.h> +#include <mach/vm_map.h> +#endif + WINE_DEFAULT_DEBUG_CHANNEL(ntdll); /* @@ -900,18 +906,122 @@ NTSTATUS WINAPI NtQuerySystemInformation( break; case SystemProcessorPerformanceInformation: { - SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION sppi; + SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION *sppi = NULL; + unsigned int cpus = 0; + int out_cpus = Length / sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION); + + if (out_cpus == 0) + { + len = 0; + ret = STATUS_INFO_LENGTH_MISMATCH; + break; + } + else +#ifdef __APPLE__ + { + processor_cpu_load_info_data_t *pinfo; + mach_msg_type_number_t info_count; + + if (host_processor_info (mach_host_self (), + PROCESSOR_CPU_LOAD_INFO, + &cpus, + (processor_info_array_t*)&pinfo, + &info_count) == 0) + { + int i; + cpus = min(cpus,out_cpus); + len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * cpus; + sppi = RtlAllocateHeap(GetProcessHeap(), 0,len); + for (i = 0; i < cpus; i++) + { + sppi[i].liIdleTime.QuadPart = pinfo[i].cpu_ticks[CPU_STATE_IDLE]; + sppi[i].liKernelTime.QuadPart = pinfo[i].cpu_ticks[CPU_STATE_SYSTEM]; + sppi[i].liUserTime.QuadPart = pinfo[i].cpu_ticks[CPU_STATE_USER]; + } + vm_deallocate (mach_task_self (), (vm_address_t) pinfo, info_count); + } + } +#else + { + FILE *cpuinfo = fopen("/proc/stat","r"); + if (cpuinfo) + { + unsigned usr,nice,sys; + unsigned long idle; + int count; + char name[10]; + + /* first line is combined usage */ + count = fscanf(cpuinfo,"%s %u %u %u %lu",name, &usr, &nice, + &sys, &idle); + /* we set this up in the for older non-smp enabled kernels */ + if (count == 5 && strcmp(name,"cpu")==0) + { + sppi = RtlAllocateHeap(GetProcessHeap(), 0, + sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION)); + sppi->liIdleTime.QuadPart = idle; + sppi->liKernelTime.QuadPart = sys; + sppi->liUserTime.QuadPart = usr; + cpus = 1; + len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION); + } + + do + { + count = fscanf(cpuinfo,"%s %u %u %u %lu",name, &usr, + &nice, &sys, &idle); + if (count == 5 && strncmp(name,"cpu",3)==0) + { + out_cpus --; + if (name[3]=='0') /* first cpu */ + { + sppi->liIdleTime.QuadPart = idle; + sppi->liKernelTime.QuadPart = sys; + sppi->liUserTime.QuadPart = usr; + } + else /* new cpu */ + { + len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * (cpus+1); + sppi = RtlReAllocateHeap(GetProcessHeap(), 0, sppi, len); + sppi[cpus].liIdleTime.QuadPart = idle; + sppi[cpus].liKernelTime.QuadPart = sys; + sppi[cpus].liUserTime.QuadPart = usr; + cpus++; + } + } + else + break; + } while (out_cpus > 0); + fclose(cpuinfo); + } + } +#endif + + if (cpus == 0) + { + static int i = 1; + + sppi = RtlAllocateHeap(GetProcessHeap(),0,sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION)); - memset(&sppi, 0 , sizeof(sppi)); /* FIXME */ - len = sizeof(sppi); + memset(sppi, 0 , sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION)); + FIXME("stub info_class SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION\n"); + + /* many programs expect these values to change so fake change */ + len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION); + sppi->liKernelTime.QuadPart = 1 * i; + sppi->liUserTime.QuadPart = 2 * i; + sppi->liIdleTime.QuadPart = 3 * i; + i++; + } if (Length >= len) { if (!SystemInformation) ret = STATUS_ACCESS_VIOLATION; - else memcpy( SystemInformation, &sppi, len); + else memcpy( SystemInformation, sppi, len); } else ret = STATUS_INFO_LENGTH_MISMATCH; - FIXME("info_class SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION\n"); + + RtlFreeHeap(GetProcessHeap(),0,sppi); } break; case SystemModuleInformation: diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 74f180e..d93e0bc 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -344,23 +344,41 @@ static void test_query_procperf(void) ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); /* Try it for 1 processor */ + sppi->KernelTime.QuadPart = 0xdeaddead; + sppi->UserTime.QuadPart = 0xdeaddead; + sppi->IdleTime.QuadPart = 0xdeaddead; status = pNtQuerySystemInformation(SystemProcessorPerformanceInformation, sppi, sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION), &ReturnLength); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) == ReturnLength, "Inconsistent length %d\n", ReturnLength); - + ok (sppi->KernelTime.QuadPart != 0xdeaddead, "KernelTime unchanged\n"); + ok (sppi->UserTime.QuadPart != 0xdeaddead, "UserTime unchanged\n"); + ok (sppi->IdleTime.QuadPart != 0xdeaddead, "IdleTime unchanged\n"); + /* Try it for all processors */ + sppi->KernelTime.QuadPart = 0xdeaddead; + sppi->UserTime.QuadPart = 0xdeaddead; + sppi->IdleTime.QuadPart = 0xdeaddead; status = pNtQuerySystemInformation(SystemProcessorPerformanceInformation, sppi, NeededLength, &ReturnLength); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( NeededLength == ReturnLength, "Inconsistent length (%d) <-> (%d)\n", NeededLength, ReturnLength); + ok (sppi->KernelTime.QuadPart != 0xdeaddead, "KernelTime unchanged\n"); + ok (sppi->UserTime.QuadPart != 0xdeaddead, "UserTime unchanged\n"); + ok (sppi->IdleTime.QuadPart != 0xdeaddead, "IdleTime unchanged\n"); /* A too large given buffer size */ sppi = HeapReAlloc(GetProcessHeap(), 0, sppi , NeededLength + 2); + sppi->KernelTime.QuadPart = 0xdeaddead; + sppi->UserTime.QuadPart = 0xdeaddead; + sppi->IdleTime.QuadPart = 0xdeaddead; status = pNtQuerySystemInformation(SystemProcessorPerformanceInformation, sppi, NeededLength + 2, &ReturnLength); ok( status == STATUS_SUCCESS || status == STATUS_INFO_LENGTH_MISMATCH /* vista */, "Expected STATUS_SUCCESS or STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); ok( NeededLength == ReturnLength, "Inconsistent length (%d) <-> (%d)\n", NeededLength, ReturnLength); + ok (sppi->KernelTime.QuadPart != 0xdeaddead, "KernelTime unchanged\n"); + ok (sppi->UserTime.QuadPart != 0xdeaddead, "UserTime unchanged\n"); + ok (sppi->IdleTime.QuadPart != 0xdeaddead, "IdleTime unchanged\n"); HeapFree( GetProcessHeap(), 0, sppi); }

1 0

Jeremiah Flerchinger : winedos: Added/stubbed/ documented missing VGA registers.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: d237f08be63c3356af20643523a41eee321b522d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d237f08be63c3356af2064352… Author: Jeremiah Flerchinger <jeremiah.flerchinger(a)gmail.com> Date: Fri Oct 17 15:28:30 2008 -0600 winedos: Added/stubbed/documented missing VGA registers. --- dlls/winedos/ioports.c | 53 ++++++++++++++++++++--------------- dlls/winedos/vga.c | 72 ++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 94 insertions(+), 31 deletions(-) diff --git a/dlls/winedos/ioports.c b/dlls/winedos/ioports.c index e9f4f7f..bd73af4 100644 --- a/dlls/winedos/ioports.c +++ b/dlls/winedos/ioports.c @@ -414,29 +414,32 @@ DWORD WINAPI DOSVM_inport( int port, int size ) case 0x22e: res = (DWORD)SB_ioport_in( port ); break; - case 0x3ba: - case 0x3c0: - case 0x3c1: - case 0x3c2: - case 0x3c3: - case 0x3c4: - case 0x3c5: + /* VGA read registers */ + case 0x3b4: /* CRT Controller Register - Index (MDA) */ + case 0x3b5: /* CRT Controller Register - Other (MDA) */ + case 0x3ba: /* General Register - Input status 1 (MDA) */ + case 0x3c0: /* Attribute Controller - Address */ + case 0x3c1: /* Attribute Controller - Other */ + case 0x3c2: /* General Register - Input status 0 */ + case 0x3c3: /* General Register - Video subsystem enable */ + case 0x3c4: /* Sequencer Register - Address */ + case 0x3c5: /* Sequencer Register - Other */ case 0x3c6: - case 0x3c7: + case 0x3c7: /* General Register - DAC State */ case 0x3c8: case 0x3c9: - case 0x3ca: + case 0x3ca: /* General Register - Feature control */ case 0x3cb: - case 0x3cc: + case 0x3cc: /* General Register - Misc output */ case 0x3cd: - case 0x3ce: - case 0x3cf: + case 0x3ce: /* Graphics Controller Register - Address */ + case 0x3cf: /* Graphics Controller Register - Other */ case 0x3d0: case 0x3d1: case 0x3d2: case 0x3d3: - case 0x3d4: - case 0x3d5: + case 0x3d4: /* CRT Controller Register - Index (CGA) */ + case 0x3d5: /* CRT Controller Register - Other (CGA) */ case 0x3d6: case 0x3d7: case 0x3d8: @@ -624,12 +627,16 @@ void WINAPI DOSVM_outport( int port, int size, DWORD value ) case 0x22c: SB_ioport_out( port, (BYTE)value ); break; - case 0x3c0: + /* VGA Write registers */ + case 0x3b4: /* CRT Controller Register - Index (MDA) */ + case 0x3b5: /* CRT Controller Register - Other (MDA) */ + case 0x3ba: /* General Register - Feature Control */ + case 0x3c0: /* Attribute Controller - Address/Other */ case 0x3c1: - case 0x3c2: - case 0x3c3: - case 0x3c4: - case 0x3c5: + case 0x3c2: /* General Register - Misc output */ + case 0x3c3: /* General Register - Video subsystem enable */ + case 0x3c4: /* Sequencer Register - Address */ + case 0x3c5: /* Sequencer Register - Other */ case 0x3c6: case 0x3c7: case 0x3c8: @@ -638,14 +645,14 @@ void WINAPI DOSVM_outport( int port, int size, DWORD value ) case 0x3cb: case 0x3cc: case 0x3cd: - case 0x3ce: - case 0x3cf: + case 0x3ce: /* Graphics Controller Register - Address */ + case 0x3cf: /* Graphics Controller Register - Other */ case 0x3d0: case 0x3d1: case 0x3d2: case 0x3d3: - case 0x3d4: - case 0x3d5: + case 0x3d4: /* CRT Controller Register - Index (CGA) */ + case 0x3d5: /* CRT Controller Register - Other (CGA) */ case 0x3d6: case 0x3d7: case 0x3d8: diff --git a/dlls/winedos/vga.c b/dlls/winedos/vga.c index 5a568ce..a5298e0 100644 --- a/dlls/winedos/vga.c +++ b/dlls/winedos/vga.c @@ -1338,17 +1338,32 @@ static PALETTEENTRY paldat; void VGA_ioport_out( WORD port, BYTE val ) { switch (port) { + /* General Register - Feature Control */ + case 0x3ba: + FIXME("Unsupported VGA register: general register - feature control 0x%04x (value 0x%02x)\n", port, val); + break; + /* Attribute Controller - Address/Other */ case 0x3c0: if (vga_address_3c0) vga_index_3c0 = val; else - FIXME("Unsupported index, register 0x3c0: 0x%02x (value 0x%02x)\n", + FIXME("Unsupported index, VGA attribute controller register 0x3c0: 0x%02x (value 0x%02x)\n", vga_index_3c0, val); vga_address_3c0 = !vga_address_3c0; break; + /* General Register - Misc output */ + case 0x3c2: + FIXME("Unsupported VGA register: general register - misc output 0x%04x (value 0x%02x)\n", port, val); + break; + /* General Register - Video subsystem enable */ + case 0x3c3: + FIXME("Unsupported VGA register: general register - video subsystem enable 0x%04x (value 0x%02x)\n", port, val); + break; + /* Sequencer Register - Address */ case 0x3c4: vga_index_3c4 = val; break; + /* Sequencer Register - Other */ case 0x3c5: switch(vga_index_3c4) { case 0x04: /* Sequencer: Memory Mode Register */ @@ -1356,9 +1371,9 @@ void VGA_ioport_out( WORD port, BYTE val ) VGA_SetWindowStart((val & 8) ? 0 : -1); else FIXME("Memory Mode Register not supported in this mode.\n"); - break; + break; default: - FIXME("Unsupported index, register 0x3c4: 0x%02x (value 0x%02x)\n", + FIXME("Unsupported index, VGA sequencer register 0x3c4: 0x%02x (value 0x%02x)\n", vga_index_3c4, val); } break; @@ -1371,18 +1386,26 @@ void VGA_ioport_out( WORD port, BYTE val ) palcnt=0; } break; + /* Graphics Controller Register - Address */ case 0x3ce: vga_index_3ce = val; break; + /* Graphics Controller Register - Other */ case 0x3cf: - FIXME("Unsupported index, register 0x3ce: 0x%02x (value 0x%02x)\n", + FIXME("Unsupported index, VGA graphics controller register - other 0x3ce: 0x%02x (value 0x%02x)\n", vga_index_3ce, val); break; + /* CRT Controller Register - Index (MDA) */ + case 0x3b4: + /* CRT Controller Register - Index (CGA) */ case 0x3d4: vga_index_3d4 = val; break; + /* CRT Controller Register - Other (MDA) */ + case 0x3b5: + /* CRT Controller Register - Other (CGA) */ case 0x3d5: - FIXME("Unsupported index, register 0x3d4: 0x%02x (value 0x%02x)\n", + FIXME("Unsupported index, VGA crt controller register 0x3b4/0x3d4: 0x%02x (value 0x%02x)\n", vga_index_3d4, val); break; default: @@ -1395,10 +1418,22 @@ BYTE VGA_ioport_in( WORD port ) BYTE ret; switch (port) { + /* Attribute Controller - Other */ case 0x3c1: - FIXME("Unsupported index, register 0x3c0: 0x%02x\n", + FIXME("Unsupported index, VGA attribute controller register 0x3c0: 0x%02x\n", vga_index_3c0); return 0xff; + /* General Register - Input status 0 */ + case 0x3c2: + ret=0xff; + FIXME("Unsupported VGA register: general register - input status 0 0x%04x\n", port); + break; + /* General Register - Video subsystem enable */ + case 0x3c3: + ret=0xff; + FIXME("Unsupported VGA register: general register - video subsystem enable 0x%04x\n", port); + break; + /* Sequencer Register - Other */ case 0x3c5: switch(vga_index_3c4) { case 0x04: /* Sequencer: Memory Mode Register */ @@ -1408,15 +1443,36 @@ BYTE VGA_ioport_in( WORD port ) vga_index_3c4); return 0xff; } + /* General Register - DAC State */ + case 0x3c7: + ret=0xff; + FIXME("Unsupported VGA register: general register - DAC State 0x%04x\n", port); + break; + /* General Register - Feature control */ + case 0x3ca: + ret=0xff; + FIXME("Unsupported VGA register: general register - Feature control 0x%04x\n", port); + break; + /* General Register - Misc output */ + case 0x3cc: + ret=0xff; + FIXME("Unsupported VGA register: general register - Feature control 0x%04x\n", port); + break; + /* Graphics Controller Register - Other */ case 0x3cf: FIXME("Unsupported index, register 0x3ce: 0x%02x\n", vga_index_3ce); return 0xff; + /* CRT Controller Register - Other (MDA) */ + case 0x3b5: + /* CRT Controller Register - Other (CGA) */ case 0x3d5: - FIXME("Unsupported index, register 0x3d4: 0x%02x\n", + FIXME("Unsupported index, VGA crt controller register 0x3b4/0x3d4: 0x%02x\n", vga_index_3d4); return 0xff; - + /* General Register - Input status 1 (MDA) */ + case 0x3ba: + /* General Register - Input status 1 (CGA) */ case 0x3da: /* * Read from this register resets register 0x3c0 address flip-flop.

1 0

Jeremiah Flerchinger : winedos: Added additional VGA/ VESA modes & information missing in mode descriptions.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 7808a8cb27404dbf79104c7707ced8ae8234e7cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7808a8cb27404dbf79104c770… Author: Jeremiah Flerchinger <jeremiah.flerchinger(a)gmail.com> Date: Fri Oct 17 15:28:22 2008 -0600 winedos: Added additional VGA/VESA modes & information missing in mode descriptions. Used new mode information to fix required attributes incorrectly set. --- dlls/winedos/int10.c | 178 ++++++++++++++++++++++++++++++++------------------ 1 files changed, 114 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7808a8cb27404dbf79104…

1 0

Jeremiah Flerchinger : winedos: Added missing values to VGA Mode 19 ( 256 color) palette registers.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 1e8eb27200ef79aaf987e207c1681c24f87dbb97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e8eb27200ef79aaf987e207c… Author: Jeremiah Flerchinger <jeremiah.flerchinger(a)gmail.com> Date: Fri Oct 17 15:28:26 2008 -0600 winedos: Added missing values to VGA Mode 19 (256 color) palette registers. Windows programs that access VGA directly or through BIOS that previously displayed black for many values should now show correct values for many more cases. --- dlls/winedos/vga.c | 307 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 280 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e8eb27200ef79aaf987e…

1 0

Eric Pouech : winedbg: Added a command to allow loading mismatched modules.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: cbb84fdb738a8c8f9bde50d0c91d49f8e7953131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbb84fdb738a8c8f9bde50d0c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 18 09:15:19 2008 +0200 winedbg: Added a command to allow loading mismatched modules. --- programs/winedbg/dbg.y | 2 ++ programs/winedbg/debugger.h | 2 ++ programs/winedbg/gdbproxy.c | 9 ++++----- programs/winedbg/tgt_active.c | 8 ++++---- programs/winedbg/tgt_minidump.c | 12 ++++++------ programs/winedbg/tgt_module.c | 16 +++++++++++++++- programs/winedbg/winedbg.c | 25 +++++++++++++++++++++++++ 7 files changed, 58 insertions(+), 16 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 1d0eba3..190c106 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -209,6 +209,8 @@ set_command: | tSET '-' tIDENTIFIER { info_wine_dbg_channel(FALSE, NULL, $3); } | tSET tIDENTIFIER '+' tIDENTIFIER { info_wine_dbg_channel(TRUE, $2, $4); } | tSET tIDENTIFIER '-' tIDENTIFIER { info_wine_dbg_channel(FALSE, $2, $4); } + | tSET '!' tIDENTIFIER '+' { dbg_set_option($3, TRUE); } + | tSET '!' tIDENTIFIER '-' { dbg_set_option($3, FALSE); } ; x_command: diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index aae0c0c..d7ea3c9 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -448,7 +448,9 @@ struct dbg_thread* dbg_add_thread(struct dbg_process* p, DWORD tid, HANDLE h, vo extern struct dbg_thread* dbg_get_thread(struct dbg_process* p, DWORD tid); extern void dbg_del_thread(struct dbg_thread* t); extern BOOL dbg_init(HANDLE hProc, const WCHAR* in, BOOL invade); +extern BOOL dbg_load_module(HANDLE hProc, HANDLE hFile, const WCHAR* name, DWORD base, DWORD size); extern BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE* imh_mod); +extern void dbg_set_option(const char*, BOOL); /* gdbproxy.c */ extern int gdb_main(int argc, char* argv[]); diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 7799148..9026b37 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -63,7 +63,6 @@ #include "windef.h" #include "winbase.h" #include "tlhelp32.h" -#include "wine/debug.h" #define GDBPXY_TRC_LOWLEVEL 0x01 #define GDBPXY_TRC_PACKET 0x02 @@ -537,16 +536,16 @@ static void handle_debug_event(struct gdb_context* gdbctx, DEBUG_EVENT* de) de->u.LoadDll.lpBaseOfDll, de->u.LoadDll.dwDebugInfoFileOffset, de->u.LoadDll.nDebugInfoSize); - SymLoadModuleExW(gdbctx->process->handle, de->u.LoadDll.hFile, u.buffer, NULL, - (unsigned long)de->u.LoadDll.lpBaseOfDll, 0, NULL, 0); + dbg_load_module(gdbctx->process->handle, de->u.LoadDll.hFile, u.buffer, + (DWORD_PTR)de->u.LoadDll.lpBaseOfDll, 0); break; case UNLOAD_DLL_DEBUG_EVENT: if (gdbctx->trace & GDBPXY_TRC_WIN32_EVENT) fprintf(stderr, "%08x:%08x: unload DLL @%p\n", de->dwProcessId, de->dwThreadId, de->u.UnloadDll.lpBaseOfDll); - SymUnloadModule(gdbctx->process->handle, - (unsigned long)de->u.UnloadDll.lpBaseOfDll); + SymUnloadModule(gdbctx->process->handle, + (DWORD_PTR)de->u.UnloadDll.lpBaseOfDll); break; case EXCEPTION_DEBUG_EVENT: diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index af1bc91..9cb0a56 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -519,8 +519,8 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) if (!dbg_init(dbg_curr_process->handle, u.buffer, FALSE)) dbg_printf("Couldn't initiate DbgHelp\n"); - if (!SymLoadModuleExW(dbg_curr_process->handle, de->u.CreateProcessInfo.hFile, u.buffer, NULL, - (unsigned long)de->u.CreateProcessInfo.lpBaseOfImage, 0, NULL, 0)) + if (!dbg_load_module(dbg_curr_process->handle, de->u.CreateProcessInfo.hFile, u.buffer, + (DWORD_PTR)de->u.CreateProcessInfo.lpBaseOfImage, 0)) dbg_printf("couldn't load main module (%u)\n", GetLastError()); WINE_TRACE("%04x:%04x: create thread I @%p\n", @@ -608,8 +608,8 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) wine_dbgstr_w(u.buffer), de->u.LoadDll.lpBaseOfDll, de->u.LoadDll.dwDebugInfoFileOffset, de->u.LoadDll.nDebugInfoSize); - SymLoadModuleExW(dbg_curr_process->handle, de->u.LoadDll.hFile, u.buffer, NULL, - (unsigned long)de->u.LoadDll.lpBaseOfDll, 0, NULL, 0); + dbg_load_module(dbg_curr_process->handle, de->u.LoadDll.hFile, u.buffer, + (DWORD_PTR)de->u.LoadDll.lpBaseOfDll, 0); break_set_xpoints(FALSE); break_check_delayed_bp(); break_set_xpoints(TRUE); diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index f6b7c35..a9f92db 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -331,8 +331,8 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) nameW[mds->Length / sizeof(WCHAR)] = 0; if (SymFindFileInPathW(hProc, NULL, nameW, (void*)(DWORD_PTR)mm->CheckSum, 0, 0, SSRVOPT_DWORD, buffer, validate_file, NULL)) - SymLoadModuleExW(hProc, NULL, buffer, NULL, get_addr64(mm->BaseOfImage), - mm->SizeOfImage, NULL, 0); + dbg_load_module(hProc, NULL, buffer, get_addr64(mm->BaseOfImage), + mm->SizeOfImage); else SymLoadModuleExW(hProc, NULL, nameW, NULL, get_addr64(mm->BaseOfImage), mm->SizeOfImage, NULL, SLMFLAG_VIRTUAL); @@ -350,11 +350,11 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) nameW[mds->Length / sizeof(WCHAR)] = 0; if (SymFindFileInPathW(hProc, NULL, nameW, (void*)(DWORD_PTR)mm->TimeDateStamp, mm->SizeOfImage, 0, SSRVOPT_DWORD, buffer, validate_file, NULL)) - SymLoadModuleExW(hProc, NULL, buffer, NULL, get_addr64(mm->BaseOfImage), - mm->SizeOfImage, NULL, 0); + dbg_load_module(hProc, NULL, buffer, get_addr64(mm->BaseOfImage), + mm->SizeOfImage); else if (is_pe_module_embedded(data, mm)) - SymLoadModuleExW(hProc, NULL, nameW, NULL, get_addr64(mm->BaseOfImage), - mm->SizeOfImage, NULL, 0); + dbg_load_module(hProc, NULL, nameW, get_addr64(mm->BaseOfImage), + mm->SizeOfImage); else SymLoadModuleExW(hProc, NULL, nameW, NULL, get_addr64(mm->BaseOfImage), mm->SizeOfImage, NULL, SLMFLAG_VIRTUAL); diff --git a/programs/winedbg/tgt_module.c b/programs/winedbg/tgt_module.c index 044e312..5341726 100644 --- a/programs/winedbg/tgt_module.c +++ b/programs/winedbg/tgt_module.c @@ -52,16 +52,30 @@ enum dbg_start tgt_module_load(const char* name, BOOL keep) DWORD opts = SymGetOptions(); HANDLE hDummy = (HANDLE)0x87654321; enum dbg_start ret = start_ok; + WCHAR* nameW; + unsigned len; SymSetOptions((opts & ~(SYMOPT_UNDNAME|SYMOPT_DEFERRED_LOADS)) | SYMOPT_LOAD_LINES | SYMOPT_AUTO_PUBLICS | 0x40000000); if (!dbg_init(hDummy, NULL, FALSE)) return start_error_init; - if (!SymLoadModule(hDummy, NULL, name, NULL, 0, 0)) + len = MultiByteToWideChar(CP_ACP, 0, name, -1, NULL, 0); + nameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!nameW) { ret = start_error_init; keep = FALSE; } + else + { + len = MultiByteToWideChar(CP_ACP, 0, name, -1, nameW, len); + if (!dbg_load_module(hDummy, NULL, nameW, 0, 0)) + { + ret = start_error_init; + keep = FALSE; + } + HeapFree(GetProcessHeap(), 0, nameW); + } if (keep) { diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 575c829..ab66148 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -435,6 +435,19 @@ BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE* imh_mod) return imh_mod->BaseOfImage != 0; } +BOOL dbg_load_module(HANDLE hProc, HANDLE hFile, const WCHAR* name, DWORD base, DWORD size) +{ + BOOL ret = SymLoadModuleExW(hProc, NULL, name, NULL, base, size, NULL, 0); + if (ret) + { + IMAGEHLP_MODULEW64 ihm; + ihm.SizeOfStruct = sizeof(ihm); + if (SymGetModuleInfoW64(hProc, base, &ihm) && (ihm.PdbUnmatched || ihm.DbgUnmatched)) + dbg_printf("Loaded unmatched debug information for %s\n", wine_dbgstr_w(name)); + } + return ret; +} + struct dbg_thread* dbg_get_thread(struct dbg_process* p, DWORD tid) { struct dbg_thread* t; @@ -488,6 +501,18 @@ void dbg_del_thread(struct dbg_thread* t) HeapFree(GetProcessHeap(), 0, t); } +void dbg_set_option(const char* option, BOOL enable) +{ + if (!strcmp(option, "module")) + { + DWORD opt = SymGetOptions(); + if (enable) opt |= SYMOPT_LOAD_ANYTHING; + else opt &= ~SYMOPT_LOAD_ANYTHING; + SymSetOptions(opt); + } + else dbg_printf("Unknown option '%s'\n", option); +} + BOOL dbg_interrupt_debuggee(void) { if (!dbg_process_list) return FALSE;

1 0

Eric Pouech : winedbg: Use Unicode strings for all module references.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 5c8ad4915844f6ed03661fd1517b620f09966e59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8ad4915844f6ed03661fd15… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 18 09:15:10 2008 +0200 winedbg: Use Unicode strings for all module references. --- programs/winedbg/debugger.h | 9 +++-- programs/winedbg/gdbproxy.c | 28 +++++++++++------- programs/winedbg/info.c | 3 +- programs/winedbg/memory.c | 22 ++++++++++++-- programs/winedbg/stack.c | 3 +- programs/winedbg/tgt_active.c | 48 ++++++++++++++++++------------- programs/winedbg/tgt_minidump.c | 16 +++++----- programs/winedbg/winedbg.c | 59 +++++++++++++++++++++++---------------- 8 files changed, 116 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c8ad4915844f6ed03661…

1 0

Eric Pouech : dbghelp: Report in module's info when a module' s debug information has been mismatched (dbg and pdb only).
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 01e69c71e07b6c2b1576f479d6f06f03dd18df71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01e69c71e07b6c2b1576f479d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 18 09:15:03 2008 +0200 dbghelp: Report in module's info when a module's debug information has been mismatched (dbg and pdb only). --- dlls/dbghelp/dbghelp_private.h | 3 ++- dlls/dbghelp/msc.c | 9 +++++---- dlls/dbghelp/path.c | 5 ++++- dlls/dbghelp/pe_module.c | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 26c3a3d..3eb420e 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -476,7 +476,8 @@ extern BOOL pdb_fetch_file_info(struct pdb_lookup* pdb_lookup); /* path.c */ extern BOOL path_find_symbol_file(const struct process* pcs, PCSTR full_path, - const GUID* guid, DWORD dw1, DWORD dw2, PSTR buffer); + const GUID* guid, DWORD dw1, DWORD dw2, PSTR buffer, + BOOL* is_unmatched); /* pe_module.c */ extern BOOL pe_load_nt_header(HANDLE hProc, DWORD base, IMAGE_NT_HEADERS* nth); diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 1f5058a..2f62fec 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2134,7 +2134,8 @@ static void pdb_convert_symbol_file(const PDB_SYMBOLS* symbols, } static HANDLE open_pdb_file(const struct process* pcs, - const struct pdb_lookup* lookup) + const struct pdb_lookup* lookup, + struct module* module) { HANDLE h; char dbg_file_path[MAX_PATH]; @@ -2144,11 +2145,11 @@ static HANDLE open_pdb_file(const struct process* pcs, { case PDB_JG: ret = path_find_symbol_file(pcs, lookup->filename, NULL, lookup->u.jg.timestamp, - lookup->age, dbg_file_path); + lookup->age, dbg_file_path, &module->module.PdbUnmatched); break; case PDB_DS: ret = path_find_symbol_file(pcs, lookup->filename, &lookup->u.ds.guid, 0, - lookup->age, dbg_file_path); + lookup->age, dbg_file_path, &module->module.PdbUnmatched); break; } if (!ret) @@ -2403,7 +2404,7 @@ static BOOL pdb_process_internal(const struct process* pcs, TRACE("Processing PDB file %s\n", pdb_lookup->filename); /* Open and map() .PDB file */ - if ((hFile = open_pdb_file(pcs, pdb_lookup)) == NULL || + if ((hFile = open_pdb_file(pcs, pdb_lookup, msc_dbg->module)) == NULL || ((hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL)) == NULL) || ((image = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0)) == NULL)) { diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 3ae4921..e0cfc97 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -612,7 +612,8 @@ static BOOL CALLBACK module_find_cb(PCWSTR buffer, PVOID user) } BOOL path_find_symbol_file(const struct process* pcs, PCSTR full_path, - const GUID* guid, DWORD dw1, DWORD dw2, PSTR buffer) + const GUID* guid, DWORD dw1, DWORD dw2, PSTR buffer, + BOOL* is_unmatched) { struct module_find mf; WCHAR full_pathW[MAX_PATH]; @@ -632,6 +633,7 @@ BOOL path_find_symbol_file(const struct process* pcs, PCSTR full_path, MultiByteToWideChar(CP_ACP, 0, full_path, -1, full_pathW, MAX_PATH); filename = file_nameW(full_pathW); mf.kind = module_get_type_by_name(filename); + *is_unmatched = FALSE; /* first check full path to file */ if (module_find_cb(full_pathW, &mf)) @@ -665,6 +667,7 @@ BOOL path_find_symbol_file(const struct process* pcs, PCSTR full_path, if ((dbghelp_options & SYMOPT_LOAD_ANYTHING) && mf.matched) { WideCharToMultiByte(CP_ACP, 0, mf.filename, -1, buffer, MAX_PATH, NULL, NULL); + *is_unmatched = TRUE; return TRUE; } return FALSE; diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 7b62529..a79396f 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -94,7 +94,7 @@ static BOOL pe_load_dbg_file(const struct process* pcs, struct module* module, TRACE("Processing DBG file %s\n", debugstr_a(dbg_name)); - if (path_find_symbol_file(pcs, dbg_name, NULL, timestamp, 0, tmp) && + if (path_find_symbol_file(pcs, dbg_name, NULL, timestamp, 0, tmp, &module->module.DbgUnmatched) && (hFile = CreateFileA(tmp, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL)) != INVALID_HANDLE_VALUE && ((hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL)) != 0) &&

1 0

Paul Bryan Roberts : ntdll: RtlSetControlSecurityDescriptor() implementation and test.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: b1542f4f00c15bb689194f8f153488d8858cfcd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1542f4f00c15bb689194f8f1… Author: Paul Bryan Roberts <pbronline-wine(a)yahoo.co.uk> Date: Fri Oct 17 18:44:14 2008 +0100 ntdll: RtlSetControlSecurityDescriptor() implementation and test. --- dlls/advapi32/tests/security.c | 112 +++++++++++++++++++++++++++++++++++++++- dlls/ntdll/sec.c | 20 ++++++- 2 files changed, 129 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f0d7ade..7e4d832 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2431,6 +2431,95 @@ static void test_ConvertSecurityDescriptorToString() } } +static void test_SetSecurityDescriptorControl (PSECURITY_DESCRIPTOR sec) +{ + SECURITY_DESCRIPTOR_CONTROL ref; + SECURITY_DESCRIPTOR_CONTROL test; + + SECURITY_DESCRIPTOR_CONTROL const mutable + = SE_DACL_AUTO_INHERIT_REQ | SE_SACL_AUTO_INHERIT_REQ + | SE_DACL_AUTO_INHERITED | SE_SACL_AUTO_INHERITED + | SE_DACL_PROTECTED | SE_SACL_PROTECTED + | 0x00000040 | 0x00000080 /* not defined in winnt.h */ + ; + SECURITY_DESCRIPTOR_CONTROL const immutable + = SE_OWNER_DEFAULTED | SE_GROUP_DEFAULTED + | SE_DACL_PRESENT | SE_DACL_DEFAULTED + | SE_SACL_PRESENT | SE_SACL_DEFAULTED + | SE_RM_CONTROL_VALID | SE_SELF_RELATIVE + ; + + int bit; + DWORD dwRevision; + LPCSTR fmt = "Expected error %s, got %u\n"; + + GetSecurityDescriptorControl (sec, &ref, &dwRevision); + + /* The mutable bits are mutable regardless of the truth of + SE_DACL_PRESENT and/or SE_SACL_PRESENT */ + + /* Check call barfs if any bit-of-interest is immutable */ + for (bit = 0; bit < 16; ++bit) + { + SECURITY_DESCRIPTOR_CONTROL const bitOfInterest = 1 << bit; + SECURITY_DESCRIPTOR_CONTROL setOrClear = ref & bitOfInterest; + + SECURITY_DESCRIPTOR_CONTROL ctrl; + + DWORD dwExpect = (bitOfInterest & immutable) + ? ERROR_INVALID_PARAMETER : 0xbebecaca; + LPCSTR strExpect = (bitOfInterest & immutable) + ? "ERROR_INVALID_PARAMETER" : "0xbebecaca"; + + ctrl = (bitOfInterest & mutable) ? ref + bitOfInterest : ref; + setOrClear ^= bitOfInterest; + SetLastError (0xbebecaca); + pSetSecurityDescriptorControl (sec, bitOfInterest, setOrClear); + ok (GetLastError () == dwExpect, fmt, strExpect, GetLastError ()); + GetSecurityDescriptorControl(sec, &test, &dwRevision); + expect_eq(test, ctrl, int, "%x"); + + ctrl = ref; + setOrClear ^= bitOfInterest; + SetLastError (0xbebecaca); + pSetSecurityDescriptorControl (sec, bitOfInterest, setOrClear); + ok (GetLastError () == dwExpect, fmt, strExpect, GetLastError ()); + GetSecurityDescriptorControl (sec, &test, &dwRevision); + expect_eq(test, ref, int, "%x"); + } + + /* Check call barfs if any bit-to-set is immutable + even when not a bit-of-interest */ + for (bit = 0; bit < 16; ++bit) + { + SECURITY_DESCRIPTOR_CONTROL const bitsOfInterest = mutable; + SECURITY_DESCRIPTOR_CONTROL setOrClear = ref & bitsOfInterest; + + SECURITY_DESCRIPTOR_CONTROL ctrl; + + DWORD dwExpect = ((1 << bit) & immutable) + ? ERROR_INVALID_PARAMETER : 0xbebecaca; + LPCSTR strExpect = ((1 << bit) & immutable) + ? "ERROR_INVALID_PARAMETER" : "0xbebecaca"; + + ctrl = ((1 << bit) & immutable) ? test : ref | mutable; + setOrClear ^= bitsOfInterest; + SetLastError (0xbebecaca); + pSetSecurityDescriptorControl (sec, bitsOfInterest, setOrClear | (1 << bit)); + ok (GetLastError () == dwExpect, fmt, strExpect, GetLastError ()); + GetSecurityDescriptorControl(sec, &test, &dwRevision); + expect_eq(test, ctrl, int, "%x"); + + ctrl = ((1 << bit) & immutable) ? test : ref | (1 << bit); + setOrClear ^= bitsOfInterest; + SetLastError (0xbebecaca); + pSetSecurityDescriptorControl (sec, bitsOfInterest, setOrClear | (1 << bit)); + ok (GetLastError () == dwExpect, fmt, strExpect, GetLastError ()); + GetSecurityDescriptorControl(sec, &test, &dwRevision); + expect_eq(test, ctrl, int, "%x"); + } +} + static void test_PrivateObjectSecurity(void) { SECURITY_INFORMATION sec_info = OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION|SACL_SECURITY_INFORMATION; @@ -2452,12 +2541,33 @@ static void test_PrivateObjectSecurity(void) ok(pConvertStringSecurityDescriptorToSecurityDescriptorA( "O:SY" "G:S-1-5-21-93476-23408-4576" + "D:(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)" + "(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)" + "S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)", + SDDL_REVISION_1, &sec, &dwDescSize), "Creating descriptor failed\n"); + + test_SetSecurityDescriptorControl(sec); + + LocalFree(sec); + + ok(pConvertStringSecurityDescriptorToSecurityDescriptorA( + "O:SY" + "G:S-1-5-21-93476-23408-4576", + SDDL_REVISION_1, &sec, &dwDescSize), "Creating descriptor failed\n"); + + test_SetSecurityDescriptorControl(sec); + + LocalFree(sec); + + ok(pConvertStringSecurityDescriptorToSecurityDescriptorA( + "O:SY" + "G:S-1-5-21-93476-23408-4576" "D:(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)" "S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)", SDDL_REVISION_1, &sec, &dwDescSize), "Creating descriptor failed\n"); buf = HeapAlloc(GetProcessHeap(), 0, dwDescSize); pSetSecurityDescriptorControl(sec, SE_DACL_PROTECTED, SE_DACL_PROTECTED); GetSecurityDescriptorControl(sec, &ctrl, &dwRevision); - todo_wine expect_eq(ctrl, 0x9014, int, "%x"); + expect_eq(ctrl, 0x9014, int, "%x"); ok(GetPrivateObjectSecurity(sec, GROUP_SECURITY_INFORMATION, buf, dwDescSize, &retSize), "GetPrivateObjectSecurity failed (err=%u)\n", GetLastError()); diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index af3a138..97595a1 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1052,8 +1052,24 @@ NTSTATUS WINAPI RtlSetControlSecurityDescriptor( SECURITY_DESCRIPTOR_CONTROL ControlBitsOfInterest, SECURITY_DESCRIPTOR_CONTROL ControlBitsToSet) { - FIXME("(%p 0x%08x 0x%08x): stub\n", SecurityDescriptor, ControlBitsOfInterest, - ControlBitsToSet); + SECURITY_DESCRIPTOR_CONTROL const immutable + = SE_OWNER_DEFAULTED | SE_GROUP_DEFAULTED + | SE_DACL_PRESENT | SE_DACL_DEFAULTED + | SE_SACL_PRESENT | SE_SACL_DEFAULTED + | SE_RM_CONTROL_VALID | SE_SELF_RELATIVE + ; + + SECURITY_DESCRIPTOR *lpsd = SecurityDescriptor; + + TRACE("(%p 0x%04x 0x%04x)\n", SecurityDescriptor, + ControlBitsOfInterest, ControlBitsToSet); + + if ((ControlBitsOfInterest | ControlBitsToSet) & immutable) + return STATUS_INVALID_PARAMETER; + + lpsd->Control |= (ControlBitsOfInterest & ControlBitsToSet); + lpsd->Control &= ~(ControlBitsOfInterest & ~ControlBitsToSet); + return STATUS_SUCCESS; }

1 0

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 2008