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

Aaryaman Vasishta : d3drm: Introduce d3drm_viewport_destroy().
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: be7bca55e3799926b4002f343a8edca61d8564d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be7bca55e3799926b4002f343… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Wed Jun 29 15:39:02 2016 +0200 d3drm: Introduce d3drm_viewport_destroy(). 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/viewport.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index ab9ccde..434d5e9 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -39,6 +39,14 @@ static inline struct d3drm_viewport *impl_from_IDirect3DRMViewport2(IDirect3DRMV return CONTAINING_RECORD(iface, struct d3drm_viewport, IDirect3DRMViewport2_iface); } +static void d3drm_viewport_destroy(struct d3drm_viewport *viewport) +{ + TRACE("viewport %p.\n", viewport); + + d3drm_object_cleanup((IDirect3DRMObject *)&viewport->IDirect3DRMViewport_iface, &viewport->obj); + HeapFree(GetProcessHeap(), 0, viewport); +} + static HRESULT WINAPI d3drm_viewport1_QueryInterface(IDirect3DRMViewport *iface, REFIID riid, void **out) { struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); @@ -84,10 +92,7 @@ static ULONG WINAPI d3drm_viewport1_Release(IDirect3DRMViewport *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) - { - d3drm_object_cleanup((IDirect3DRMObject*)iface, &viewport->obj); - HeapFree(GetProcessHeap(), 0, viewport); - } + d3drm_viewport_destroy(viewport); return refcount; }

1 0

Aaryaman Vasishta : d3drm: Rearrange version 1 functions after version 2 for IDirect3DRMViewport*.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: 49f37796d5a50ed8d261d19c6f35d1ed8271fd81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f37796d5a50ed8d261d19c6… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Wed Jun 29 15:39:03 2016 +0200 d3drm: Rearrange version 1 functions after version 2 for IDirect3DRMViewport*. 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/viewport.c | 688 +++++++++++++++++++++++++------------------------- 1 file changed, 344 insertions(+), 344 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49f37796d5a50ed8d261d…

1 0

Thomas Faber : winhttp: Avoid buffer overrun in alloc_handle.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: 834137517ae5497478273a1d87080557d1eedfec URL: http://source.winehq.org/git/wine.git/?a=commit;h=834137517ae5497478273a1d8… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Jun 26 01:45:36 2016 +0200 winhttp: Avoid buffer overrun in alloc_handle. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/handle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/handle.c b/dlls/winhttp/handle.c index 7a346a8..aa980ed 100644 --- a/dlls/winhttp/handle.c +++ b/dlls/winhttp/handle.c @@ -112,7 +112,7 @@ HINTERNET alloc_handle( object_header_t *hdr ) if (handles[handle]) ERR("handle isn't free but should be\n"); handles[handle] = addref_object( hdr ); - while (handles[next_handle] && (next_handle < max_handles)) next_handle++; + while ((next_handle < max_handles) && handles[next_handle]) next_handle++; end: LeaveCriticalSection( &handle_cs );

1 0

Thomas Faber : winhttp: Return NULL on failure in alloc_handle.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: 87c05c87795ecd5e5290061d0ddd6205fef2cd7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=87c05c87795ecd5e5290061d0… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Jun 26 01:53:28 2016 +0200 winhttp: Return NULL on failure in alloc_handle. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/handle.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/handle.c b/dlls/winhttp/handle.c index aa980ed..6026a49 100644 --- a/dlls/winhttp/handle.c +++ b/dlls/winhttp/handle.c @@ -89,9 +89,10 @@ void release_object( object_header_t *hdr ) HINTERNET alloc_handle( object_header_t *hdr ) { object_header_t **p; - ULONG_PTR handle = 0, num; + ULONG_PTR handle, num; list_init( &hdr->children ); + hdr->handle = NULL; EnterCriticalSection( &handle_cs ); if (!max_handles) @@ -112,11 +113,12 @@ HINTERNET alloc_handle( object_header_t *hdr ) if (handles[handle]) ERR("handle isn't free but should be\n"); handles[handle] = addref_object( hdr ); + hdr->handle = (HINTERNET)(handle + 1); while ((next_handle < max_handles) && handles[next_handle]) next_handle++; end: LeaveCriticalSection( &handle_cs ); - return hdr->handle = (HINTERNET)(handle + 1); + return hdr->handle; } BOOL free_handle( HINTERNET hinternet )

1 0

André Hentschel : winspool: Implement SetPrinterW for level 8.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: 88c77da35d2a4e443886e89be7ee16994d1605e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88c77da35d2a4e443886e89be… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 25 21:08:54 2016 +0200 winspool: Implement SetPrinterW for level 8. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 3ba94cd..95f397c 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3487,6 +3487,10 @@ BOOL WINAPI SetPrinterW( HANDLE printer, DWORD level, LPBYTE data, DWORD command break; } + case 8: + /* 8 is the global default printer info and 9 already sets it instead of the per-user one */ + /* still, PRINTER_INFO_8W is the same as PRINTER_INFO_9W */ + /* fall through */ case 9: { PRINTER_INFO_9W *pi = (PRINTER_INFO_9W *)data;

1 0

Nikolay Sivov : regedit: Fix error message format (Coverity).
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: 0c79028e97acd8c0d7237cc9b5c06170b7b18034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c79028e97acd8c0d7237cc9b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 26 20:13:50 2016 +0300 regedit: Fix error message format (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index f57f427..201eb4f 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -241,7 +241,7 @@ BOOL ProcessCmdLine(LPSTR lpCmdLine) /* ignored */; break; default: - fprintf(stderr, "regedit: Invalid switch [%ls]\n", argv[i]); + fprintf(stderr, "regedit: Invalid switch [%s]\n", argv[i]); exit(1); } }

1 0

Thomas Faber : wordpad: Remove superfluous check in registry_set_filelist.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: f07a25467f07e72046e9dc0ccf731e3e0cb52bdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f07a25467f07e72046e9dc0cc… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Jun 26 10:59:08 2016 +0200 wordpad: Remove superfluous check in registry_set_filelist. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/registry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wordpad/registry.c b/programs/wordpad/registry.c index bf2af5b..d53b747 100644 --- a/programs/wordpad/registry.c +++ b/programs/wordpad/registry.c @@ -298,7 +298,7 @@ void registry_set_filelist(LPCWSTR newFile, HWND hMainWnd) if(!lstrcmpiW(pFiles[i], newFile)) { int j; - for(j = 0; pFiles[j] && j < i; j++) + for(j = 0; j < i; j++) { pFiles[i-j] = pFiles[i-j-1]; }

1 0

Alistair Leslie-Hughes : d3dx9_34: Share the source with d3dx9_36.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: 8faaf57c4aeaf480dd96a7f4ae0ee451528e40ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=8faaf57c4aeaf480dd96a7f4a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 22 06:00:02 2016 +0000 d3dx9_34: Share the source with d3dx9_36. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_34/Makefile.in | 22 +- dlls/d3dx9_34/d3dx9_34.spec | 666 +++++++++++++++++++++--------------------- dlls/d3dx9_34/d3dx9_34_main.c | 2 +- tools/make_specfiles | 1 - 4 files changed, 354 insertions(+), 337 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8faaf57c4aeaf480dd96a…

1 0

Alistair Leslie-Hughes : d3dx9_35: Share the source with d3dx9_36.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: da46ee26c733d5e5afd2c2bae6353a27090a9301 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da46ee26c733d5e5afd2c2bae… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 22 06:00:16 2016 +0000 d3dx9_35: Share the source with d3dx9_36. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_35/Makefile.in | 22 +- dlls/d3dx9_35/d3dx9_35.spec | 666 +++++++++++++++++++++--------------------- dlls/d3dx9_35/d3dx9_35_main.c | 2 +- tools/make_specfiles | 1 - 4 files changed, 354 insertions(+), 337 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da46ee26c733d5e5afd2c…

1 0

Alistair Leslie-Hughes : d3dx9_37: Share the source with d3dx9_36.
by Alexandre Julliard 03 Jul '16

03 Jul '16

Module: wine Branch: master Commit: 4f42fe7bb7416dc83a2c29cd010c363b052eaa3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f42fe7bb7416dc83a2c29cd0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 22 06:00:29 2016 +0000 d3dx9_37: Share the source with d3dx9_36. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_37/Makefile.in | 22 +- dlls/d3dx9_37/d3dx9_37.spec | 670 +++++++++++++++++++++--------------------- dlls/d3dx9_37/d3dx9_37_main.c | 2 +- tools/make_specfiles | 1 - 4 files changed, 356 insertions(+), 339 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f42fe7bb7416dc83a2c2…

1 0