October 2016 - Wine-Commits

Roman Pišl : user32: Fix buffer overflow in EDIT_EM_ReplaceSel().
by Alexandre Julliard Oct. 20, 2016

Oct. 20, 2016

Module: wine Branch: master Commit: 9de8ea75645d7092f888ddd7572f35204e672757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9de8ea75645d7092f888ddd75… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Tue Oct 18 00:34:55 2016 +0200 user32: Fix buffer overflow in EDIT_EM_ReplaceSel(). After EN_MAXTEXT notification, available space may be larger than length of the string. This must be checked and strl must not be set to a value larger than the actual length of the string. Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index f5cd3c4..78d78ea 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -2598,7 +2598,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, LPCWSTR lpsz_replac if (es->buffer_limit < (tl - (e-s))) strl = 0; else - strl = es->buffer_limit - (tl - (e-s)); + strl = min(strl, es->buffer_limit - (tl - (e-s))); } if (!EDIT_MakeFit(es, tl - (e - s) + strl))

1 0

Jacek Caban : taskschd: Added ITriggerCollection::Create implementation.
by Alexandre Julliard Oct. 20, 2016

Oct. 20, 2016

Module: wine Branch: master Commit: 18427a0ce0581d4023413f901e2458987e287dd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18427a0ce0581d4023413f901… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 19 14:04:19 2016 +0200 taskschd: Added ITriggerCollection::Create implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 263 +++++++++++++++++++++++++++++++++++++++- dlls/taskschd/tests/scheduler.c | 18 +++ 2 files changed, 279 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=18427a0ce0581d4023413…

1 0

Jacek Caban : taskschd: Added IDailyTrigger:: DaysInterval property implementation.
by Alexandre Julliard Oct. 20, 2016

Oct. 20, 2016

Module: wine Branch: master Commit: 82a590403fbec212c5884d1688c099392652c026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82a590403fbec212c5884d168… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 19 14:04:32 2016 +0200 taskschd: Added IDailyTrigger::DaysInterval property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 19 +++++++++++++++---- dlls/taskschd/tests/scheduler.c | 24 ++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 5d7f467..6a1acc8 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -38,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(taskschd); typedef struct { IDailyTrigger IDailyTrigger_iface; LONG ref; + short interval; } DailyTrigger; static inline DailyTrigger *impl_from_IDailyTrigger(IDailyTrigger *iface) @@ -217,15 +218,24 @@ static HRESULT WINAPI DailyTrigger_put_Enabled(IDailyTrigger *iface, VARIANT_BOO static HRESULT WINAPI DailyTrigger_get_DaysInterval(IDailyTrigger *iface, short *days) { DailyTrigger *This = impl_from_IDailyTrigger(iface); - FIXME("(%p)->(%p)\n", This, days); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, days); + + *days = This->interval; + return S_OK; } static HRESULT WINAPI DailyTrigger_put_DaysInterval(IDailyTrigger *iface, short days) { DailyTrigger *This = impl_from_IDailyTrigger(iface); - FIXME("(%p)->(%d)\n", This, days); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, days); + + if(days <= 0) + return E_INVALIDARG; + + This->interval = days; + return S_OK; } static HRESULT WINAPI DailyTrigger_get_RandomDelay(IDailyTrigger *iface, BSTR *pRandomDelay) @@ -279,6 +289,7 @@ static HRESULT DailyTrigger_create(ITrigger **trigger) daily_trigger->IDailyTrigger_iface.lpVtbl = &DailyTrigger_vtbl; daily_trigger->ref = 1; + daily_trigger->interval = 1; *trigger = (ITrigger*)&daily_trigger->IDailyTrigger_iface; return S_OK; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 41c0ea8..efd5f60 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1174,11 +1174,35 @@ todo_wine static void test_daily_trigger(ITrigger *trigger) { IDailyTrigger *daily_trigger; + short interval; HRESULT hr; hr = ITrigger_QueryInterface(trigger, &IID_IDailyTrigger, (void**)&daily_trigger); ok(hr == S_OK, "Could not get IDailyTrigger iface: %08x\n", hr); + interval = -1; + hr = IDailyTrigger_get_DaysInterval(daily_trigger, &interval); + ok(hr == S_OK, "get_DaysInterval failed: %08x\n", hr); + ok(interval == 1, "interval = %d\n", interval); + + hr = IDailyTrigger_put_DaysInterval(daily_trigger, -2); + ok(hr == E_INVALIDARG, "put_DaysInterval failed: %08x\n", hr); + hr = IDailyTrigger_put_DaysInterval(daily_trigger, 0); + ok(hr == E_INVALIDARG, "put_DaysInterval failed: %08x\n", hr); + + interval = -1; + hr = IDailyTrigger_get_DaysInterval(daily_trigger, &interval); + ok(hr == S_OK, "get_DaysInterval failed: %08x\n", hr); + ok(interval == 1, "interval = %d\n", interval); + + hr = IDailyTrigger_put_DaysInterval(daily_trigger, 2); + ok(hr == S_OK, "put_DaysInterval failed: %08x\n", hr); + + interval = -1; + hr = IDailyTrigger_get_DaysInterval(daily_trigger, &interval); + ok(hr == S_OK, "get_DaysInterval failed: %08x\n", hr); + ok(interval == 2, "interval = %d\n", interval); + IDailyTrigger_Release(daily_trigger); }

1 0

Donat Enikeev : crypt32: Cert(Un)RegisterSystemStore semi-stubs.
by Alexandre Julliard Oct. 20, 2016

Oct. 20, 2016

Module: wine Branch: master Commit: 71bd13391b3cd8d686b552021b918cf1e4f70d31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71bd13391b3cd8d686b552021… Author: Donat Enikeev <donat(a)enikeev.net> Date: Fri Oct 14 09:37:09 2016 +0300 crypt32: Cert(Un)RegisterSystemStore semi-stubs. Signed-off-by: Donat Enikeev <donat(a)enikeev.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/crypt32.spec | 2 ++ dlls/crypt32/store.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 0d2a477..b5ce48c 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -78,6 +78,7 @@ @ stdcall CertRDNValueToStrA(long ptr ptr long) @ stdcall CertRDNValueToStrW(long ptr ptr long) @ stdcall CertRegisterPhysicalStore(ptr long wstr ptr ptr) +@ stdcall CertRegisterSystemStore(ptr long ptr ptr) @ stdcall CertRemoveEnhancedKeyUsageIdentifier(ptr str) @ stdcall CertRemoveStoreFromCollection(ptr ptr) @ stdcall CertSaveStore(ptr long long long ptr long) @@ -190,6 +191,7 @@ @ stdcall CryptUnprotectMemory(ptr long long) @ stdcall CryptUnregisterDefaultOIDFunction(long str wstr) @ stdcall CryptUnregisterOIDFunction(long str str) +@ stdcall CertUnregisterSystemStore(ptr long) @ stub CryptUnregisterOIDInfo @ stdcall CryptVerifyCertificateSignature(long long ptr long ptr) @ stdcall CryptVerifyCertificateSignatureEx(long long long ptr long ptr long ptr) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index d5d7443..356712b 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1390,6 +1390,51 @@ BOOL WINAPI CertRegisterPhysicalStore(const void *pvSystemStore, DWORD dwFlags, return FALSE; } +BOOL WINAPI CertRegisterSystemStore(const void *pvSystemStore, DWORD dwFlags, + PCERT_SYSTEM_STORE_INFO pStoreInfo, void *pvReserved) +{ + HCERTSTORE hstore; + + if (dwFlags & CERT_SYSTEM_STORE_RELOCATE_FLAG ) + { + FIXME("(%p, %08x, %p, %p): flag not supported\n", pvSystemStore, dwFlags, pStoreInfo, pvReserved); + return FALSE; + } + + TRACE("(%s, %08x, %p, %p)\n", debugstr_w(pvSystemStore), dwFlags, pStoreInfo, pvReserved); + + hstore = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, dwFlags, pvSystemStore); + if (hstore) + { + CertCloseStore(hstore, 0); + return TRUE; + } + + return FALSE; +} + +BOOL WINAPI CertUnregisterSystemStore(void *pvSystemStore, DWORD dwFlags) +{ + HCERTSTORE hstore; + + if (dwFlags & CERT_SYSTEM_STORE_RELOCATE_FLAG) + { + FIXME("(%p, %08x): flag not supported\n", pvSystemStore, dwFlags); + return FALSE; + } + TRACE("(%s, %08x)\n", debugstr_w(pvSystemStore), dwFlags); + + hstore = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, dwFlags | CERT_STORE_OPEN_EXISTING_FLAG, pvSystemStore); + if (hstore == NULL) + return FALSE; + + hstore = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, dwFlags | CERT_STORE_DELETE_FLAG, pvSystemStore); + if (hstore == NULL && GetLastError() == 0) + return TRUE; + + return FALSE; +} + static void EmptyStore_addref(WINECRYPT_CERTSTORE *store) { TRACE("(%p)\n", store);

1 0

Hadrien Boizard : winex11.drv: Use EqualRect() instead of memcmp() to compare RECTs.
by Alexandre Julliard Oct. 20, 2016

Oct. 20, 2016

Module: wine Branch: master Commit: 288a15fabde623597b272597ec84afbddb4636e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=288a15fabde623597b272597e… Author: Hadrien Boizard <h.boizard(a)gmail.com> Date: Thu Oct 13 17:05:08 2016 +0200 winex11.drv: Use EqualRect() instead of memcmp() to compare RECTs. Signed-off-by: Hadrien Boizard <h.boizard(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 0de7955..7408a0e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2243,7 +2243,7 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag surface_rect = get_surface_rect( visible_rect ); if (data->surface) { - if (!memcmp( &data->surface->rect, &surface_rect, sizeof(surface_rect) )) + if (EqualRect( &data->surface->rect, &surface_rect )) { /* existing surface is good enough */ window_surface_add_ref( data->surface ); @@ -2311,7 +2311,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags old_client_rect.right - data->client_rect.right == x_offset && old_client_rect.top - data->client_rect.top == y_offset && old_client_rect.bottom - data->client_rect.bottom == y_offset && - !memcmp( &valid_rects[0], &data->client_rect, sizeof(RECT) )) + EqualRect( &valid_rects[0], &data->client_rect )) { /* if we have an X window the bits will be moved by the X server */ if (!window && (x_offset != 0 || y_offset != 0)) @@ -2595,7 +2595,7 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO OffsetRect( &rect, -window_rect->left, -window_rect->top ); surface = data->surface; - if (!surface || memcmp( &surface->rect, &rect, sizeof(RECT) )) + if (!surface || !EqualRect( &surface->rect, &rect )) { data->surface = create_surface( data->whole_window, &data->vis, &rect, color_key, !data->embedded );

1 0

Vincent Povirk : gdiplus: Reimplement GdipDrawPolygon based on GdipDrawPath.
by Alexandre Julliard Oct. 20, 2016

Oct. 20, 2016

Module: wine Branch: master Commit: 6920cf68e6367f3d201de7cc3bee3a2842ca93f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6920cf68e6367f3d201de7cc3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 19 10:03:05 2016 -0500 gdiplus: Reimplement GdipDrawPolygon based on GdipDrawPath. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 324c06f..f9a6f3e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6164,8 +6164,8 @@ GpStatus WINGDIPAPI GdipSetClipRegion(GpGraphics *graphics, GpRegion *region, GpStatus WINGDIPAPI GdipDrawPolygon(GpGraphics *graphics,GpPen *pen,GDIPCONST GpPointF *points, INT count) { - INT save_state; - POINT *pti; + GpStatus status; + GpPath* path; TRACE("(%p, %p, %d)\n", graphics, points, count); @@ -6175,24 +6175,16 @@ GpStatus WINGDIPAPI GdipDrawPolygon(GpGraphics *graphics,GpPen *pen,GDIPCONST Gp if(graphics->busy) return ObjectBusy; - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - pti = heap_alloc_zero(sizeof(POINT) * count); - - save_state = prepare_dc(graphics, pen); - SelectObject(graphics->hdc, GetStockObject(NULL_BRUSH)); + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; - transform_and_round_points(graphics, pti, (GpPointF*)points, count); - Polygon(graphics->hdc, pti, count); + status = GdipAddPathPolygon(path, points, count); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); - restore_dc(graphics, save_state); - heap_free(pti); + GdipDeletePath(path); - return Ok; + return status; } GpStatus WINGDIPAPI GdipDrawPolygonI(GpGraphics *graphics,GpPen *pen,GDIPCONST GpPoint *points,

1 0

Austin English : shell32: Add SHCreateSessionKey stub.
by Alexandre Julliard Oct. 20, 2016

Oct. 20, 2016

Module: wine Branch: master Commit: 6c876de7d079a5b918a3d13c0ac2403d7dd3b40d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c876de7d079a5b918a3d13c0… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 19 13:07:33 2016 +0200 shell32: Add SHCreateSessionKey stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shellreg.c | 11 +++++++++++ dlls/shell32/tests/shellole.c | 10 +++++----- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 0d43f3b..cd4f24a 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -261,6 +261,7 @@ 704 stdcall -noname GUIDFromStringW(wstr ptr) 709 stdcall SHGetSetFolderCustomSettings(ptr str long) 714 stdcall @(ptr) SHELL32_714 # PathIsTemporaryW + 723 stdcall -noname SHCreateSessionKey(long ptr) 727 stdcall SHGetImageList(long ptr ptr) 730 stdcall -noname RestartDialogEx(long wstr long long) 743 stdcall SHCreateFileExtractIconW(wstr long ptr ptr) diff --git a/dlls/shell32/shellreg.c b/dlls/shell32/shellreg.c index 37f3d9e..356ec4e 100644 --- a/dlls/shell32/shellreg.c +++ b/dlls/shell32/shellreg.c @@ -147,3 +147,14 @@ HRESULT WINAPI SHRegCloseKey (HKEY hkey) TRACE("%p\n",hkey); return RegCloseKey( hkey ); } + +/************************************************************************* + * SHCreateSessionKey [SHELL32.723] + * + */ +HRESULT WINAPI SHCreateSessionKey(REGSAM access, HKEY *hkey) +{ + FIXME("stub: %d %p\n", access, hkey); + *hkey = NULL; + return E_NOTIMPL; +} diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c index 04c9632..be10733 100644 --- a/dlls/shell32/tests/shellole.c +++ b/dlls/shell32/tests/shellole.c @@ -867,7 +867,7 @@ static void test_SHCreateSessionKey(void) if (!pSHCreateSessionKey) { - skip("SHCreateSessionKey is not implemented\n"); + win_skip("SHCreateSessionKey is not implemented\n"); return; } @@ -876,15 +876,15 @@ static void test_SHCreateSessionKey(void) hkey = (HKEY)0xdeadbeef; hr = pSHCreateSessionKey(0, &hkey); - ok(hr == E_ACCESSDENIED, "got 0x%08x\n", hr); + todo_wine ok(hr == E_ACCESSDENIED, "got 0x%08x\n", hr); ok(hkey == NULL, "got %p\n", hkey); hr = pSHCreateSessionKey(KEY_READ, &hkey); - ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = pSHCreateSessionKey(KEY_READ, &hkey2); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(hkey != hkey2, "got %p, %p\n", hkey, hkey2); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(hkey != hkey2, "got %p, %p\n", hkey, hkey2); RegCloseKey(hkey); RegCloseKey(hkey2);

1 0

Austin English : shell32: Add SHRemoveLocalizedName stub.
by Alexandre Julliard Oct. 20, 2016

Oct. 20, 2016

Module: wine Branch: master Commit: e18654edace0072724fbb49bbc7038da84742976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e18654edace0072724fbb49bb… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Oct 10 21:46:26 2016 -0500 shell32: Add SHRemoveLocalizedName stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shellord.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index f95aaa7..0d43f3b 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -412,6 +412,7 @@ @ stdcall SHQueryRecycleBinA(str ptr) @ stdcall SHQueryRecycleBinW(wstr ptr) @ stdcall SHQueryUserNotificationState(ptr) +@ stdcall SHRemoveLocalizedName(wstr) @ stdcall SHSetLocalizedName(wstr wstr long) @ stdcall SHSetUnreadMailCountW(wstr long wstr) @ stdcall SHUpdateRecycleBinIcon() diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 60492de..1a67a52 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -2119,6 +2119,15 @@ DWORD WINAPI SHFormatDrive(HWND hwnd, UINT drive, UINT fmtID, UINT options) } /************************************************************************* + * SHRemoveLocalizedName (SHELL32.@) + */ +HRESULT WINAPI SHRemoveLocalizedName(const WCHAR *path) +{ + FIXME("%s stub\n", debugstr_w(path)); + return S_OK; +} + +/************************************************************************* * SHSetLocalizedName (SHELL32.@) */ HRESULT WINAPI SHSetLocalizedName(LPWSTR pszPath, LPCWSTR pszResModule, int idsRes)

1 0

Józef Kucia : wined3d: Rename buffer_internal_preload () to wined3d_buffer_load().
by Alexandre Julliard Oct. 20, 2016

Oct. 20, 2016

Module: wine Branch: master Commit: 5f86ef7b1e9614d9794e304a6b9af5ace3cb8d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f86ef7b1e9614d9794e304a6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Oct 16 21:46:46 2016 +0200 wined3d: Rename buffer_internal_preload() to wined3d_buffer_load(). 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/buffer.c | 4 ++-- dlls/wined3d/context.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 49bed64..ae835be 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -740,7 +740,7 @@ void buffer_mark_used(struct wined3d_buffer *buffer) } /* Context activation is done by the caller. */ -void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context, +void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) { DWORD flags = buffer->flags & (WINED3D_BUFFER_SYNC | WINED3D_BUFFER_DISCARD); @@ -1219,7 +1219,7 @@ static void buffer_resource_preload(struct wined3d_resource *resource) struct wined3d_context *context; context = context_acquire(resource->device, NULL); - buffer_internal_preload(buffer_from_resource(resource), context, NULL); + wined3d_buffer_load(buffer_from_resource(resource), context, NULL); context_release(context); } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 87d417c..38e081b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3200,7 +3200,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st } else { - buffer_internal_preload(buffer, context, state); + wined3d_buffer_load(buffer, context, state); buffer_get_memory(buffer, context, &data); element->data.buffer_object = data.buffer_object; element->data.addr += (ULONG_PTR)data.addr; @@ -3304,7 +3304,7 @@ static void context_load_shader_resources(struct wined3d_context *context, const for (j = 0; j < WINED3D_MAX_CBS; ++j) { if (state->cb[i][j]) - buffer_internal_preload(state->cb[i][j], context, state); + wined3d_buffer_load(state->cb[i][j], context, state); } for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) @@ -3318,7 +3318,7 @@ static void context_load_shader_resources(struct wined3d_context *context, const } if (view->resource->type == WINED3D_RTYPE_BUFFER) - buffer_internal_preload(buffer_from_resource(view->resource), context, state); + wined3d_buffer_load(buffer_from_resource(view->resource), context, state); else wined3d_texture_load(texture_from_resource(view->resource), context, FALSE); } @@ -3430,7 +3430,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, if (state->index_buffer) { if (context->stream_info.all_vbo) - buffer_internal_preload(state->index_buffer, context, state); + wined3d_buffer_load(state->index_buffer, context, state); else buffer_get_sysmem(state->index_buffer, context); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4326bee..5e4b072 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3181,9 +3181,9 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, struct wined3d_bo_address *data) DECLSPEC_HIDDEN; BYTE *buffer_get_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN; -void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context, - const struct wined3d_state *state) DECLSPEC_HIDDEN; void buffer_mark_used(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; +void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, + const struct wined3d_state *state) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_upload_data(struct wined3d_buffer *buffer,

1 0

Jacek Caban : ws2_32: Added FreeAddrInfoExW stub.
by Alexandre Julliard Oct. 20, 2016

Oct. 20, 2016

Module: wine Branch: master Commit: 7e7f46f43667eecf794795c7ed9fe7c7b5580663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e7f46f43667eecf794795c7e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 18 14:28:59 2016 +0200 ws2_32: Added FreeAddrInfoExW stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 8 ++++++++ dlls/ws2_32/ws2_32.spec | 1 + 2 files changed, 9 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e8c5130..3d9a99b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6810,6 +6810,14 @@ void WINAPI FreeAddrInfoW(PADDRINFOW ai) } } +/*********************************************************************** + * FreeAddrInfoExW (WS2_32.@) + */ +void WINAPI FreeAddrInfoExW(ADDRINFOEXW *ai) +{ + FIXME("%p\n", ai); +} + int WINAPI WS_getnameinfo(const SOCKADDR *sa, WS_socklen_t salen, PCHAR host, DWORD hostlen, PCHAR serv, DWORD servlen, INT flags) { diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index 0482b7d..df5e9d3 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -50,6 +50,7 @@ 500 stub WEP +@ stdcall FreeAddrInfoExW(ptr) @ stdcall FreeAddrInfoW(ptr) @ stdcall GetAddrInfoExW(wstr wstr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall GetAddrInfoW(wstr wstr ptr ptr)

1 0