April 2016 - Wine-commits - list.winehq.org

Michael Stefaniuc : quartz: Use wine_dbgstr_rect() to trace RECTs.
by Alexandre Julliard 19 Apr '16

19 Apr '16

Module: wine Branch: master Commit: 6b16727803a575790751c4e6c77df490b53ebbb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b16727803a575790751c4e6c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 19 10:45:06 2016 +0200 quartz: Use wine_dbgstr_rect() to trace RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 6 +++--- dlls/quartz/vmr9.c | 11 +++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 3026c07..5cddaa7 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -184,7 +184,7 @@ static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This) AdjustWindowRectEx(&This->WindowPos, style, FALSE, style_ex); - TRACE("WindowPos: %d %d %d %d\n", This->WindowPos.left, This->WindowPos.top, This->WindowPos.right, This->WindowPos.bottom); + TRACE("WindowPos: %s\n", wine_dbgstr_rect(&This->WindowPos)); SetWindowPos(This->baseControlWindow.baseWindow.hWnd, NULL, This->WindowPos.left, This->WindowPos.top, @@ -242,8 +242,8 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, return E_FAIL; } - TRACE("Src Rect: %d %d %d %d\n", This->SourceRect.left, This->SourceRect.top, This->SourceRect.right, This->SourceRect.bottom); - TRACE("Dst Rect: %d %d %d %d\n", This->DestRect.left, This->DestRect.top, This->DestRect.right, This->DestRect.bottom); + TRACE("Src Rect: %s\n", wine_dbgstr_rect(&This->SourceRect)); + TRACE("Dst Rect: %s\n", wine_dbgstr_rect(&This->DestRect)); StretchDIBits(This->baseControlWindow.baseWindow.hDC, This->DestRect.left, This->DestRect.top, This->DestRect.right -This->DestRect.left, This->DestRect.bottom - This->DestRect.top, This->SourceRect.left, This->SourceRect.top, diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 701d06d..f2c3d93 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -245,8 +245,8 @@ static DWORD VMR9_SendSampleData(struct quartz_vmr *This, VMR9PresentationInfo * width = bmiHeader->biWidth; height = bmiHeader->biHeight; - TRACE("Src Rect: %d %d %d %d\n", This->source_rect.left, This->source_rect.top, This->source_rect.right, This->source_rect.bottom); - TRACE("Dst Rect: %d %d %d %d\n", This->target_rect.left, This->target_rect.top, This->target_rect.right, This->target_rect.bottom); + TRACE("Src Rect: %s\n", wine_dbgstr_rect(&This->source_rect)); + TRACE("Dst Rect: %s\n", wine_dbgstr_rect(&This->target_rect)); hr = IDirect3DSurface9_LockRect(info->lpSurf, &lock, NULL, D3DLOCK_DISCARD); if (FAILED(hr)) @@ -1769,8 +1769,7 @@ static HRESULT WINAPI VMR7WindowlessControl_SetVideoPosition(IVMRWindowlessContr This->target_rect = *dest; if (This->baseControlWindow.baseWindow.hWnd) { - FIXME("Output rectangle: starting at %dx%d, up to point %dx%d\n", - dest->left, dest->top, dest->right, dest->bottom); + FIXME("Output rectangle: %s\n", wine_dbgstr_rect(dest)); SetWindowPos(This->baseControlWindow.baseWindow.hWnd, NULL, dest->left, dest->top, dest->right - dest->left, dest->bottom-dest->top, SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOOWNERZORDER|SWP_NOREDRAW); @@ -1974,7 +1973,7 @@ static HRESULT WINAPI VMR9WindowlessControl_SetVideoPosition(IVMRWindowlessContr This->target_rect = *dest; if (This->baseControlWindow.baseWindow.hWnd) { - FIXME("Output rectangle: starting at %dx%d, up to point %dx%d\n", dest->left, dest->top, dest->right, dest->bottom); + FIXME("Output rectangle: %s\n", wine_dbgstr_rect(dest)); SetWindowPos(This->baseControlWindow.baseWindow.hWnd, NULL, dest->left, dest->top, dest->right - dest->left, dest->bottom-dest->top, SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOOWNERZORDER|SWP_NOREDRAW); } @@ -2613,7 +2612,7 @@ static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *ifac TRACE("(%p/%p/%p)->(...) stub\n", iface, This, This->pVMR9); GetWindowRect(This->pVMR9->baseControlWindow.baseWindow.hWnd, &output); - TRACE("Output rectangle: starting at %dx%d, up to point %dx%d\n", output.left, output.top, output.right, output.bottom); + TRACE("Output rectangle: %s\n", wine_dbgstr_rect(&output)); /* This might happen if we don't have active focus (eg on a different virtual desktop) */ if (!This->d3d9_dev)

1 0

Michael Stefaniuc : user32: Use wine_dbgstr_rect() to trace a RECT.
by Alexandre Julliard 19 Apr '16

19 Apr '16

Module: wine Branch: master Commit: 08821df92cbfba36abe3b4bb40a88357e695e38f URL: http://source.winehq.org/git/wine.git/?a=commit;h=08821df92cbfba36abe3b4bb4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 19 10:50:29 2016 +0200 user32: Use wine_dbgstr_rect() to trace a RECT. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/mdi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 5d1117f..3366185 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -501,8 +501,7 @@ static void MDI_ChildGetMinMaxInfo( HWND client, HWND hwnd, MINMAXINFO* lpMinMax lpMinMax->ptMaxPosition.x = rect.left; lpMinMax->ptMaxPosition.y = rect.top; - TRACE("max rect (%d,%d - %d, %d)\n", - rect.left,rect.top,rect.right,rect.bottom); + TRACE("max rect %s\n", wine_dbgstr_rect(&rect)); } /**********************************************************************

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 19 Apr '16

19 Apr '16

Module: wine Branch: master Commit: ffa13a856bd83402382474ce5c66e201fc137e26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffa13a856bd83402382474ce5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Apr 19 11:46:50 2016 +0200 po: Update French translation. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fr.po | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index 0ca531e..adbc019 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-04-02 12:50+0100\n" +"PO-Revision-Date: 2016-04-19 11:46+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: French\n" "Language: fr\n" @@ -11767,8 +11767,6 @@ msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Voulez-vous réellement supprimer la clé de registre « %1 » ?" #: reg.rc:52 -#, fuzzy -#| msgid "reg: The option [/d] must be followed by a valid integer\n" msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "reg : l'option [/d] doit être suivie d'un entier valide\n" @@ -11777,12 +11775,16 @@ msgid "" "reg: Unable to delete all registry values in '%1'. An unexpected error " "occurred.\n" msgstr "" +"reg : Impossible d'effacer toutes les valeurs de registre dans « %1 ».Une " +"erreur inattendue est survenue.\n" #: reg.rc:54 msgid "" "reg: Unable to complete the specified operation. An unexpected error " "occurred.\n" msgstr "" +"reg : Impossible d'effectuer l'opération spécifiée. Une erreur inattendue " +"est survenue.\n" #: regedit.rc:34 msgid "&Registry"

1 0

Nikolay Sivov : comctl32: Use wine_dbgstr_rect() to trace RECTs.
by Alexandre Julliard 19 Apr '16

19 Apr '16

Module: wine Branch: master Commit: 935db97c24dc21dde77c8109b986065fc675b45f URL: http://source.winehq.org/git/wine.git/?a=commit;h=935db97c24dc21dde77c8109b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 19 13:07:16 2016 +0300 comctl32: Use wine_dbgstr_rect() to trace RECTs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/pager.c | 9 ++------- dlls/comctl32/rebar.c | 12 ++---------- dlls/comctl32/tab.c | 20 +++++--------------- 3 files changed, 9 insertions(+), 32 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index bd9eb68..ced32be 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -665,13 +665,8 @@ PAGER_NCCalcSize(PAGER_INFO* infoPtr, WPARAM wParam, LPRECT lpRect) lpRect->bottom -= infoPtr->nButtonSize; } - TRACE("nPos=%d, nHeight=%d, window=%s\n", - infoPtr->nPos, infoPtr->nHeight, - wine_dbgstr_rect(&rcWindow)); - - TRACE("[%p] client rect set to %dx%d at (%d,%d) BtnState[%d,%d]\n", - infoPtr->hwndSelf, lpRect->right-lpRect->left, lpRect->bottom-lpRect->top, - lpRect->left, lpRect->top, + TRACE("nPos=%d, nHeight=%d, window=%s\n", infoPtr->nPos, infoPtr->nHeight, wine_dbgstr_rect(&rcWindow)); + TRACE("[%p] client rect set to %s BtnState[%d,%d]\n", infoPtr->hwndSelf, wine_dbgstr_rect(lpRect), infoPtr->TLbtnState, infoPtr->BRbtnState); return 0; diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 466acae..de8155a 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -806,15 +806,11 @@ REBAR_CalcHorzBand (const REBAR_INFO *infoPtr, UINT rstart, UINT rend) /* flag if notify required and invalidate rectangle */ if (lpBand->fDraw & NTF_INVALIDATE) { - TRACE("invalidating (%d,%d)-(%d,%d)\n", - lpBand->rcBand.left, - lpBand->rcBand.top, - lpBand->rcBand.right + SEP_WIDTH, - lpBand->rcBand.bottom + SEP_WIDTH); lpBand->fDraw &= ~NTF_INVALIDATE; work = lpBand->rcBand; work.right += SEP_WIDTH; work.bottom += SEP_WIDTH; + TRACE("invalidating %s\n", wine_dbgstr_rect(&work)); InvalidateRect(infoPtr->hwndSelf, &work, TRUE); if (lpBand->hwndChild) InvalidateRect(lpBand->hwndChild, NULL, TRUE); } @@ -927,15 +923,11 @@ REBAR_CalcVertBand (const REBAR_INFO *infoPtr, UINT rstart, UINT rend) } if (lpBand->fDraw & NTF_INVALIDATE) { - TRACE("invalidating (%d,%d)-(%d,%d)\n", - rcBand.left, - rcBand.top, - rcBand.right + SEP_WIDTH, - rcBand.bottom + SEP_WIDTH); lpBand->fDraw &= ~NTF_INVALIDATE; work = rcBand; work.bottom += SEP_WIDTH; work.right += SEP_WIDTH; + TRACE("invalidating %s\n", wine_dbgstr_rect(&work)); InvalidateRect(infoPtr->hwndSelf, &work, TRUE); if (lpBand->hwndChild) InvalidateRect(lpBand->hwndChild, NULL, TRUE); } diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index a9c3b7b..ead3f56 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -1243,8 +1243,7 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) tabwidth = max(tabwidth, infoPtr->tabMinWidth); curr->rect.right = curr->rect.left + tabwidth; - TRACE("for <%s>, l,r=%d,%d\n", - debugstr_w(curr->pszText), curr->rect.left, curr->rect.right); + TRACE("for <%s>, rect %s\n", debugstr_w(curr->pszText), wine_dbgstr_rect(&curr->rect)); } /* @@ -1263,8 +1262,7 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) curr->rect.left = 0; curItemRowCount++; - TRACE("wrapping <%s>, l,r=%d,%d\n", debugstr_w(curr->pszText), - curr->rect.left, curr->rect.right); + TRACE("wrapping <%s>, rect %s\n", debugstr_w(curr->pszText), wine_dbgstr_rect(&curr->rect)); } curr->rect.bottom = 0; @@ -1377,9 +1375,7 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) else curItemLeftPos = curr->rect.right; - TRACE("arranging <%s>, l,r=%d,%d, row=%d\n", - debugstr_w(curr->pszText), curr->rect.left, - curr->rect.right, curr->rect.top); + TRACE("arranging <%s>, rect %s\n", debugstr_w(curr->pszText), wine_dbgstr_rect(&curr->rect)); } /* @@ -1429,9 +1425,7 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) item->rect.left += iCount * widthDiff; item->rect.right += (iCount + 1) * widthDiff; - TRACE("adjusting 1 <%s>, l,r=%d,%d\n", - debugstr_w(item->pszText), - item->rect.left, item->rect.right); + TRACE("adjusting 1 <%s>, rect %s\n", debugstr_w(item->pszText), wine_dbgstr_rect(&item->rect)); } TAB_GetItem(infoPtr, iIndex - 1)->rect.right += remainder; @@ -1441,13 +1435,9 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) start->rect.left = clientRect.left; start->rect.right = clientRect.right - 4; - TRACE("adjusting 2 <%s>, l,r=%d,%d\n", - debugstr_w(start->pszText), - start->rect.left, start->rect.right); - + TRACE("adjusting 2 <%s>, rect %s\n", debugstr_w(start->pszText), wine_dbgstr_rect(&start->rect)); } - iIndexStart = iIndexEnd; } }

1 0

Nikolay Sivov : comctl32/monthcal: Remove commented block.
by Alexandre Julliard 19 Apr '16

19 Apr '16

Module: wine Branch: master Commit: af7f8d536b3d12c014f5ff3a3a3538eede383271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af7f8d536b3d12c014f5ff3a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 19 13:07:17 2016 +0300 comctl32/monthcal: Remove commented block. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/monthcal.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 6cdcfca..9d5b42e 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1805,18 +1805,6 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) if (lpht->cbSize == sizeof(MCHITTESTINFO)) memcpy(&htinfo.rc, &lpht->rc, sizeof(MCHITTESTINFO) - MCHITTESTINFO_V1_SIZE); - /* Comment in for debugging... - TRACE("%d %d wd[%d %d %d %d] d[%d %d %d %d] t[%d %d %d %d] wn[%d %d %d %d]\n", x, y, - infoPtr->wdays.left, infoPtr->wdays.right, - infoPtr->wdays.top, infoPtr->wdays.bottom, - infoPtr->days.left, infoPtr->days.right, - infoPtr->days.top, infoPtr->days.bottom, - infoPtr->todayrect.left, infoPtr->todayrect.right, - infoPtr->todayrect.top, infoPtr->todayrect.bottom, - infoPtr->weeknums.left, infoPtr->weeknums.right, - infoPtr->weeknums.top, infoPtr->weeknums.bottom); - */ - /* guess in what calendar we are */ calIdx = MONTHCAL_GetCalendarFromPoint(infoPtr, &lpht->pt); if (calIdx == -1)

1 0

Sebastian Lackner : services: Improve implementation of service_get_pipe_name.
by Alexandre Julliard 19 Apr '16

19 Apr '16

Module: wine Branch: master Commit: 4f3f50288660cd22aa6d2ee5db5e53dd3ff7c327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f3f50288660cd22aa6d2ee5d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 18 17:07:06 2016 +0200 services: Improve implementation of service_get_pipe_name. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 58 ++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 34 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 0f8615f..5be6f5c 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -43,6 +43,7 @@ DWORD service_pipe_timeout = 10000; DWORD service_kill_timeout = 60000; static DWORD default_preshutdown_timeout = 180000; static void *env = NULL; +static HKEY service_current_key = NULL; static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); @@ -608,39 +609,21 @@ static LPWSTR service_get_pipe_name(void) { static const WCHAR format[] = { '\\','\\','.','\\','p','i','p','e','\\', 'n','e','t','\\','N','t','C','o','n','t','r','o','l','P','i','p','e','%','u',0}; - static const WCHAR service_current_key_str[] = { 'S','Y','S','T','E','M','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'S','e','r','v','i','c','e','C','u','r','r','e','n','t',0}; - LPWSTR name; - DWORD len; - HKEY service_current_key; - DWORD service_current = -1; + static WCHAR name[sizeof(format)/sizeof(WCHAR) + 10]; /* strlenW("4294967295") */ + static DWORD service_current = 0; + DWORD len, value = -1; LONG ret; DWORD type; - ret = RegCreateKeyExW(HKEY_LOCAL_MACHINE, service_current_key_str, 0, - NULL, REG_OPTION_VOLATILE, KEY_SET_VALUE | KEY_QUERY_VALUE, NULL, - &service_current_key, NULL); - if (ret != ERROR_SUCCESS) - return NULL; - len = sizeof(service_current); + len = sizeof(value); ret = RegQueryValueExW(service_current_key, NULL, NULL, &type, - (BYTE *)&service_current, &len); - if ((ret == ERROR_SUCCESS && type == REG_DWORD) || ret == ERROR_FILE_NOT_FOUND) - { - service_current++; - RegSetValueExW(service_current_key, NULL, 0, REG_DWORD, - (BYTE *)&service_current, sizeof(service_current)); - } - RegCloseKey(service_current_key); - if ((ret != ERROR_SUCCESS || type != REG_DWORD) && (ret != ERROR_FILE_NOT_FOUND)) - return NULL; - len = sizeof(format)/sizeof(WCHAR) + 10 /* strlenW("4294967295") */; - name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!name) - return NULL; - snprintfW(name, len, format, service_current); + (BYTE *)&value, &len); + if (ret == ERROR_SUCCESS && type == REG_DWORD) + service_current = max(service_current, value + 1); + RegSetValueExW(service_current_key, NULL, 0, REG_DWORD, + (BYTE *)&service_current, sizeof(service_current)); + sprintfW(name, format, service_current); + service_current++; return name; } @@ -855,7 +838,6 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * { struct process_entry *process = service->process; DWORD err; - LPWSTR name; err = scmdatabase_lock_startup(service->db); if (err != ERROR_SUCCESS) @@ -876,10 +858,8 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * if (!process->overlapped_event) process->overlapped_event = CreateEventW(NULL, TRUE, FALSE, NULL); - name = service_get_pipe_name(); - process->control_pipe = CreateNamedPipeW(name, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, - PIPE_TYPE_BYTE|PIPE_WAIT, 1, 256, 256, 10000, NULL ); - HeapFree(GetProcessHeap(), 0, name); + process->control_pipe = CreateNamedPipeW(service_get_pipe_name(), PIPE_ACCESS_DUPLEX | + FILE_FLAG_OVERLAPPED, PIPE_TYPE_BYTE|PIPE_WAIT, 1, 256, 256, 10000, NULL ); if (process->control_pipe == INVALID_HANDLE_VALUE) { WINE_ERR("failed to create pipe for %s, error = %d\n", @@ -964,6 +944,10 @@ static void load_registry_parameters(void) int main(int argc, char *argv[]) { + static const WCHAR service_current_key_str[] = { 'S','Y','S','T','E','M','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'S','e','r','v','i','c','e','C','u','r','r','e','n','t',0}; static const WCHAR svcctl_started_event[] = SVCCTL_STARTED_EVENT; HANDLE htok; DWORD err; @@ -979,6 +963,12 @@ int main(int argc, char *argv[]) if (!env) WINE_ERR("failed to create services environment\n"); + err = RegCreateKeyExW(HKEY_LOCAL_MACHINE, service_current_key_str, 0, + NULL, REG_OPTION_VOLATILE, KEY_SET_VALUE | KEY_QUERY_VALUE, NULL, + &service_current_key, NULL); + if (err != ERROR_SUCCESS) + return err; + load_registry_parameters(); err = scmdatabase_create(&active_database); if (err != ERROR_SUCCESS)

1 0

Sebastian Lackner : services: Hold a reference to process in svcctl_ControlService.
by Alexandre Julliard 19 Apr '16

19 Apr '16

Module: wine Branch: master Commit: 168af6e7501202088cd6105ea798f97e145a06fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=168af6e7501202088cd6105ea… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 18 17:08:37 2016 +0200 services: Hold a reference to process in svcctl_ControlService. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 15 ++++++++++----- programs/services/services.c | 7 +++++++ programs/services/services.h | 1 + 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 59bbe7f..babb2b5 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1086,9 +1086,9 @@ DWORD __cdecl svcctl_ControlService( { DWORD access_required; struct sc_service_handle *service; + struct process_entry *process; DWORD result; BOOL ret; - HANDLE control_mutex; WINE_TRACE("(%p, %d, %p)\n", hService, dwControl, lpServiceStatus); @@ -1169,14 +1169,18 @@ DWORD __cdecl svcctl_ControlService( if (dwControl == SERVICE_CONTROL_STOP) service->service_entry->force_shutdown = TRUE; - control_mutex = service->service_entry->process->control_mutex; + /* Hold a reference to the process while sending the command. */ + process = grab_process(service->service_entry->process); service_unlock(service->service_entry); - ret = WaitForSingleObject(control_mutex, 30000); + ret = WaitForSingleObject(process->control_mutex, 30000); if (ret != WAIT_OBJECT_0) + { + release_process(process); return ERROR_SERVICE_REQUEST_TIMEOUT; + } - process_send_control(service->service_entry->process, service->service_entry->name, dwControl, &result); + process_send_control(process, service->service_entry->name, dwControl, &result); if (lpServiceStatus) { @@ -1191,7 +1195,8 @@ DWORD __cdecl svcctl_ControlService( service_unlock(service->service_entry); } - ReleaseMutex(control_mutex); + ReleaseMutex(process->control_mutex); + release_process(process); return result; } diff --git a/programs/services/services.c b/programs/services/services.c index 5be6f5c..234c0ac 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -457,6 +457,13 @@ struct service_entry *scmdatabase_find_service_by_displayname(struct scmdatabase return NULL; } +struct process_entry *grab_process(struct process_entry *process) +{ + if (process) + InterlockedIncrement(&process->ref_count); + return process; +} + void release_process(struct process_entry *process) { if (InterlockedDecrement(&process->ref_count) == 0) diff --git a/programs/services/services.h b/programs/services/services.h index b8f4774..3d6c486 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -88,6 +88,7 @@ void service_terminate(struct service_entry *service); /* Process functions */ +struct process_entry *grab_process(struct process_entry *process); void release_process(struct process_entry *process); BOOL process_send_command(struct process_entry *process, const void *data, DWORD size, DWORD *result);

1 0

Aaryaman Vasishta : d3drm: Implement Add/ Delete destroy callbacks for IDirect3DRMTexture*.
by Alexandre Julliard 19 Apr '16

19 Apr '16

Module: wine Branch: master Commit: 460af458fd659b22b7850daf467aedb9c626886a URL: http://source.winehq.org/git/wine.git/?a=commit;h=460af458fd659b22b7850daf4… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Apr 18 02:46:07 2016 +0530 d3drm: Implement Add/Delete destroy callbacks for IDirect3DRMTexture*. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/texture.c | 41 +++++++++++++++++++++++++++++------------ 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 5452b36..3dae0bb 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -36,6 +36,7 @@ struct d3drm_object struct d3drm_texture { + struct d3drm_object obj; IDirect3DRMTexture IDirect3DRMTexture_iface; IDirect3DRMTexture2 IDirect3DRMTexture2_iface; IDirect3DRMTexture3 IDirect3DRMTexture3_iface; diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 1ca7074..f81fc03 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -84,17 +84,21 @@ static HRESULT WINAPI d3drm_texture1_Clone(IDirect3DRMTexture *iface, static HRESULT WINAPI d3drm_texture1_AddDestroyCallback(IDirect3DRMTexture *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p\n", iface, cb, ctx); + + return IDirect3DRMTexture3_AddDestroyCallback(&texture->IDirect3DRMTexture3_iface, cb, ctx); } static HRESULT WINAPI d3drm_texture1_DeleteDestroyCallback(IDirect3DRMTexture *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p\n", iface, cb, ctx); + + return IDirect3DRMTexture3_DeleteDestroyCallback(&texture->IDirect3DRMTexture3_iface, cb, ctx); } static HRESULT WINAPI d3drm_texture1_SetAppData(IDirect3DRMTexture *iface, DWORD data) @@ -380,17 +384,21 @@ static HRESULT WINAPI d3drm_texture2_Clone(IDirect3DRMTexture2 *iface, static HRESULT WINAPI d3drm_texture2_AddDestroyCallback(IDirect3DRMTexture2 *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p\n", iface, cb, ctx); + + return IDirect3DRMTexture3_AddDestroyCallback(&texture->IDirect3DRMTexture3_iface, cb, ctx); } static HRESULT WINAPI d3drm_texture2_DeleteDestroyCallback(IDirect3DRMTexture2 *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p\n", iface, cb, ctx); + + return IDirect3DRMTexture3_DeleteDestroyCallback(&texture->IDirect3DRMTexture3_iface, cb, ctx); } static HRESULT WINAPI d3drm_texture2_SetAppData(IDirect3DRMTexture2 *iface, DWORD data) @@ -714,7 +722,10 @@ static ULONG WINAPI d3drm_texture3_Release(IDirect3DRMTexture3 *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + d3drm_object_cleanup((IDirect3DRMObject*)iface, &texture->obj); HeapFree(GetProcessHeap(), 0, texture); + } return refcount; } @@ -730,17 +741,21 @@ static HRESULT WINAPI d3drm_texture3_Clone(IDirect3DRMTexture3 *iface, static HRESULT WINAPI d3drm_texture3_AddDestroyCallback(IDirect3DRMTexture3 *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p\n", iface, cb, ctx); + + return d3drm_object_add_destroy_callback(&texture->obj, cb, ctx); } static HRESULT WINAPI d3drm_texture3_DeleteDestroyCallback(IDirect3DRMTexture3 *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p\n", iface, cb, ctx); + + return d3drm_object_delete_destroy_callback(&texture->obj, cb, ctx); } static HRESULT WINAPI d3drm_texture3_SetAppData(IDirect3DRMTexture3 *iface, DWORD data) @@ -1043,6 +1058,8 @@ HRESULT d3drm_texture_create(struct d3drm_texture **texture) object->IDirect3DRMTexture3_iface.lpVtbl = &d3drm_texture3_vtbl; object->ref = 1; + d3drm_object_init(&object->obj); + *texture = object; return D3DRM_OK;

1 0

Caron Wills : wined3d: Add Nvidia GeForce 845M.
by Alexandre Julliard 19 Apr '16

19 Apr '16

Module: wine Branch: master Commit: 43da2217a260e8100695d81853fa49c8fe34e3e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43da2217a260e8100695d8185… Author: Caron Wills <caron(a)codeweavers.com> Date: Mon Apr 18 16:17:41 2016 +0000 wined3d: Add Nvidia GeForce 845M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 13f1139..157eb79 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1288,6 +1288,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_820M, "NVIDIA GeForce 820M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_830M, "NVIDIA GeForce 830M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_840M, "NVIDIA GeForce 840M", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_845M, "NVIDIA GeForce 845M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1752,6 +1753,7 @@ cards_nvidia_binary[] = {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ + {"GeForce 845M", CARD_NVIDIA_GEFORCE_845M}, /* GeForce 800 - mobile */ {"GeForce 840M", CARD_NVIDIA_GEFORCE_840M}, /* GeForce 800 - mobile */ {"GeForce 830M", CARD_NVIDIA_GEFORCE_830M}, /* GeForce 800 - mobile */ {"GeForce 820M", CARD_NVIDIA_GEFORCE_820M}, /* GeForce 800 - mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1bdf20d..e1cda1c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1797,6 +1797,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_820M = 0x0fed, CARD_NVIDIA_GEFORCE_830M = 0x1340, CARD_NVIDIA_GEFORCE_840M = 0x1341, + CARD_NVIDIA_GEFORCE_845M = 0x1344, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a,

1 0

Józef Kucia : wined3d: Add EXT_texture_array extension.
by Alexandre Julliard 19 Apr '16

19 Apr '16

Module: wine Branch: master Commit: 8d8e374e96dc6b9ff3d5bab3a882f8cb0be351d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8e374e96dc6b9ff3d5bab3a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 19 00:01:25 2016 +0200 wined3d: Add EXT_texture_array extension. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 157eb79..a04e338 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -194,6 +194,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_stencil_two_side", EXT_STENCIL_TWO_SIDE }, {"GL_EXT_stencil_wrap", EXT_STENCIL_WRAP }, {"GL_EXT_texture3D", EXT_TEXTURE3D }, + {"GL_EXT_texture_array", EXT_TEXTURE_ARRAY }, {"GL_EXT_texture_compression_rgtc", EXT_TEXTURE_COMPRESSION_RGTC }, {"GL_EXT_texture_compression_s3tc", EXT_TEXTURE_COMPRESSION_S3TC }, {"GL_EXT_texture_env_combine", EXT_TEXTURE_ENV_COMBINE }, @@ -3470,6 +3471,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_TEXTURE_RG, MAKEDWORD_VERSION(3, 0)}, {EXT_DRAW_BUFFERS2, MAKEDWORD_VERSION(3, 0)}, {EXT_PACKED_FLOAT, MAKEDWORD_VERSION(3, 0)}, + {EXT_TEXTURE_ARRAY, MAKEDWORD_VERSION(3, 0)}, {EXT_TEXTURE_INTEGER, MAKEDWORD_VERSION(3, 0)}, /* We don't want to enable EXT_GPU_SHADER4: even though similar * functionality is available in core GL 3.0 / GLSL 1.30, it's different diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index f1f12ac..356ee7c 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -128,6 +128,7 @@ enum wined3d_gl_extension EXT_STENCIL_TWO_SIDE, EXT_STENCIL_WRAP, EXT_TEXTURE3D, + EXT_TEXTURE_ARRAY, EXT_TEXTURE_COMPRESSION_RGTC, EXT_TEXTURE_COMPRESSION_S3TC, EXT_TEXTURE_ENV_COMBINE,

1 0