May 2011 - Wine-commits - list.winehq.org

Huw Davies : gdi32: Add support for DIB pattern brush fills.
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: 5b28336c26e02692e6553bb62ba405553da39a31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b28336c26e02692e6553bb62… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 12 12:46:50 2011 +0100 gdi32: Add support for DIB pattern brush fills. --- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/objects.c | 101 +++++++++++++++++++++++++++++++++++---- dlls/gdi32/dibdrv/primitives.c | 79 +++++++++++++++++++++++++++++++ 3 files changed, 170 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 1982866..a502c72 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -38,6 +38,7 @@ static inline DC *get_dibdrv_dc( PHYSDEV dev ) typedef struct primitive_funcs { void (* solid_rects)(const dib_info *dib, int num, const RECT *rc, DWORD and, DWORD xor); + void (* pattern_rects)(const dib_info *dib, int num, const RECT *rc, const POINT *orign, const dib_info *brush, void *and_bits, void *xor_bits); DWORD (* colorref_to_pixel)(const dib_info *dib, COLORREF color); } primitive_funcs; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index dde7a96..795bd5e 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include <stdlib.h> #include "gdi_private.h" @@ -956,17 +957,6 @@ static BOOL solid_brush(dibdrv_physdev *pdev, int num, RECT *rects) return TRUE; } -/********************************************************************** - * pattern_brush - * - * Fill a number of rectangles with the pattern brush - * FIXME: Should we insist l < r && t < b? Currently we assume this. - */ -static BOOL pattern_brush(dibdrv_physdev *pdev, int num, RECT *rects) -{ - return FALSE; -} - static void free_pattern_brush_bits( dibdrv_physdev *pdev ) { HeapFree(GetProcessHeap(), 0, pdev->brush_and_bits); @@ -981,6 +971,95 @@ void free_pattern_brush( dibdrv_physdev *pdev ) free_dib_info( &pdev->brush_dib, TRUE ); } +static BOOL create_pattern_brush_bits(dibdrv_physdev *pdev) +{ + DWORD size = pdev->brush_dib.height * abs(pdev->brush_dib.stride); + DWORD *brush_bits = pdev->brush_dib.bits; + DWORD *and_bits, *xor_bits; + + assert(pdev->brush_and_bits == NULL); + assert(pdev->brush_xor_bits == NULL); + + and_bits = pdev->brush_and_bits = HeapAlloc(GetProcessHeap(), 0, size); + xor_bits = pdev->brush_xor_bits = HeapAlloc(GetProcessHeap(), 0, size); + + if(!and_bits || !xor_bits) + { + ERR("Failed to create pattern brush bits\n"); + free_pattern_brush_bits( pdev ); + return FALSE; + } + + if(pdev->brush_dib.stride < 0) + brush_bits = (DWORD*)((BYTE*)brush_bits + (pdev->brush_dib.height - 1) * pdev->brush_dib.stride); + + while(size) + { + calc_and_xor_masks(pdev->brush_rop, *brush_bits++, and_bits++, xor_bits++); + size -= 4; + } + + if(pdev->brush_dib.stride < 0) + { + /* Update the bits ptrs if the dib is bottom up. The subtraction is because stride is -ve */ + pdev->brush_and_bits = (BYTE*)pdev->brush_and_bits - (pdev->brush_dib.height - 1) * pdev->brush_dib.stride; + pdev->brush_xor_bits = (BYTE*)pdev->brush_xor_bits - (pdev->brush_dib.height - 1) * pdev->brush_dib.stride; + } + + return TRUE; +} + +/********************************************************************** + * pattern_brush + * + * Fill a number of rectangles with the pattern brush + * FIXME: Should we insist l < r && t < b? Currently we assume this. + */ +static BOOL pattern_brush(dibdrv_physdev *pdev, int num, RECT *rects) +{ + int i, j; + const WINEREGION *clip; + POINT origin; + + if(pdev->brush_and_bits == NULL) + if(!create_pattern_brush_bits(pdev)) + return FALSE; + + GetBrushOrgEx(pdev->dev.hdc, &origin); + + clip = get_wine_region(pdev->clip); + for(i = 0; i < num; i++) + { + for(j = 0; j < clip->numRects; j++) + { + RECT rect = rects[i]; + + /* Optimize unclipped case */ + if(clip->rects[j].top <= rect.top && clip->rects[j].bottom >= rect.bottom && + clip->rects[j].left <= rect.left && clip->rects[j].right >= rect.right) + { + pdev->dib.funcs->pattern_rects(&pdev->dib, 1, &rect, &origin, &pdev->brush_dib, pdev->brush_and_bits, pdev->brush_xor_bits); + break; + } + + if(clip->rects[j].top >= rect.bottom) break; + if(clip->rects[j].bottom <= rect.top) continue; + + if(clip->rects[j].right > rect.left && clip->rects[j].left < rect.right) + { + rect.left = max(rect.left, clip->rects[j].left); + rect.top = max(rect.top, clip->rects[j].top); + rect.right = min(rect.right, clip->rects[j].right); + rect.bottom = min(rect.bottom, clip->rects[j].bottom); + + pdev->dib.funcs->pattern_rects(&pdev->dib, 1, &rect, &origin, &pdev->brush_dib, pdev->brush_and_bits, pdev->brush_xor_bits); + } + } + } + release_wine_region(pdev->clip); + return TRUE; +} + void update_brush_rop( dibdrv_physdev *pdev, INT rop ) { pdev->brush_rop = rop; diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index a35877e..6dec478 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -50,6 +50,82 @@ static void solid_rects_null(const dib_info *dib, int num, const RECT *rc, DWORD return; } +static inline INT calc_offset(INT edge, INT size, INT origin) +{ + INT offset; + + if(edge - origin >= 0) + offset = (edge - origin) % size; + else + { + offset = (origin - edge) % size; + if(offset) offset = size - offset; + } + return offset; +} + +static inline POINT calc_brush_offset(const RECT *rc, const dib_info *brush, const POINT *origin) +{ + POINT offset; + + offset.x = calc_offset(rc->left, brush->width, origin->x); + offset.y = calc_offset(rc->top, brush->height, origin->y); + + return offset; +} + +static void pattern_rects_32(const dib_info *dib, int num, const RECT *rc, const POINT *origin, + const dib_info *brush, void *and_bits, void *xor_bits) +{ + DWORD *ptr, *start, *start_and, *and_ptr, *start_xor, *xor_ptr; + int x, y, i; + POINT offset; + + for(i = 0; i < num; i++, rc++) + { + offset = calc_brush_offset(rc, brush, origin); + + start = get_pixel_ptr_32(dib, rc->left, rc->top); + start_and = (DWORD*)and_bits + offset.y * brush->stride / 4; + start_xor = (DWORD*)xor_bits + offset.y * brush->stride / 4; + + for(y = rc->top; y < rc->bottom; y++, start += dib->stride / 4) + { + and_ptr = start_and + offset.x; + xor_ptr = start_xor + offset.x; + + for(x = rc->left, ptr = start; x < rc->right; x++) + { + do_rop_32(ptr++, *and_ptr++, *xor_ptr++); + if(and_ptr == start_and + brush->width) + { + and_ptr = start_and; + xor_ptr = start_xor; + } + } + + offset.y++; + if(offset.y == brush->height) + { + start_and = and_bits; + start_xor = xor_bits; + offset.y = 0; + } + else + { + start_and += brush->stride / 4; + start_xor += brush->stride / 4; + } + } + } +} + +static void pattern_rects_null(const dib_info *dib, int num, const RECT *rc, const POINT *origin, + const dib_info *brush, void *and_bits, void *xor_bits) +{ + return; +} + static DWORD colorref_to_pixel_888(const dib_info *dib, COLORREF color) { return ( ((color >> 16) & 0xff) | (color & 0xff00) | ((color << 16) & 0xff0000) ); @@ -88,17 +164,20 @@ static DWORD colorref_to_pixel_null(const dib_info *dib, COLORREF color) const primitive_funcs funcs_8888 = { solid_rects_32, + pattern_rects_32, colorref_to_pixel_888 }; const primitive_funcs funcs_32 = { solid_rects_32, + pattern_rects_32, colorref_to_pixel_masks }; const primitive_funcs funcs_null = { solid_rects_null, + pattern_rects_null, colorref_to_pixel_null };

1 0

Huw Davies : gdi32/tests: Add tests for 32 bpp DIB pattern brush fills.
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: 8a43f3535c7d7325e0436846c2f854c4523ed84d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a43f3535c7d7325e0436846c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 12 13:01:26 2011 +0100 gdi32/tests: Add tests for 32 bpp DIB pattern brush fills. --- dlls/gdi32/tests/dib.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 67 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 196cbc5..4a9c692 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -90,6 +90,8 @@ static const char *sha1_graphics_a8r8g8b8[] = "6c530622a025d872a642e8f950867884d7b136cb", "7c07d91b8f68fb31821701b3dcb96de018bf0c66", "b2261353decda2712b83538ab434a49ce21f3172", + "a8b59f25984b066fc6b91cae6bf983a78028ba7f", + "3d95adb85b9673a932ac847a4b5451fa59885f74", NULL }; @@ -240,19 +242,25 @@ static const RECT patblt_clips[] = {170, 200, 176, 210}, /* t edge on b edgecase clipped */ }; +static const BITMAPINFOHEADER dib_brush_header_32 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 32, BI_RGB, 0, 0, 0, 0, 0}; + static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sha1) { DWORD dib_size = get_dib_size(bmi); HPEN solid_pen, dashed_pen, orig_pen; - HBRUSH solid_brush, orig_brush; + HBRUSH solid_brush, dib_brush, orig_brush; INT i, y; HRGN hrgn, hrgn2; + BYTE dib_brush_buf[sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD) + 16 * 16 * sizeof(DWORD)]; /* Enough for 16 x 16 at 32 bpp */ + BITMAPINFO *brush_bi = (BITMAPINFO*)dib_brush_buf; + BYTE *brush_bits; memset(bits, 0xcc, dib_size); compare_hash(bmi, bits, sha1, "empty"); solid_pen = CreatePen(PS_SOLID, 1, RGB(0, 0, 0xff)); orig_pen = SelectObject(hdc, solid_pen); + SetBrushOrgEx(hdc, 0, 0, NULL); /* horizontal and vertical lines */ for(i = 1; i <= 16; i++) @@ -415,8 +423,66 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh ExtSelectClipRgn(hdc, NULL, RGN_COPY); + /* DIB pattern brush */ + + brush_bi->bmiHeader = dib_brush_header_32; + brush_bits = (BYTE*)brush_bi + sizeof(BITMAPINFOHEADER); + memset(brush_bits, 0, 16 * 16 * sizeof(DWORD)); + brush_bits[2] = 0xff; + brush_bits[6] = 0xff; + brush_bits[65] = 0xff; + brush_bits[69] = 0xff; + + dib_brush = CreateDIBPatternBrushPt(brush_bi, DIB_RGB_COLORS); + + SelectObject(hdc, dib_brush); + SetBrushOrgEx(hdc, 1, 1, NULL); + + for(i = 0, y = 10; i < 256; i++) + { + BOOL ret; + + if(!rop_uses_src(rop3[i])) + { + ret = PatBlt(hdc, 10 + i, y, 100, 20, rop3[i]); + ok(ret, "got FALSE for %x\n", rop3[i]); + y += 25; + } + } + compare_hash(bmi, bits, sha1, "top-down dib brush patblt"); + memset(bits, 0xcc, dib_size); + + SelectObject(hdc, orig_brush); + DeleteObject(dib_brush); + + /* Bottom-up DIB pattern brush */ + + brush_bi->bmiHeader.biHeight = -brush_bi->bmiHeader.biHeight; + + dib_brush = CreateDIBPatternBrushPt(brush_bi, DIB_RGB_COLORS); + + SelectObject(hdc, dib_brush); + SetBrushOrgEx(hdc, 100, 100, NULL); + + for(i = 0, y = 10; i < 256; i++) + { + BOOL ret; + + if(!rop_uses_src(rop3[i])) + { + ret = PatBlt(hdc, 10 + i, y, 100, 20, rop3[i]); + ok(ret, "got FALSE for %x\n", rop3[i]); + y += 25; + } + } + compare_hash(bmi, bits, sha1, "bottom-up dib brush patblt"); + memset(bits, 0xcc, dib_size); + + SetBrushOrgEx(hdc, 0, 0, NULL); + SelectObject(hdc, orig_brush); SelectObject(hdc, orig_pen); + DeleteObject(dib_brush); DeleteObject(dashed_pen); DeleteObject(solid_brush); DeleteObject(solid_pen);

1 0

Damjan Jovanovic : mmsystem.dll16: Use flags instead of device type as the MCI_STATUS heuristic.
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: 15a3bd9c79bf8bf7db9acbf8032a91c36ba4fe67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15a3bd9c79bf8bf7db9acbf80… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed May 11 22:07:24 2011 +0200 mmsystem.dll16: Use flags instead of device type as the MCI_STATUS heuristic. --- dlls/mmsystem.dll16/mci16.c | 23 ++++++----------------- 1 files changed, 6 insertions(+), 17 deletions(-) diff --git a/dlls/mmsystem.dll16/mci16.c b/dlls/mmsystem.dll16/mci16.c index 27ae01d..3d9c73f 100644 --- a/dlls/mmsystem.dll16/mci16.c +++ b/dlls/mmsystem.dll16/mci16.c @@ -128,21 +128,10 @@ static LPWSTR MCI_strdupAtoW( LPCSTR str ) return ret; } -static DWORD MCI_get_device_type(UINT16 deviceId) -{ - MCI_GETDEVCAPS_PARMS parms; - MCIERROR err; - - err = mciSendCommandW(deviceId, MCI_GETDEVCAPS, MCI_GETDEVCAPS_DEVICE_TYPE | MCI_WAIT, (DWORD_PTR)&parms); - if (err != MMSYSERR_NOERROR) - return MCI_DEVTYPE_OTHER; - return parms.dwReturn; -} - /************************************************************************** * MCI_MapMsg16To32W [internal] */ -static MMSYSTEM_MapType MCI_MapMsg16To32W(UINT16 wDevID, WORD wMsg, DWORD dwFlags, DWORD_PTR* lParam) +static MMSYSTEM_MapType MCI_MapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR* lParam) { if (*lParam == 0) return MMSYSTEM_MAP_OK; @@ -204,7 +193,7 @@ static MMSYSTEM_MapType MCI_MapMsg16To32W(UINT16 wDevID, WORD wMsg, DWORD dwFlag return MMSYSTEM_MAP_OKMEM; case MCI_STATUS: { - if (MCI_get_device_type(wDevID) == MCI_DEVTYPE_DIGITAL_VIDEO) { + if (dwFlags & (MCI_DGV_STATUS_REFERENCE | MCI_DGV_STATUS_DISKSPACE)) { LPMCI_DGV_STATUS_PARMSW mdsp32w = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LPMCI_DGV_STATUS_PARMS16) + sizeof(MCI_DGV_STATUS_PARMSW)); LPMCI_DGV_STATUS_PARMS16 mdsp16 = MapSL(*lParam); @@ -394,7 +383,7 @@ static MMSYSTEM_MapType MCI_MapMsg16To32W(UINT16 wDevID, WORD wMsg, DWORD dwFlag /************************************************************************** * MCI_UnMapMsg16To32W [internal] */ -static MMSYSTEM_MapType MCI_UnMapMsg16To32W(UINT16 wDevID, WORD wMsg, DWORD dwFlags, DWORD_PTR lParam) +static MMSYSTEM_MapType MCI_UnMapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR lParam) { switch (wMsg) { /* case MCI_CAPTURE */ @@ -443,7 +432,7 @@ static MMSYSTEM_MapType MCI_UnMapMsg16To32W(UINT16 wDevID, WORD wMsg, DWORD dwF } return MMSYSTEM_MAP_OK; case MCI_STATUS: - if (lParam && MCI_get_device_type(wDevID) == MCI_DEVTYPE_DIGITAL_VIDEO) { + if (lParam && (dwFlags & (MCI_DGV_STATUS_REFERENCE | MCI_DGV_STATUS_DISKSPACE))) { LPMCI_DGV_STATUS_PARMSW mdsp32w = (LPMCI_DGV_STATUS_PARMSW)lParam; char *base = (char*)lParam - sizeof(LPMCI_DGV_STATUS_PARMS16); LPMCI_DGV_STATUS_PARMS16 mdsp16 = *(LPMCI_DGV_STATUS_PARMS16*)base; @@ -759,7 +748,7 @@ DWORD WINAPI mciSendCommand16(UINT16 wDevID, UINT16 wMsg, DWORD dwParam1, DWORD dwRet = MCIERR_INVALID_DEVICE_ID; - switch (res = MCI_MapMsg16To32W(wDevID, wMsg, dwParam1, &dwParam2)) { + switch (res = MCI_MapMsg16To32W(wMsg, dwParam1, &dwParam2)) { case MMSYSTEM_MAP_MSGERROR: TRACE("%s not handled yet\n", MCI_MessageToString(wMsg)); dwRet = MCIERR_DRIVER_INTERNAL; @@ -772,7 +761,7 @@ DWORD WINAPI mciSendCommand16(UINT16 wDevID, UINT16 wMsg, DWORD dwParam1, DWORD case MMSYSTEM_MAP_OKMEM: dwRet = mciSendCommandW(wDevID, wMsg, dwParam1, dwParam2); if (res == MMSYSTEM_MAP_OKMEM) - MCI_UnMapMsg16To32W(wDevID, wMsg, dwParam1, dwParam2); + MCI_UnMapMsg16To32W(wMsg, dwParam1, dwParam2); break; } }

1 0

Marcus Meissner : winedump: Fixed minidump processor revision decoding ( Coverity).
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: 16d13f24a0c7d1afd46e898c1f74ab6cf5bd2099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16d13f24a0c7d1afd46e898c1… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu May 5 15:27:06 2011 +0200 winedump: Fixed minidump processor revision decoding (Coverity). --- programs/winedbg/tgt_minidump.c | 14 +++++++------- tools/winedump/minidump.c | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index 142d5ca..f5750e8 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -238,18 +238,18 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) strcat(tmp, str); if (msi->ProcessorLevel == 3 || msi->ProcessorLevel == 4) { - if (HIWORD(msi->ProcessorRevision) == 0xFF) + if (HIBYTE(msi->ProcessorRevision) == 0xFF) sprintf(tmp + strlen(tmp), " (%c%d)", - 'A' + HIBYTE(LOWORD(msi->ProcessorRevision)), - LOBYTE(LOWORD(msi->ProcessorRevision))); + 'A' + ((msi->ProcessorRevision>>4)&0xf)-0x0a, + ((msi->ProcessorRevision&0xf))); else sprintf(tmp + strlen(tmp), " (%c%d)", - 'A' + HIWORD(msi->ProcessorRevision), - LOWORD(msi->ProcessorRevision)); + 'A' + HIBYTE(msi->ProcessorRevision), + LOBYTE(msi->ProcessorRevision)); } else sprintf(tmp + strlen(tmp), " (%d.%d)", - HIWORD(msi->ProcessorRevision), - LOWORD(msi->ProcessorRevision)); + HIBYTE(msi->ProcessorRevision), + LOBYTE(msi->ProcessorRevision)); str = tmp; break; case PROCESSOR_ARCHITECTURE_MIPS: diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index d860768..4cd04f3 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -267,12 +267,12 @@ void mdmp_dump(void) strcat(tmp, " ("); if (msi->ProcessorLevel == 3 || msi->ProcessorLevel == 4) { - if (HIWORD(msi->ProcessorRevision) == 0xFF) - sprintf(tmp + strlen(tmp), "%c%d", 'A' + HIBYTE(LOWORD(msi->ProcessorRevision)), LOBYTE(LOWORD(msi->ProcessorRevision))); + if (HIBYTE(msi->ProcessorRevision) == 0xFF) + sprintf(tmp + strlen(tmp), "%c%d", 'A' + ((msi->ProcessorRevision>>4)&0xf)-0x0a, msi->ProcessorRevision&0xf); else - sprintf(tmp + strlen(tmp), "%c%d", 'A' + HIWORD(msi->ProcessorRevision), LOWORD(msi->ProcessorRevision)); + sprintf(tmp + strlen(tmp), "%c%d", 'A' + HIBYTE(msi->ProcessorRevision), LOBYTE(msi->ProcessorRevision)); } - else sprintf(tmp + strlen(tmp), "%d.%d", HIWORD(msi->ProcessorRevision), LOWORD(msi->ProcessorRevision)); + else sprintf(tmp + strlen(tmp), "%d.%d", HIBYTE(msi->ProcessorRevision), LOBYTE(msi->ProcessorRevision)); str = tmp; break; case PROCESSOR_ARCHITECTURE_MIPS:

1 0

Alexandre Julliard : winex11: Only update the fullscreen pointer grab when something has changed.
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: b081ee452d7ff78c5db01bb635a6528e4f33afda URL: http://source.winehq.org/git/wine.git/?a=commit;h=b081ee452d7ff78c5db01bb63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 12 16:24:58 2011 +0200 winex11: Only update the fullscreen pointer grab when something has changed. --- dlls/winex11.drv/desktop.c | 2 +- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/mouse.c | 17 ++++++++++++----- dlls/winex11.drv/x11drv.h | 2 +- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index b45f786..acba18b 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -200,7 +200,7 @@ static BOOL CALLBACK update_windows_on_desktop_resize( HWND hwnd, LPARAM lparam DefaultScreen(display), mask, &changes ); wine_tsx11_unlock(); } - if (hwnd == GetForegroundWindow()) clip_fullscreen_window( hwnd ); + if (hwnd == GetForegroundWindow()) clip_fullscreen_window( hwnd, TRUE ); return TRUE; } diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index d2ab40a..6ef1e07 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -716,7 +716,7 @@ static void X11DRV_FocusIn( HWND hwnd, XEvent *xev ) } if (use_take_focus) { - if (hwnd == GetForegroundWindow()) clip_fullscreen_window( hwnd ); + if (hwnd == GetForegroundWindow()) clip_fullscreen_window( hwnd, FALSE ); return; } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 3e1a78f..5fd7338 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -419,11 +419,11 @@ static BOOL grab_clipping_window( const RECT *clip, BOOL only_with_xinput ) if (msg_hwnd) DestroyWindow( msg_hwnd ); return FALSE; } + clip_rect = *clip; if (msg_hwnd) { data->clip_hwnd = msg_hwnd; sync_window_cursor( clip_window ); - clip_rect = *clip; SendMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, (LPARAM)msg_hwnd ); } return TRUE; @@ -502,9 +502,10 @@ LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ) * * Turn on clipping if the active window is fullscreen. */ -BOOL clip_fullscreen_window( HWND hwnd ) +BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) { struct x11drv_win_data *data; + struct x11drv_thread_data *thread_data; RECT rect; DWORD style; @@ -516,7 +517,9 @@ BOOL clip_fullscreen_window( HWND hwnd ) /* maximized windows don't count as full screen */ if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION) return FALSE; if (!is_window_rect_fullscreen( &data->whole_rect )) return FALSE; - if (GetTickCount() - x11drv_thread_data()->clip_reset < 1000) return FALSE; + if (!(thread_data = x11drv_thread_data())) return FALSE; + if (GetTickCount() - thread_data->clip_reset < 1000) return FALSE; + if (!reset && thread_data->clip_hwnd) return FALSE; /* already clipping */ SetRect( &rect, 0, 0, screen_width, screen_height ); if (!grab_fullscreen) { @@ -576,7 +579,7 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU { hwnd = GetAncestor( hwnd, GA_ROOT ); if ((input->u.mi.dwFlags & (MOUSEEVENTF_LEFTDOWN|MOUSEEVENTF_RIGHTDOWN)) && hwnd == GetForegroundWindow()) - clip_fullscreen_window( hwnd ); + clip_fullscreen_window( hwnd, FALSE ); } /* update the wine server Z-order */ @@ -1280,7 +1283,11 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) else /* if currently clipping, check if we should switch to fullscreen clipping */ { struct x11drv_thread_data *data = x11drv_thread_data(); - if (data && data->clip_hwnd && clip_fullscreen_window( foreground )) return TRUE; + if (data && data->clip_hwnd) + { + if (EqualRect( clip, &clip_rect ) || clip_fullscreen_window( foreground, TRUE )) + return TRUE; + } } } ungrab_clipping_window(); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index fc6902b..ca7a379 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -846,7 +846,7 @@ extern void sync_window_cursor( Window window ); extern LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ); extern void ungrab_clipping_window(void); extern void reset_clipping_window(void); -extern BOOL clip_fullscreen_window( HWND hwnd ); +extern BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ); extern void X11DRV_InitKeyboard( Display *display ); extern DWORD CDECL X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags );

1 0

Alexandre Julliard : winex11: Set the desktop window gravity to NorthWest to avoid spurious position changes .
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: 2e46c671d69f8ec3b013a832fc92a05fdd198a45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e46c671d69f8ec3b013a832f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 12 16:25:50 2011 +0200 winex11: Set the desktop window gravity to NorthWest to avoid spurious position changes. --- dlls/winex11.drv/window.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 9e67612..6a87afc 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -982,6 +982,7 @@ static void set_size_hints( Display *display, struct x11drv_win_data *data, DWOR size_hints->y = data->whole_rect.top; size_hints->flags |= PPosition; } + else size_hints->win_gravity = NorthWestGravity; if (!is_window_resizable( data, style )) {

1 0

Jacek Caban : urlmon: Make sure to include query part of relative URI containing path in combine_uri .
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: ebf9f12c29362c2c91b64cc38f410f550b471eb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebf9f12c29362c2c91b64cc38… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 12 14:47:20 2011 +0000 urlmon: Make sure to include query part of relative URI containing path in combine_uri. --- dlls/urlmon/tests/uri.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 5 +++ 2 files changed, 86 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 5ebdd6e..930622a 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -6078,6 +6078,87 @@ static const uri_combine_test uri_combine_tests[] = { {URL_SCHEME_FILE,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + { "http://winehq.org/dir/testfile",0, + "test?querystring",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"http://winehq.org/dir/test?querystring",S_OK}, + {"winehq.org",S_OK}, + {"http://winehq.org/dir/test?querystring",S_OK}, + {"winehq.org",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"winehq.org",S_OK}, + {"",S_FALSE}, + {"/dir/test",S_OK}, + {"/dir/test?querystring",S_OK}, + {"?querystring",S_OK}, + {"http://winehq.org/dir/test?querystring",S_OK}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + {80,S_OK}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "http://winehq.org/dir/test",0, + "test?querystring",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"http://winehq.org/dir/test?querystring",S_OK}, + {"winehq.org",S_OK}, + {"http://winehq.org/dir/test?querystring",S_OK}, + {"winehq.org",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"winehq.org",S_OK}, + {"",S_FALSE}, + {"/dir/test",S_OK}, + {"/dir/test?querystring",S_OK}, + {"?querystring",S_OK}, + {"http://winehq.org/dir/test?querystring",S_OK}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + {80,S_OK}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "http://winehq.org/dir/test?querystring",0, + "#hash",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"http://winehq.org/dir/test?querystring#hash",S_OK}, + {"winehq.org",S_OK}, + {"http://winehq.org/dir/test?querystring#hash",S_OK}, + {"winehq.org",S_OK}, + {"",S_FALSE}, + {"#hash",S_OK}, + {"winehq.org",S_OK}, + {"",S_FALSE}, + {"/dir/test",S_OK}, + {"/dir/test?querystring",S_OK}, + {"?querystring",S_OK}, + {"http://winehq.org/dir/test?querystring#hash",S_OK}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + {80,S_OK}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 3517c6c..459d4c4 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6006,6 +6006,11 @@ static HRESULT combine_uri(Uri *base, Uri *relative, DWORD flags, IUri **result, } } + if(relative->query_start > -1) { + data.query = relative->canon_uri+relative->query_start; + data.query_len = relative->query_len; + } + /* Make sure the path component is valid. */ ptr = path; pptr = &ptr;

1 0

Jacek Caban : kernel32: Moved GetProcessMemoryInfo implementation to kernel32.
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: 4ed94f7939a21c77bc565d0f697b1cd9aa8b4a74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ed94f7939a21c77bc565d0f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 12 12:19:40 2011 +0000 kernel32: Moved GetProcessMemoryInfo implementation to kernel32. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/psapi/psapi.spec | 2 +- dlls/psapi/psapi_main.c | 41 ----------------------------------------- 4 files changed, 44 insertions(+), 42 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a4e45d6..458b425 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -772,6 +772,7 @@ @ stdcall K32GetProcessImageFileNameW(long ptr long) @ stdcall K32EnumProcessModules(long ptr long ptr) @ stdcall K32EnumProcesses(ptr long ptr) +@ stdcall K32GetProcessMemoryInfo(long ptr long) @ stdcall K32QueryWorkingSet(long ptr long) @ stdcall K32QueryWorkingSetEx(long ptr long) @ stdcall -i386 -private -register K32Thk1632Epilog() krnl386.exe16.K32Thk1632Epilog diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 5436c06..2ec5905 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -46,6 +46,7 @@ #define WIN32_NO_STATUS #include "winternl.h" #include "kernel_private.h" +#include "psapi.h" #include "wine/library.h" #include "wine/server.h" #include "wine/unicode.h" @@ -3622,6 +3623,47 @@ BOOL WINAPI K32QueryWorkingSetEx( HANDLE process, LPVOID buffer, DWORD size ) } /*********************************************************************** + * K32GetProcessMemoryInfo (KERNEL32.@) + * + * Retrieve memory usage information for a given process + * + */ +BOOL WINAPI K32GetProcessMemoryInfo(HANDLE process, + PPROCESS_MEMORY_COUNTERS pmc, DWORD cb) +{ + NTSTATUS status; + VM_COUNTERS vmc; + + if (cb < sizeof(PROCESS_MEMORY_COUNTERS)) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + status = NtQueryInformationProcess(process, ProcessVmCounters, + &vmc, sizeof(vmc), NULL); + + if (status) + { + SetLastError(RtlNtStatusToDosError(status)); + return FALSE; + } + + pmc->cb = sizeof(PROCESS_MEMORY_COUNTERS); + pmc->PageFaultCount = vmc.PageFaultCount; + pmc->PeakWorkingSetSize = vmc.PeakWorkingSetSize; + pmc->WorkingSetSize = vmc.WorkingSetSize; + pmc->QuotaPeakPagedPoolUsage = vmc.QuotaPeakPagedPoolUsage; + pmc->QuotaPagedPoolUsage = vmc.QuotaPagedPoolUsage; + pmc->QuotaPeakNonPagedPoolUsage = vmc.QuotaPeakNonPagedPoolUsage; + pmc->QuotaNonPagedPoolUsage = vmc.QuotaNonPagedPoolUsage; + pmc->PagefileUsage = vmc.PagefileUsage; + pmc->PeakPagefileUsage = vmc.PeakPagefileUsage; + + return TRUE; +} + +/*********************************************************************** * ProcessIdToSessionId (KERNEL32.@) * This function is available on Terminal Server 4SP4 and Windows 2000 */ diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index 37d6e80..ad03716 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -18,7 +18,7 @@ @ stdcall GetPerformanceInfo(ptr long) @ stdcall GetProcessImageFileNameA(long ptr long) kernel32.K32GetProcessImageFileNameA @ stdcall GetProcessImageFileNameW(long ptr long) kernel32.K32GetProcessImageFileNameW -@ stdcall GetProcessMemoryInfo(long ptr long) +@ stdcall GetProcessMemoryInfo(long ptr long) kernel32.K32GetProcessMemoryInfo @ stdcall GetWsChanges(long ptr long) @ stdcall InitializeProcessForWsWatch(long) @ stdcall QueryWorkingSet(long ptr long) kernel32.K32QueryWorkingSet diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c index 909e7ce..0b8e5b0 100644 --- a/dlls/psapi/psapi_main.c +++ b/dlls/psapi/psapi_main.c @@ -407,47 +407,6 @@ BOOL WINAPI GetPerformanceInfo( PPERFORMANCE_INFORMATION info, DWORD size ) } /*********************************************************************** - * GetProcessMemoryInfo (PSAPI.@) - * - * Retrieve memory usage information for a given process - * - */ -BOOL WINAPI GetProcessMemoryInfo(HANDLE hProcess, - PPROCESS_MEMORY_COUNTERS pmc, DWORD cb) -{ - NTSTATUS status; - VM_COUNTERS vmc; - - if (cb < sizeof(PROCESS_MEMORY_COUNTERS)) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - - status = NtQueryInformationProcess(hProcess, ProcessVmCounters, - &vmc, sizeof(vmc), NULL); - - if (status) - { - SetLastError(RtlNtStatusToDosError(status)); - return FALSE; - } - - pmc->cb = sizeof(PROCESS_MEMORY_COUNTERS); - pmc->PageFaultCount = vmc.PageFaultCount; - pmc->PeakWorkingSetSize = vmc.PeakWorkingSetSize; - pmc->WorkingSetSize = vmc.WorkingSetSize; - pmc->QuotaPeakPagedPoolUsage = vmc.QuotaPeakPagedPoolUsage; - pmc->QuotaPagedPoolUsage = vmc.QuotaPagedPoolUsage; - pmc->QuotaPeakNonPagedPoolUsage = vmc.QuotaPeakNonPagedPoolUsage; - pmc->QuotaNonPagedPoolUsage = vmc.QuotaNonPagedPoolUsage; - pmc->PagefileUsage = vmc.PagefileUsage; - pmc->PeakPagefileUsage = vmc.PeakPagefileUsage; - - return TRUE; -} - -/*********************************************************************** * GetWsChanges (PSAPI.@) */ BOOL WINAPI GetWsChanges( HANDLE process, PPSAPI_WS_WATCH_INFORMATION watchinfo, DWORD size )

1 0

Jacek Caban : kernel32: Moved K32EnumProcessModules to module.c.
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: 8379893f967edfd35a890eabd73b9b7e1d736afe URL: http://source.winehq.org/git/wine.git/?a=commit;h=8379893f967edfd35a890eabd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 12 12:19:52 2011 +0000 kernel32: Moved K32EnumProcessModules to module.c. --- dlls/kernel32/module.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/process.c | 82 ----------------------------------------------- 2 files changed, 82 insertions(+), 82 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index d94850f..347d4aa 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1073,6 +1073,88 @@ FARPROC WINAPI DelayLoadFailureHook( LPCSTR name, LPCSTR function ) return NULL; } +typedef struct { + HANDLE process; + PLIST_ENTRY head, current; + LDR_MODULE ldr_module; +} MODULE_ITERATOR; + +static BOOL init_module_iterator(MODULE_ITERATOR *iter, HANDLE process) +{ + PROCESS_BASIC_INFORMATION pbi; + PPEB_LDR_DATA ldr_data; + NTSTATUS status; + + /* Get address of PEB */ + status = NtQueryInformationProcess(process, ProcessBasicInformation, + &pbi, sizeof(pbi), NULL); + if (status != STATUS_SUCCESS) + { + SetLastError(RtlNtStatusToDosError(status)); + return FALSE; + } + + /* Read address of LdrData from PEB */ + if (!ReadProcessMemory(process, &pbi.PebBaseAddress->LdrData, + &ldr_data, sizeof(ldr_data), NULL)) + return FALSE; + + /* Read address of first module from LdrData */ + if (!ReadProcessMemory(process, + &ldr_data->InLoadOrderModuleList.Flink, + &iter->current, sizeof(iter->current), NULL)) + return FALSE; + + iter->head = &ldr_data->InLoadOrderModuleList; + iter->process = process; + + return TRUE; +} + +static int module_iterator_next(MODULE_ITERATOR *iter) +{ + if (iter->current == iter->head) + return 0; + + if (!ReadProcessMemory(iter->process, + CONTAINING_RECORD(iter->current, LDR_MODULE, InLoadOrderModuleList), + &iter->ldr_module, sizeof(iter->ldr_module), NULL)) + return -1; + + iter->current = iter->ldr_module.InLoadOrderModuleList.Flink; + return 1; +} + +/*********************************************************************** + * K32EnumProcessModules (KERNEL32.@) + * + * NOTES + * Returned list is in load order. + */ +BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, + DWORD cb, DWORD *needed) +{ + MODULE_ITERATOR iter; + INT ret; + + if (!init_module_iterator(&iter, process)) + return FALSE; + + *needed = 0; + + while ((ret = module_iterator_next(&iter)) > 0) + { + if (cb >= sizeof(HMODULE)) + { + *lphModule++ = iter.ldr_module.BaseAddress; + cb -= sizeof(HMODULE); + } + *needed += sizeof(HMODULE); + } + + return ret == 0; +} + #ifdef __i386__ diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 2ec5905..f043b87 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3502,88 +3502,6 @@ BOOL WINAPI K32EnumProcesses(DWORD *lpdwProcessIDs, DWORD cb, DWORD *lpcbUsed) return TRUE; } -typedef struct { - HANDLE process; - PLIST_ENTRY head, current; - LDR_MODULE ldr_module; -} MODULE_ITERATOR; - -static BOOL init_module_iterator(MODULE_ITERATOR *iter, HANDLE process) -{ - PROCESS_BASIC_INFORMATION pbi; - PPEB_LDR_DATA ldr_data; - NTSTATUS status; - - /* Get address of PEB */ - status = NtQueryInformationProcess(process, ProcessBasicInformation, - &pbi, sizeof(pbi), NULL); - if (status != STATUS_SUCCESS) - { - SetLastError(RtlNtStatusToDosError(status)); - return FALSE; - } - - /* Read address of LdrData from PEB */ - if (!ReadProcessMemory(process, &pbi.PebBaseAddress->LdrData, - &ldr_data, sizeof(ldr_data), NULL)) - return FALSE; - - /* Read address of first module from LdrData */ - if (!ReadProcessMemory(process, - &ldr_data->InLoadOrderModuleList.Flink, - &iter->current, sizeof(iter->current), NULL)) - return FALSE; - - iter->head = &ldr_data->InLoadOrderModuleList; - iter->process = process; - - return TRUE; -} - -static int module_iterator_next(MODULE_ITERATOR *iter) -{ - if (iter->current == iter->head) - return 0; - - if (!ReadProcessMemory(iter->process, - CONTAINING_RECORD(iter->current, LDR_MODULE, InLoadOrderModuleList), - &iter->ldr_module, sizeof(iter->ldr_module), NULL)) - return -1; - - iter->current = iter->ldr_module.InLoadOrderModuleList.Flink; - return 1; -} - -/*********************************************************************** - * K32EnumProcessModules (KERNEL32.@) - * - * NOTES - * Returned list is in load order. - */ -BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, - DWORD cb, DWORD *needed) -{ - MODULE_ITERATOR iter; - INT ret; - - if (!init_module_iterator(&iter, process)) - return FALSE; - - *needed = 0; - - while ((ret = module_iterator_next(&iter)) > 0) - { - if (cb >= sizeof(HMODULE)) - { - *lphModule++ = iter.ldr_module.BaseAddress; - cb -= sizeof(HMODULE); - } - *needed += sizeof(HMODULE); - } - - return ret == 0; -} - /*********************************************************************** * K32QueryWorkingSet (KERNEL32.@) */

1 0

Jacek Caban : kernel32: Moved GetModuleBaseName[AW] implementation to kernel32.
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: e6dd213d52cc807e76d8309257de3a4937297e5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6dd213d52cc807e76d830925… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 12 12:22:59 2011 +0000 kernel32: Moved GetModuleBaseName[AW] implementation to kernel32. --- dlls/kernel32/kernel32.spec | 2 + dlls/kernel32/module.c | 72 +++++++++++++++++++++++++++++++++++++++++++ dlls/psapi/psapi.spec | 4 +- dlls/psapi/psapi_main.c | 46 --------------------------- 4 files changed, 76 insertions(+), 48 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 458b425..4da6f06 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -772,6 +772,8 @@ @ stdcall K32GetProcessImageFileNameW(long ptr long) @ stdcall K32EnumProcessModules(long ptr long ptr) @ stdcall K32EnumProcesses(ptr long ptr) +@ stdcall K32GetModuleBaseNameA(long long ptr long) +@ stdcall K32GetModuleBaseNameW(long long ptr long) @ stdcall K32GetProcessMemoryInfo(long ptr long) @ stdcall K32QueryWorkingSet(long ptr long) @ stdcall K32QueryWorkingSetEx(long ptr long) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 347d4aa..4e2c098 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1125,6 +1125,29 @@ static int module_iterator_next(MODULE_ITERATOR *iter) return 1; } +static BOOL get_ldr_module(HANDLE process, HMODULE module, LDR_MODULE *ldr_module) +{ + MODULE_ITERATOR iter; + INT ret; + + if (!init_module_iterator(&iter, process)) + return FALSE; + + while ((ret = module_iterator_next(&iter)) > 0) + /* When hModule is NULL we return the process image - which will be + * the first module since our iterator uses InLoadOrderModuleList */ + if (!module || module == iter.ldr_module.BaseAddress) + { + *ldr_module = iter.ldr_module; + return TRUE; + } + + if (ret == 0) + SetLastError(ERROR_INVALID_HANDLE); + + return FALSE; +} + /*********************************************************************** * K32EnumProcessModules (KERNEL32.@) * @@ -1155,6 +1178,55 @@ BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, return ret == 0; } +/*********************************************************************** + * K32GetModuleBaseNameW (KERNEL32.@) + */ +DWORD WINAPI K32GetModuleBaseNameW(HANDLE process, HMODULE module, + LPWSTR base_name, DWORD size) +{ + LDR_MODULE ldr_module; + + if (!get_ldr_module(process, module, &ldr_module)) + return 0; + + size = min(ldr_module.BaseDllName.Length / sizeof(WCHAR), size); + if (!ReadProcessMemory(process, ldr_module.BaseDllName.Buffer, + base_name, size * sizeof(WCHAR), NULL)) + return 0; + + base_name[size] = 0; + return size; +} + +/*********************************************************************** + * K32GetModuleBaseNameA (KERNEL32.@) + */ +DWORD WINAPI K32GetModuleBaseNameA(HANDLE process, HMODULE module, + LPSTR base_name, DWORD size) +{ + WCHAR *base_name_w; + DWORD len, ret = 0; + + if(!base_name || !size) { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + base_name_w = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * size); + if(!base_name_w) + return 0; + + len = K32GetModuleBaseNameW(process, module, base_name_w, size); + TRACE("%d, %s\n", len, debugstr_w(base_name_w)); + if (len) + { + ret = WideCharToMultiByte(CP_ACP, 0, base_name_w, len, + base_name, size, NULL, NULL); + if (ret < size) base_name[ret] = 0; + } + HeapFree(GetProcessHeap(), 0, base_name_w); + return ret; +} #ifdef __i386__ diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index ad03716..07e0cb5 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -10,8 +10,8 @@ @ stdcall GetDeviceDriverFileNameW(ptr ptr long) @ stdcall GetMappedFileNameA(long ptr ptr long) @ stdcall GetMappedFileNameW(long ptr ptr long) -@ stdcall GetModuleBaseNameA(long long ptr long) -@ stdcall GetModuleBaseNameW(long long ptr long) +@ stdcall GetModuleBaseNameA(long long ptr long) kernel32.K32GetModuleBaseNameA +@ stdcall GetModuleBaseNameW(long long ptr long) kernel32.K32GetModuleBaseNameW @ stdcall GetModuleFileNameExA(long long ptr long) @ stdcall GetModuleFileNameExW(long long ptr long) @ stdcall GetModuleInformation(long long ptr long) diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c index 0b8e5b0..a2d7ac4 100644 --- a/dlls/psapi/psapi_main.c +++ b/dlls/psapi/psapi_main.c @@ -263,52 +263,6 @@ DWORD WINAPI GetMappedFileNameW(HANDLE hProcess, LPVOID lpv, LPWSTR lpFilename, } /*********************************************************************** - * GetModuleBaseNameA (PSAPI.@) - */ -DWORD WINAPI GetModuleBaseNameA(HANDLE hProcess, HMODULE hModule, - LPSTR lpBaseName, DWORD nSize) -{ - WCHAR *lpBaseNameW; - DWORD buflenW, ret = 0; - - if(!lpBaseName || !nSize) { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - lpBaseNameW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * nSize); - buflenW = GetModuleBaseNameW(hProcess, hModule, lpBaseNameW, nSize); - TRACE("%d, %s\n", buflenW, debugstr_w(lpBaseNameW)); - if (buflenW) - { - ret = WideCharToMultiByte(CP_ACP, 0, lpBaseNameW, buflenW, - lpBaseName, nSize, NULL, NULL); - if (ret < nSize) lpBaseName[ret] = 0; - } - HeapFree(GetProcessHeap(), 0, lpBaseNameW); - return ret; -} - -/*********************************************************************** - * GetModuleBaseNameW (PSAPI.@) - */ -DWORD WINAPI GetModuleBaseNameW(HANDLE hProcess, HMODULE hModule, - LPWSTR lpBaseName, DWORD nSize) -{ - LDR_MODULE LdrModule; - - if (!PSAPI_GetLdrModule(hProcess, hModule, &LdrModule)) - return 0; - - nSize = min(LdrModule.BaseDllName.Length / sizeof(WCHAR), nSize); - if (!ReadProcessMemory(hProcess, LdrModule.BaseDllName.Buffer, - lpBaseName, nSize * sizeof(WCHAR), NULL)) - return 0; - - lpBaseName[nSize] = 0; - return nSize; -} - -/*********************************************************************** * GetModuleFileNameExA (PSAPI.@) */ DWORD WINAPI GetModuleFileNameExA(HANDLE hProcess, HMODULE hModule,

1 0