wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

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

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

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 : 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: 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

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

André Hentschel : kernel32: Add stub for GetVolumePathNamesForVolumeNameA.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: 78160d4fe1e501f322d491c9e6bffdd53c0c6388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78160d4fe1e501f322d491c9e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 9 15:11:41 2011 +0100 kernel32: Add stub for GetVolumePathNamesForVolumeNameA. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/volume.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index d2f3a26..d7edf1f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -676,7 +676,7 @@ @ stdcall GetVolumeNameForVolumeMountPointW(wstr ptr long) @ stdcall GetVolumePathNameA(str ptr long) @ stdcall GetVolumePathNameW(wstr ptr long) -# @ stub GetVolumePathNamesForVolumeNameA +@ stdcall GetVolumePathNamesForVolumeNameA(str ptr long ptr) @ stdcall GetVolumePathNamesForVolumeNameW(wstr ptr long ptr) @ stdcall GetWindowsDirectoryA(ptr long) @ stdcall GetWindowsDirectoryW(ptr long) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 912f215..1684967 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1621,6 +1621,16 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu } /*********************************************************************** + * GetVolumePathNamesForVolumeNameA (KERNEL32.@) + */ +BOOL WINAPI GetVolumePathNamesForVolumeNameA(LPCSTR volumename, LPSTR volumepathname, DWORD buflen, PDWORD returnlen) +{ + FIXME("(%s, %p, %d, %p), stub!\n", debugstr_a(volumename), volumepathname, buflen, returnlen); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * GetVolumePathNamesForVolumeNameW (KERNEL32.@) */ BOOL WINAPI GetVolumePathNamesForVolumeNameW(LPCWSTR volumename, LPWSTR volumepathname, DWORD buflen, PDWORD returnlen)

1 0

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

10 Mar '11

Module: wine Branch: master Commit: adc63287b58592436dd599561d85d763cb3692df URL: http://source.winehq.org/git/wine.git/?a=commit;h=adc63287b58592436dd599561… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 9 21:19:09 2011 +0100 gdi32: Add null driver entry points for the object selection functions. --- dlls/gdi32/bitmap.c | 4 +++- dlls/gdi32/brush.c | 4 +++- dlls/gdi32/dc.c | 6 ++++-- dlls/gdi32/driver.c | 42 ++++++++++++++++++++++++++++++++++++------ dlls/gdi32/font.c | 4 +++- dlls/gdi32/gdiobj.c | 10 ++++------ dlls/gdi32/palette.c | 20 +++++++++++--------- dlls/gdi32/pen.c | 4 +++- 8 files changed, 67 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index a5c53a9..33e5542 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -600,6 +600,7 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) HGDIOBJ ret; BITMAPOBJ *bitmap; DC *dc; + PHYSDEV physdev; if (!(dc = get_dc_ptr( hdc ))) return 0; @@ -632,7 +633,8 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) goto done; } - if (dc->funcs->pSelectBitmap && !dc->funcs->pSelectBitmap( dc->physDev, handle )) + physdev = GET_DC_PHYSDEV( dc, pSelectBitmap ); + if (!physdev->funcs->pSelectBitmap( physdev, handle )) { GDI_ReleaseObj( handle ); ret = 0; diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 0202033..02fb3a3 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -387,13 +387,15 @@ static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) if ((brush = GDI_GetObjPtr( handle, OBJ_BRUSH ))) { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSelectBrush ); + if (brush->logbrush.lbStyle == BS_PATTERN) BITMAP_SetOwnerDC( (HBITMAP)brush->logbrush.lbHatch, dc ); GDI_inc_ref_count( handle ); GDI_ReleaseObj( handle ); - if (dc->funcs->pSelectBrush && !dc->funcs->pSelectBrush( dc->physDev, handle )) + if (!physdev->funcs->pSelectBrush( physdev, handle )) { GDI_dec_ref_count( handle ); } diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index f25eb8d..66cdc84 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -2057,7 +2057,8 @@ COLORREF WINAPI SetDCBrushColor(HDC hdc, COLORREF crColor) { /* If DC_BRUSH is selected, update driver pen color */ HBRUSH hBrush = CreateSolidBrush( crColor ); - dc->funcs->pSelectBrush( dc->physDev, hBrush ); + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSelectBrush ); + physdev->funcs->pSelectBrush( physdev, hBrush ); DeleteObject( hBrush ); } @@ -2122,7 +2123,8 @@ COLORREF WINAPI SetDCPenColor(HDC hdc, COLORREF crColor) /* If DC_PEN is selected, update the driver pen color */ LOGPEN logpen = { PS_SOLID, { 0, 0 }, crColor }; HPEN hPen = CreatePenIndirect( &logpen ); - dc->funcs->pSelectPen( dc->physDev, hPen ); + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSelectPen ); + physdev->funcs->pSelectPen( physdev, hPen ); DeleteObject( hPen ); } diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index d20bf93..1863499 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -329,6 +329,11 @@ static BOOL CDECL nulldrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT return TRUE; } +static BOOL CDECL nulldrv_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) +{ + return TRUE; +} + static BOOL CDECL nulldrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { return TRUE; @@ -408,6 +413,31 @@ static BOOL CDECL nulldrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, return TRUE; } +static HBITMAP CDECL nulldrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) +{ + return bitmap; +} + +static HBRUSH CDECL nulldrv_SelectBrush( PHYSDEV dev, HBRUSH brush ) +{ + return brush; +} + +static HFONT CDECL nulldrv_SelectFont( PHYSDEV dev, HFONT font, HANDLE gdi_font ) +{ + return 0; +} + +static HPALETTE CDECL nulldrv_SelectPalette( PHYSDEV dev, HPALETTE palette, BOOL bkgnd ) +{ + return palette; +} + +static HPEN CDECL nulldrv_SelectPen( PHYSDEV dev, HPEN pen ) +{ + return pen; +} + static void CDECL nulldrv_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) { } @@ -506,7 +536,7 @@ const DC_FUNCTIONS null_driver = NULL, /* pCreateDIBSection */ NULL, /* pDeleteBitmap */ NULL, /* pDeleteDC */ - NULL, /* pDeleteObject */ + nulldrv_DeleteObject, /* pDeleteObject */ NULL, /* pDescribePixelFormat */ NULL, /* pDeviceCapabilities */ nulldrv_Ellipse, /* pEllipse */ @@ -566,12 +596,12 @@ const DC_FUNCTIONS null_driver = NULL, /* pSaveDC */ nulldrv_ScaleViewportExtEx, /* pScaleViewportExt */ nulldrv_ScaleWindowExtEx, /* pScaleWindowExt */ - NULL, /* pSelectBitmap */ - NULL, /* pSelectBrush */ + nulldrv_SelectBitmap, /* pSelectBitmap */ + nulldrv_SelectBrush, /* pSelectBrush */ NULL, /* pSelectClipPath */ - NULL, /* pSelectFont */ - NULL, /* pSelectPalette */ - NULL, /* pSelectPen */ + nulldrv_SelectFont, /* pSelectFont */ + nulldrv_SelectPalette, /* pSelectPalette */ + nulldrv_SelectPen, /* pSelectPen */ NULL, /* pSetArcDirection */ NULL, /* pSetBitmapBits */ NULL, /* pSetBkColor */ diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index c92b6e3..43abf42 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -529,6 +529,7 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) { HGDIOBJ ret = 0; DC *dc = get_dc_ptr( hdc ); + PHYSDEV physdev; if (!dc) return 0; @@ -541,7 +542,8 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) if (GetDeviceCaps( dc->hSelf, TEXTCAPS ) & TC_VA_ABLE) dc->gdiFont = WineEngCreateFontInstance( dc, handle ); - if (dc->funcs->pSelectFont) ret = dc->funcs->pSelectFont( dc->physDev, handle, dc->gdiFont ); + physdev = GET_DC_PHYSDEV( dc, pSelectFont ); + ret = physdev->funcs->pSelectFont( physdev, handle, dc->gdiFont ); if (ret && dc->gdiFont) dc->gdiFont = 0; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 196ebc9..35b8068 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -845,12 +845,10 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) if(dc) { - if(dc->funcs->pDeleteObject) - { - GDI_ReleaseObj( obj ); /* release the GDI lock */ - dc->funcs->pDeleteObject( dc->physDev, obj ); - header = GDI_GetObjPtr( obj, 0 ); /* and grab it again */ - } + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pDeleteObject ); + GDI_ReleaseObj( obj ); /* release the GDI lock */ + physdev->funcs->pDeleteObject( physdev, obj ); + header = GDI_GetObjPtr( obj, 0 ); /* and grab it again */ release_dc_ptr( dc ); } HeapFree(GetProcessHeap(), 0, hdcs_head); diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index e941b10..e94ed7b 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -689,7 +689,7 @@ static BOOL PALETTE_DeleteObject( HGDIOBJ handle ) */ HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg) { - HPALETTE ret; + HPALETTE ret = 0; DC *dc; TRACE("%p %p\n", hdc, hpal ); @@ -699,16 +699,18 @@ HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg) WARN("invalid selected palette %p\n",hpal); return 0; } - if (!(dc = get_dc_ptr( hdc ))) return 0; - ret = dc->hPalette; - if (dc->funcs->pSelectPalette) hpal = dc->funcs->pSelectPalette( dc->physDev, hpal, FALSE ); - if (hpal) + if ((dc = get_dc_ptr( hdc ))) { - dc->hPalette = hpal; - if (!wBkg) hPrimaryPalette = hpal; + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSelectPalette ); + ret = dc->hPalette; + if (physdev->funcs->pSelectPalette( physdev, hpal, FALSE )) + { + dc->hPalette = hpal; + if (!wBkg) hPrimaryPalette = hpal; + } + else ret = 0; + release_dc_ptr( dc ); } - else ret = 0; - release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index a130b1f..61dd0e9 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -219,6 +219,7 @@ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, */ static HGDIOBJ PEN_SelectObject( HGDIOBJ handle, HDC hdc ) { + PHYSDEV physdev; HGDIOBJ ret = 0; DC *dc = get_dc_ptr( hdc ); @@ -234,7 +235,8 @@ static HGDIOBJ PEN_SelectObject( HGDIOBJ handle, HDC hdc ) return 0; } - if (dc->funcs->pSelectPen && !dc->funcs->pSelectPen( dc->physDev, handle )) + physdev = GET_DC_PHYSDEV( dc, pSelectPen ); + if (!physdev->funcs->pSelectPen( physdev, handle )) { GDI_dec_ref_count( handle ); }

1 0

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

10 Mar '11

Module: wine Branch: master Commit: 6d9ebd05a550c634d61ba698592cd43ee2f7e953 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d9ebd05a550c634d61ba6985… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 9 20:51:06 2011 +0100 gdi32: Add null driver entry points for the OpenGL functions. --- dlls/gdi32/driver.c | 85 ++++++++++++++++++++++++---- dlls/gdi32/opengl.c | 156 +++++++++++++++++++++++++------------------------- 2 files changed, 151 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d9ebd05a550c634d61ba…

1 0

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

10 Mar '11

Module: wine Branch: master Commit: 3a850fc842337640b4b69634a4c6291d516d1192 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a850fc842337640b4b69634a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 9 16:21:45 2011 +0100 gdi32: Add null driver entry points for the mapping functions. --- dlls/gdi32/driver.c | 34 ++-- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 20 +- dlls/gdi32/enhmfdrv/init.c | 16 +- dlls/gdi32/enhmfdrv/mapping.c | 68 +++-- dlls/gdi32/gdi_private.h | 25 ++- dlls/gdi32/mapping.c | 497 +++++++++++++++++----------------- dlls/gdi32/mfdrv/init.c | 16 +- dlls/gdi32/mfdrv/mapping.c | 68 ++--- dlls/gdi32/mfdrv/metafiledrv.h | 20 +- dlls/gdi32/tests/metafile.c | 16 +- 10 files changed, 397 insertions(+), 383 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3a850fc842337640b4b69…

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
85
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2011