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

Aric Stewart : user32: Remove SetWindowText export.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: 77fdee8a2eaa60495603c58f0e90061a4f2dcb67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77fdee8a2eaa60495603c58f0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 9 11:45:33 2011 -0600 user32: Remove SetWindowText export. --- dlls/user32/user32.spec | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index c89b710..104ca86 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -676,7 +676,6 @@ @ stdcall SetWindowPos(long long long long long long long) @ stdcall SetWindowRgn(long long long) @ stdcall SetWindowStationUser(long long) -@ stdcall SetWindowText(long str) SetWindowTextA @ stdcall SetWindowTextA(long str) @ stdcall SetWindowTextW(long wstr) @ stdcall SetWindowWord(long long long)

1 0

Henri Verbeet : wined3d: Introduce wined3d_resource_get_desc() to retrieve the resource desc.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: 4be256a47c4f0ab91cfb0a72b4cbc67182f6179d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4be256a47c4f0ab91cfb0a72b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 9 19:16:15 2011 +0100 wined3d: Introduce wined3d_resource_get_desc() to retrieve the resource desc. --- dlls/wined3d/buffer.c | 11 +---------- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/resource.c | 14 ++++++++++++++ dlls/wined3d/surface_base.c | 11 +---------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volume.c | 11 +---------- dlls/wined3d/volumetexture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 ++ 8 files changed, 22 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e665311..8d65ffb 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1399,16 +1399,7 @@ void CDECL wined3d_buffer_get_desc(const struct wined3d_buffer *buffer, struct w { TRACE("buffer %p, desc %p.\n", buffer, desc); - desc->format = buffer->resource.format->id; - desc->resource_type = buffer->resource.resourceType; - desc->usage = buffer->resource.usage; - desc->pool = buffer->resource.pool; - desc->size = buffer->resource.size; - desc->multisample_type = WINED3DMULTISAMPLE_NONE; - desc->multisample_quality = 0; - desc->width = buffer->resource.size; - desc->height = 1; - desc->depth = 1; + wined3d_resource_get_desc(&buffer->resource, desc); } static const struct wined3d_resource_ops buffer_resource_ops = diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index d4e5d21..3e673df 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -340,7 +340,7 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_GetSubResourceDesc(IWineD3DCubeTex return WINED3DERR_INVALIDCALL; } - IWineD3DSurface_GetDesc((IWineD3DSurface *)surface_from_resource(sub_resource), desc); + wined3d_resource_get_desc(sub_resource, desc); return WINED3D_OK; } diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 66c2e62..5a73df2 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -282,3 +282,17 @@ void * CDECL wined3d_resource_get_parent(const struct wined3d_resource *resource { return resource->parent; } + +void wined3d_resource_get_desc(const struct wined3d_resource *resource, struct wined3d_resource_desc *desc) +{ + desc->resource_type = resource->resourceType; + desc->format = resource->format->id; + desc->multisample_type = resource->multisample_type; + desc->multisample_quality = resource->multisample_quality; + desc->usage = resource->usage; + desc->pool = resource->pool; + desc->width = resource->width; + desc->height = resource->height; + desc->depth = resource->depth; + desc->size = resource->size; +} diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index fc093b3..f8b6a63 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -163,16 +163,7 @@ void WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, struct wined TRACE("iface %p, desc %p.\n", iface, desc); - desc->format = surface->resource.format->id; - desc->resource_type = surface->resource.resourceType; - desc->usage = surface->resource.usage; - desc->pool = surface->resource.pool; - desc->size = surface->resource.size; /* dx8 only */ - desc->multisample_type = surface->resource.multisample_type; - desc->multisample_quality = surface->resource.multisample_quality; - desc->width = surface->resource.width; - desc->height = surface->resource.height; - desc->depth = surface->resource.depth; + wined3d_resource_get_desc(&surface->resource, desc); } HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetBltStatus(IWineD3DSurface *iface, DWORD flags) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 7a78ad8..a5a3d65 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -365,7 +365,7 @@ static HRESULT WINAPI IWineD3DTextureImpl_GetSubResourceDesc(IWineD3DTexture *if return WINED3DERR_INVALIDCALL; } - IWineD3DSurface_GetDesc((IWineD3DSurface *)surface_from_resource(sub_resource), desc); + wined3d_resource_get_desc(sub_resource, desc); return WINED3D_OK; } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 0210669..6fb337f 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -226,16 +226,7 @@ static void WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, struct wine TRACE("iface %p, desc %p.\n", iface, desc); - desc->format = volume->resource.format->id; - desc->resource_type = volume->resource.resourceType; - desc->usage = volume->resource.usage; - desc->pool = volume->resource.pool; - desc->size = volume->resource.size; /* dx8 only */ - desc->multisample_type = WINED3DMULTISAMPLE_NONE; - desc->multisample_quality = 0; - desc->width = volume->resource.width; - desc->height = volume->resource.height; - desc->depth = volume->resource.depth; + wined3d_resource_get_desc(&volume->resource, desc); } static HRESULT WINAPI IWineD3DVolumeImpl_Map(IWineD3DVolume *iface, diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 78ded41..06cd6d9 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -277,7 +277,7 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetSubResourceDesc(IWineD3DVolum return WINED3DERR_INVALIDCALL; } - IWineD3DVolume_GetDesc((IWineD3DVolume *)volume_from_resource(sub_resource), desc); + wined3d_resource_get_desc(sub_resource, desc); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 201e19b..f395a95 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1824,6 +1824,8 @@ struct wined3d_resource void resource_cleanup(struct wined3d_resource *resource) DECLSPEC_HIDDEN; HRESULT resource_free_private_data(struct wined3d_resource *resource, REFGUID guid) DECLSPEC_HIDDEN; +void wined3d_resource_get_desc(const struct wined3d_resource *resource, + struct wined3d_resource_desc *desc) DECLSPEC_HIDDEN; DWORD resource_get_priority(const struct wined3d_resource *resource) DECLSPEC_HIDDEN; HRESULT resource_get_private_data(const struct wined3d_resource *resource, REFGUID guid, void *data, DWORD *data_size) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Generalize GetSurfaceLevel() / GetVolumeLevel() to GetSubResource().
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: 8809ebdf790a651342f07a54e25e9e6a24fe3f42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8809ebdf790a651342f07a54e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 9 19:16:16 2011 +0100 wined3d: Generalize GetSurfaceLevel() / GetVolumeLevel() to GetSubResource(). --- dlls/d3d8/cubetexture.c | 24 ++++++++++++------------ dlls/d3d8/texture.c | 22 +++++++++++----------- dlls/d3d8/volumetexture.c | 22 +++++++++++----------- dlls/d3d9/cubetexture.c | 24 ++++++++++++------------ dlls/d3d9/texture.c | 22 +++++++++++----------- dlls/d3d9/volumetexture.c | 22 ++++++++++------------ dlls/wined3d/cubetexture.c | 23 +++++------------------ dlls/wined3d/device.c | 26 ++++++++++++-------------- dlls/wined3d/texture.c | 22 +++++----------------- dlls/wined3d/volumetexture.c | 22 +++++----------------- include/wine/wined3d.idl | 15 +++------------ 11 files changed, 97 insertions(+), 147 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8809ebdf790a651342f07…

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DBaseTexture::GetSubResourceDesc ().
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: 4fd03150f65ad57054fd0e46b0d205e84c51b73b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fd03150f65ad57054fd0e46b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 9 19:16:17 2011 +0100 wined3d: Get rid of IWineD3DBaseTexture::GetSubResourceDesc(). --- dlls/d3d8/cubetexture.c | 17 +++++++++------ dlls/d3d8/texture.c | 17 +++++++++------ dlls/d3d8/volumetexture.c | 17 +++++++++------ dlls/d3d9/cubetexture.c | 17 +++++++++------ dlls/d3d9/texture.c | 17 +++++++++------ dlls/d3d9/volumetexture.c | 19 +++++++++-------- dlls/ddraw/device.c | 41 ++++++++++++++++++++------------------- dlls/wined3d/cubetexture.c | 20 ------------------- dlls/wined3d/resource.c | 2 +- dlls/wined3d/texture.c | 20 ------------------- dlls/wined3d/volumetexture.c | 20 ------------------- dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 2 - include/wine/wined3d.idl | 6 +--- 14 files changed, 85 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4fd03150f65ad57054fd0…

1 0

Henri Verbeet : winex11: Remove a redundant forward declaration.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: 7b0a3128fbb689b12c1f67101df471607dc11a72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b0a3128fbb689b12c1f67101… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 9 19:16:18 2011 +0100 winex11: Remove a redundant forward declaration. --- dlls/winex11.drv/mouse.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index a527a2e..6378641 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -97,8 +97,6 @@ static DWORD last_time_modified; static XContext cursor_context; static Cursor create_cursor( HANDLE handle ); -BOOL CDECL X11DRV_SetCursorPos( INT x, INT y ); - /*********************************************************************** * X11DRV_Xcursor_Init

1 0

Vincent Povirk : comctl32: Validate text entered in a datetime by the user.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: 08a4c8611b277d1153b9f4bbad600de6af234d29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08a4c8611b277d1153b9f4bba… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 9 15:30:54 2011 -0600 comctl32: Validate text entered in a datetime by the user. --- dlls/comctl32/datetime.c | 190 ++++++++++++++++++++++++++-------------------- 1 files changed, 107 insertions(+), 83 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index ed625e9..8269758 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -73,6 +73,8 @@ typedef struct BOOL bCalDepressed; /* TRUE = cal button is depressed */ int bDropdownEnabled; int select; + WCHAR charsEntered[4]; + int nCharsEntered; HFONT hFont; int nrFieldsAllocated; int nrFields; @@ -697,6 +699,13 @@ DATETIME_Refresh (DATETIME_INFO *infoPtr, HDC hdc) /* fill if focused */ HBRUSH hbr = CreateSolidBrush (comctl32_color.clrActiveCaption); + if (infoPtr->nCharsEntered) + { + memcpy(txt, infoPtr->charsEntered, infoPtr->nCharsEntered * sizeof(WCHAR)); + txt[infoPtr->nCharsEntered] = 0; + GetTextExtentPoint32W (hdc, txt, strlenW(txt), &size); + } + selection.left = 0; selection.top = 0; selection.right = size.cx; @@ -756,6 +765,68 @@ static int DATETIME_GetPrevDateField(const DATETIME_INFO *infoPtr, int i) return -1; } +static void +DATETIME_ApplySelectedField (DATETIME_INFO *infoPtr) +{ + int fieldNum = infoPtr->select & DTHT_DATEFIELD; + int i, val=0; + SYSTEMTIME date = infoPtr->date; + + if (infoPtr->select == -1 || infoPtr->nCharsEntered == 0) + return; + + for (i=0; i<infoPtr->nCharsEntered; i++) + val = val * 10 + infoPtr->charsEntered[i] - '0'; + + infoPtr->nCharsEntered = 0; + + switch (infoPtr->fieldspec[fieldNum]) { + case ONEDIGITYEAR: + case TWODIGITYEAR: + date.wYear = date.wYear - (date.wYear%100) + val; + break; + case INVALIDFULLYEAR: + case FULLYEAR: + date.wYear = val; + break; + case ONEDIGITMONTH: + case TWODIGITMONTH: + date.wMonth = val; + break; + case ONEDIGITDAY: + case TWODIGITDAY: + date.wDay = val; + break; + case ONEDIGIT12HOUR: + case TWODIGIT12HOUR: + case ONEDIGIT24HOUR: + case TWODIGIT24HOUR: + /* FIXME: Preserve AM/PM for 12HOUR? */ + date.wHour = val; + break; + case ONEDIGITMINUTE: + case TWODIGITMINUTE: + date.wMinute = val; + break; + case ONEDIGITSECOND: + case TWODIGITSECOND: + date.wSecond = val; + break; + } + + if (DATETIME_SetSystemTime(infoPtr, GDT_VALID, &date)) + DATETIME_SendDateTimeChangeNotify (infoPtr); +} + +static void +DATETIME_SetSelectedField (DATETIME_INFO *infoPtr, int select) +{ + DATETIME_ApplySelectedField(infoPtr); + + infoPtr->select = select; + infoPtr->nCharsEntered = 0; +} + static LRESULT DATETIME_LButtonDown (DATETIME_INFO *infoPtr, INT x, INT y) { @@ -784,7 +855,8 @@ DATETIME_LButtonDown (DATETIME_INFO *infoPtr, INT x, INT y) if (infoPtr->fieldspec[new] == FULLDAY) return 0; } } - infoPtr->select = new; + + DATETIME_SetSelectedField(infoPtr, new); if (infoPtr->select == DTHT_MCPOPUP) { RECT rcMonthCal; @@ -962,6 +1034,7 @@ DATETIME_KeyDown (DATETIME_INFO *infoPtr, DWORD vkCode) { int fieldNum = infoPtr->select & DTHT_DATEFIELD; int wrap = 0; + int new; if (!(infoPtr->haveFocus)) return 0; if ((fieldNum==0) && (infoPtr->select)) return 0; @@ -973,40 +1046,50 @@ DATETIME_KeyDown (DATETIME_INFO *infoPtr, DWORD vkCode) switch (vkCode) { case VK_ADD: case VK_UP: + infoPtr->nCharsEntered = 0; DATETIME_IncreaseField (infoPtr, fieldNum, 1); DATETIME_SendDateTimeChangeNotify (infoPtr); break; case VK_SUBTRACT: case VK_DOWN: + infoPtr->nCharsEntered = 0; DATETIME_IncreaseField (infoPtr, fieldNum, -1); DATETIME_SendDateTimeChangeNotify (infoPtr); break; case VK_HOME: + infoPtr->nCharsEntered = 0; DATETIME_IncreaseField (infoPtr, fieldNum, INT_MIN); DATETIME_SendDateTimeChangeNotify (infoPtr); break; case VK_END: + infoPtr->nCharsEntered = 0; DATETIME_IncreaseField (infoPtr, fieldNum, INT_MAX); DATETIME_SendDateTimeChangeNotify (infoPtr); break; case VK_LEFT: + new = infoPtr->select; do { - if (infoPtr->select == 0) { - infoPtr->select = infoPtr->nrFields - 1; + if (new == 0) { + new = new - 1; wrap++; } else { - infoPtr->select--; + new--; } - } while ((infoPtr->fieldspec[infoPtr->select] & DT_STRING) && (wrap<2)); + } while ((infoPtr->fieldspec[new] & DT_STRING) && (wrap<2)); + if (new != infoPtr->select) + DATETIME_SetSelectedField(infoPtr, new); break; case VK_RIGHT: + new = infoPtr->select; do { - infoPtr->select++; - if (infoPtr->select==infoPtr->nrFields) { - infoPtr->select = 0; + new++; + if (new==infoPtr->nrFields) { + new = 0; wrap++; } - } while ((infoPtr->fieldspec[infoPtr->select] & DT_STRING) && (wrap<2)); + } while ((infoPtr->fieldspec[new] & DT_STRING) && (wrap<2)); + if (new != infoPtr->select) + DATETIME_SetSelectedField(infoPtr, new); break; } @@ -1022,80 +1105,20 @@ DATETIME_Char (DATETIME_INFO *infoPtr, WPARAM vkCode) int fieldNum = infoPtr->select & DTHT_DATEFIELD; if (vkCode >= '0' && vkCode <= '9') { - int num = vkCode-'0'; - int newDays; - - /* this is a somewhat simplified version of what Windows does */ - SYSTEMTIME *date = &infoPtr->date; - switch (infoPtr->fieldspec[fieldNum]) { - case ONEDIGITYEAR: - case TWODIGITYEAR: - date->wYear = date->wYear - (date->wYear%100) + - (date->wYear%10)*10 + num; - MONTHCAL_CalculateDayOfWeek(date, TRUE); - DATETIME_SendDateTimeChangeNotify (infoPtr); - break; - case INVALIDFULLYEAR: - case FULLYEAR: - /* reset current year initialy */ - date->wYear = ((date->wYear/1000) ? 0 : 1)*(date->wYear%1000)*10 + num; - MONTHCAL_CalculateDayOfWeek(date, TRUE); - DATETIME_SendDateTimeChangeNotify (infoPtr); - break; - case ONEDIGITMONTH: - case TWODIGITMONTH: - if ((date->wMonth%10) > 1 || num > 2) - date->wMonth = num; - else - date->wMonth = (date->wMonth%10)*10+num; - MONTHCAL_CalculateDayOfWeek(date, TRUE); - DATETIME_SendDateTimeChangeNotify (infoPtr); - break; - case ONEDIGITDAY: - case TWODIGITDAY: - newDays = (date->wDay%10)*10+num; - if (newDays > MONTHCAL_MonthLength(date->wMonth, date->wYear)) - date->wDay = num; - else - date->wDay = newDays; - MONTHCAL_CalculateDayOfWeek(date, TRUE); - DATETIME_SendDateTimeChangeNotify (infoPtr); - break; - case ONEDIGIT12HOUR: - case TWODIGIT12HOUR: - if ((date->wHour%10) > 1 || num > 2) - date->wHour = num; - else - date->wHour = (date->wHour%10)*10+num; - DATETIME_SendDateTimeChangeNotify (infoPtr); - break; - case ONEDIGIT24HOUR: - case TWODIGIT24HOUR: - if ((date->wHour%10) > 2) - date->wHour = num; - else if ((date->wHour%10) == 2 && num > 3) - date->wHour = num; - else - date->wHour = (date->wHour%10)*10+num; - DATETIME_SendDateTimeChangeNotify (infoPtr); - break; - case ONEDIGITMINUTE: - case TWODIGITMINUTE: - if ((date->wMinute%10) > 5) - date->wMinute = num; - else - date->wMinute = (date->wMinute%10)*10+num; - DATETIME_SendDateTimeChangeNotify (infoPtr); - break; - case ONEDIGITSECOND: - case TWODIGITSECOND: - if ((date->wSecond%10) > 5) - date->wSecond = num; - else - date->wSecond = (date->wSecond%10)*10+num; - DATETIME_SendDateTimeChangeNotify (infoPtr); - break; - } + int maxChars; + int fieldSpec; + + infoPtr->charsEntered[infoPtr->nCharsEntered++] = vkCode; + + fieldSpec = infoPtr->fieldspec[fieldNum]; + + if (fieldSpec == INVALIDFULLYEAR || fieldSpec == FULLYEAR) + maxChars = 4; + else + maxChars = 2; + + if (maxChars == infoPtr->nCharsEntered) + DATETIME_ApplySelectedField(infoPtr); } return 0; } @@ -1133,6 +1156,7 @@ DATETIME_KillFocus (DATETIME_INFO *infoPtr, HWND lostFocus) if (infoPtr->haveFocus) { DATETIME_SendSimpleNotify (infoPtr, NM_KILLFOCUS); infoPtr->haveFocus = 0; + DATETIME_SetSelectedField (infoPtr, -1); } InvalidateRect (infoPtr->hwndSelf, NULL, TRUE);

1 0

Joris Huizer : dbghelp: dwarf2_get_cpp_name: fix off-by-one error.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: a2793d62ade0ecc0026cf285f4b71506ab6bdcbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2793d62ade0ecc0026cf285f… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Wed Mar 9 22:57:19 2011 +0100 dbghelp: dwarf2_get_cpp_name: fix off-by-one error. --- dlls/dbghelp/dwarf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 8714c90..e78026f 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -962,7 +962,7 @@ static const char* dwarf2_get_cpp_name(dwarf2_parse_context_t* ctx, dwarf2_debug if (di->abbrev->tag == DW_TAG_compile_unit) return name; if (!ctx->cpp_name) ctx->cpp_name = pool_alloc(&ctx->pool, MAX_SYM_NAME); - last = ctx->cpp_name + MAX_SYM_NAME - strlen(name); + last = ctx->cpp_name + MAX_SYM_NAME - strlen(name) - 1; strcpy(last, name); /* if the di is a definition, but has also a (previous) declaration, then scope must

1 0

Alexandre Julliard : gdiplus: Use signed types in convert_pixels to avoid problems on 64-bit.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: b3c333e91633cdcd34e6a1ba2d7755aa883938b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3c333e91633cdcd34e6a1ba2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 10 14:09:56 2011 +0100 gdiplus: Use signed types in convert_pixels to avoid problems on 64-bit. --- dlls/gdiplus/gdiplus_private.h | 2 +- dlls/gdiplus/image.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 68998df..4575875 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -112,7 +112,7 @@ extern const char *debugstr_pointf(CONST PointF* pt); extern void convert_32bppARGB_to_32bppPARGB(UINT width, UINT height, BYTE *dst_bits, INT dst_stride, const BYTE *src_bits, INT src_stride); -extern GpStatus convert_pixels(UINT width, UINT height, +extern GpStatus convert_pixels(INT width, INT height, INT dst_stride, BYTE *dst_bits, PixelFormat dst_format, INT src_stride, const BYTE *src_bits, PixelFormat src_format, ARGB *src_palette); diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 2582ae2..1916524 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -498,11 +498,11 @@ GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap* bitmap, INT x, INT y, return Ok; } -GpStatus convert_pixels(UINT width, UINT height, +GpStatus convert_pixels(INT width, INT height, INT dst_stride, BYTE *dst_bits, PixelFormat dst_format, INT src_stride, const BYTE *src_bits, PixelFormat src_format, ARGB *src_palette) { - UINT x, y; + INT x, y; if (src_format == dst_format || (dst_format == PixelFormat32bppRGB && PIXELFORMATBPP(src_format) == 32))

1 0

Alexandre Julliard : gdi32: Add null driver entry points for the clipping functions.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: ec54c80ee555539fa92e0538de436d0e78388bc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec54c80ee555539fa92e0538d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 9 16:21:45 2011 +0100 gdi32: Add null driver entry points for the clipping functions. --- dlls/gdi32/clipping.c | 237 +++++++++++++++++++++++---------------------- dlls/gdi32/driver.c | 14 ++- dlls/gdi32/gdi_private.h | 9 ++ 3 files changed, 139 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ec54c80ee555539fa92e0…

1 0

Alexandre Julliard : gdi32: Add a mechanism for stacking gdi drivers.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: 6419edfb6db84df31f392315c32489e4299d31b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6419edfb6db84df31f392315c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 9 20:10:25 2011 +0100 gdi32: Add a mechanism for stacking gdi drivers. --- dlls/gdi32/dc.c | 52 ++++++++++++++++++++++++++++++++++--------- dlls/gdi32/enhmfdrv/init.c | 3 +- dlls/gdi32/gdi_private.h | 12 +++++++++- dlls/gdi32/mfdrv/init.c | 3 +- dlls/wineps.drv/psdrv.h | 2 +- dlls/winex11.drv/x11drv.h | 2 +- 6 files changed, 56 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 088f6c7..f25eb8d 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -79,7 +79,8 @@ DC *alloc_dc_ptr( const DC_FUNCTIONS *funcs, WORD magic ) dc->funcs = funcs; dc->nulldrv.funcs = &null_driver; - dc->physDev = NULL; + dc->nulldrv.next = NULL; + dc->physDev = &dc->nulldrv; dc->thread = GetCurrentThreadId(); dc->refcount = 1; dc->dirty = 0; @@ -229,6 +230,34 @@ void update_dc( DC *dc ) /*********************************************************************** + * push_dc_driver + * + * Push a driver on top of the DC driver stack. + */ +void push_dc_driver( DC * dc, PHYSDEV physdev ) +{ + physdev->next = dc->physDev; + physdev->hdc = dc->hSelf; + dc->physDev = physdev; + dc->funcs = physdev->funcs; +} + + +/*********************************************************************** + * pop_dc_driver + * + * Pop the top driver from the DC driver stack. + */ +void pop_dc_driver( DC * dc, PHYSDEV physdev ) +{ + assert( physdev == dc->physDev ); + assert( physdev != &dc->nulldrv ); + dc->physDev = physdev->next; + dc->funcs = dc->physDev->funcs; +} + + +/*********************************************************************** * DC_DeleteObject */ static BOOL DC_DeleteObject( HGDIOBJ handle ) @@ -633,6 +662,7 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, { HDC hdc; DC * dc; + PHYSDEV physdev; const DC_FUNCTIONS *funcs; WCHAR buf[300]; @@ -663,14 +693,15 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, debugstr_w(driver), debugstr_w(device), debugstr_w(output), dc->hSelf ); if (dc->funcs->pCreateDC && - !dc->funcs->pCreateDC( hdc, &dc->physDev, buf, device, output, initData )) + !dc->funcs->pCreateDC( hdc, &physdev, buf, device, output, initData )) { WARN("creation aborted by device\n" ); goto error; } - dc->physDev->funcs = funcs; - dc->physDev->hdc = hdc; + physdev->funcs = funcs; + push_dc_driver( dc, physdev ); + dc->vis_rect.left = 0; dc->vis_rect.top = 0; dc->vis_rect.right = GetDeviceCaps( hdc, DESKTOPHORZRES ); @@ -782,21 +813,20 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) dc->vis_rect.bottom = 1; if (!(dc->hVisRgn = CreateRectRgn( 0, 0, 1, 1 ))) goto error; /* default bitmap is 1x1 */ - /* Copy the driver-specific physical device info into - * the new DC. The driver may use this read-only info - * while creating the compatible DC below. */ - dc->physDev = physDev; ret = dc->hSelf; + /* Pass the driver-specific physical device info into + * the new DC. The driver may use this read-only info + * while creating the compatible DC. */ if (dc->funcs->pCreateDC && - !dc->funcs->pCreateDC( dc->hSelf, &dc->physDev, NULL, NULL, NULL, NULL )) + !dc->funcs->pCreateDC( dc->hSelf, &physDev, NULL, NULL, NULL, NULL )) { WARN("creation aborted by device\n"); goto error; } - dc->physDev->funcs = funcs; - dc->physDev->hdc = hdc; + physDev->funcs = funcs; + push_dc_driver( dc, physDev ); DC_InitDC( dc ); release_dc_ptr( dc ); return ret; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index efa91ee..241bd7e 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -319,9 +319,8 @@ HDC WINAPI CreateEnhMetaFileW( free_dc_ptr( dc ); return 0; } - dc->physDev = (PHYSDEV)physDev; physDev->dev.funcs = &EMFDRV_Funcs; - physDev->dev.hdc = dc->hSelf; + push_dc_driver( dc, &physDev->dev ); physDev->hdc = dc->hSelf; if(description) { /* App name\0Title\0\0 */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index efa61a0..7b72c45 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -75,6 +75,7 @@ typedef struct tagGDIOBJHDR typedef struct gdi_physdev { const struct tagDC_FUNCS *funcs; + struct gdi_physdev *next; HDC hdc; } *PHYSDEV; @@ -377,6 +378,8 @@ extern BOOL free_dc_ptr( DC *dc ) DECLSPEC_HIDDEN; extern DC *get_dc_ptr( HDC hdc ) DECLSPEC_HIDDEN; extern void release_dc_ptr( DC *dc ) DECLSPEC_HIDDEN; extern void update_dc( DC *dc ) DECLSPEC_HIDDEN; +extern void push_dc_driver( DC * dc, PHYSDEV physdev ) DECLSPEC_HIDDEN; +extern void pop_dc_driver( DC * dc, PHYSDEV physdev ) DECLSPEC_HIDDEN; extern void DC_InitDC( DC * dc ) DECLSPEC_HIDDEN; extern void DC_UpdateXforms( DC * dc ) DECLSPEC_HIDDEN; extern INT save_dc_state( HDC hdc ) DECLSPEC_HIDDEN; @@ -395,7 +398,14 @@ extern const DC_FUNCTIONS *DRIVER_get_display_driver(void) DECLSPEC_HIDDEN; extern const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name ) DECLSPEC_HIDDEN; extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DECLSPEC_HIDDEN; -#define GET_DC_PHYSDEV(dc,func) ((dc)->physDev->funcs->func ? (dc)->physDev : &(dc)->nulldrv) +static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset ) +{ + while (!((void **)dev->funcs)[offset / sizeof(void *)]) dev = dev->next; + return dev; +} + +#define GET_DC_PHYSDEV(dc,func) get_physdev_entry_point( (dc)->physDev, FIELD_OFFSET(DC_FUNCTIONS,func)) +#define GET_NEXT_PHYSDEV(dev,func) get_physdev_entry_point( (dev)->next, FIELD_OFFSET(DC_FUNCTIONS,func)) /* enhmetafile.c */ extern HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 4659e73..3bb815b 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -171,9 +171,8 @@ static DC *MFDRV_AllocMetaFile(void) free_dc_ptr( dc ); return NULL; } - dc->physDev = (PHYSDEV)physDev; physDev->dev.funcs = &MFDRV_Funcs; - physDev->dev.hdc = dc->hSelf; + push_dc_driver( dc, &physDev->dev ); physDev->hdc = dc->hSelf; if (!(physDev->mh = HeapAlloc( GetProcessHeap(), 0, sizeof(*physDev->mh) ))) diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 62f9ccc..c6c7571 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -353,7 +353,7 @@ typedef struct { typedef struct { - void *reserved[2]; /* reserved for gdi */ + void *reserved[3]; /* reserved for gdi */ HDC hdc; PSFONT font; /* Current PS font */ DOWNLOAD *downloaded_fonts; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index da59d7e..6048096 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -144,7 +144,7 @@ struct xrender_info; /* X physical device */ typedef struct { - void *reserved[2]; /* reserved for gdi */ + void *reserved[3]; /* reserved for gdi */ HDC hdc; GC gc; /* X Window GC */ Drawable drawable;

1 0