July 2014 - Wine-Commits - list.winehq.org

Zhenbo Li : mshtml: Added support for IHTMLTable[23] interfaces in HTMLTable.
by Alexandre Julliard July 15, 2014

July 15, 2014

Module: wine Branch: master Commit: e80a3435a1c2cade0ebb9f9869f7899d9e3bf1a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e80a3435a1c2cade0ebb9f986… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Tue Jul 15 21:05:47 2014 +0800 mshtml: Added support for IHTMLTable[23] interfaces in HTMLTable. --- dlls/mshtml/htmltable.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index de12537..0f64330 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -914,10 +914,10 @@ static HRESULT HTMLTable_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) *ppv = &This->IHTMLTable_iface; }else if(IsEqualGUID(&IID_IHTMLTable2, riid)) { TRACE("(%p)->(IID_IHTMLTable2 %p)\n", This, ppv); - *ppv = &This->IHTMLTable_iface; + *ppv = &This->IHTMLTable2_iface; }else if(IsEqualGUID(&IID_IHTMLTable3, riid)) { TRACE("(%p)->(IID_IHTMLTable3 %p)\n", This, ppv); - *ppv = &This->IHTMLTable_iface; + *ppv = &This->IHTMLTable3_iface; } if(*ppv) { @@ -969,6 +969,8 @@ HRESULT HTMLTable_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLE ret->element.node.vtbl = &HTMLTableImplVtbl; ret->IHTMLTable_iface.lpVtbl = &HTMLTableVtbl; + ret->IHTMLTable2_iface.lpVtbl = &HTMLTable2Vtbl; + ret->IHTMLTable3_iface.lpVtbl = &HTMLTable3Vtbl; HTMLElement_Init(&ret->element, doc, nselem, &HTMLTable_dispex);

1 0

Henri Verbeet : ddraw/tests: Get rid of struct sVertex.
by Alexandre Julliard July 15, 2014

July 15, 2014

Module: wine Branch: master Commit: ee5e469fd82e57eeba408edd204c929e42d4981a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee5e469fd82e57eeba408edd2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 15 08:43:54 2014 +0200 ddraw/tests: Get rid of struct sVertex. --- dlls/ddraw/tests/visual.c | 64 ++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index e517d64..58c7d7d 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -446,12 +446,6 @@ static void clear_test(IDirect3DDevice7 *device) ok(color == 0x00ffffff, "Clear rectangle 4(neg, neg) has color %08x\n", color); } -struct sVertex { - float x, y, z; - DWORD diffuse; - DWORD specular; -}; - struct sVertexT { float x, y, z, rhw; DWORD diffuse; @@ -465,19 +459,41 @@ static void fog_test(IDirect3DDevice7 *device) float start = 0.0, end = 1.0; D3DDEVICEDESC7 caps; + struct + { + struct vec3 position; + DWORD diffuse; + DWORD specular; + } /* Gets full z based fog with linear fog, no fog with specular color */ - struct sVertex untransformed_1[] = { - {-1, -1, 0.1f, 0xFFFF0000, 0xFF000000 }, - {-1, 0, 0.1f, 0xFFFF0000, 0xFF000000 }, - { 0, 0, 0.1f, 0xFFFF0000, 0xFF000000 }, - { 0, -1, 0.1f, 0xFFFF0000, 0xFF000000 }, - }; + untransformed_1[] = + { + {{-1.0f, -1.0f, 0.1f}, 0xffff0000, 0xff000000}, + {{-1.0f, 0.0f, 0.1f}, 0xffff0000, 0xff000000}, + {{ 0.0f, 0.0f, 0.1f}, 0xffff0000, 0xff000000}, + {{ 0.0f, -1.0f, 0.1f}, 0xffff0000, 0xff000000}, + }, /* Ok, I am too lazy to deal with transform matrices */ - struct sVertex untransformed_2[] = { - {-1, 0, 1.0f, 0xFFFF0000, 0xFF000000 }, - {-1, 1, 1.0f, 0xFFFF0000, 0xFF000000 }, - { 0, 1, 1.0f, 0xFFFF0000, 0xFF000000 }, - { 0, 0, 1.0f, 0xFFFF0000, 0xFF000000 }, + untransformed_2[] = + { + {{-1.0f, 0.0f, 1.0f}, 0xffff0000, 0xff000000}, + {{-1.0f, 1.0f, 1.0f}, 0xffff0000, 0xff000000}, + {{ 0.0f, 1.0f, 1.0f}, 0xffff0000, 0xff000000}, + {{ 0.0f, 0.0f, 1.0f}, 0xffff0000, 0xff000000}, + }, + far_quad1[] = + { + {{-1.0f, -1.0f, 0.5f}, 0xffff0000, 0xff000000}, + {{-1.0f, 0.0f, 0.5f}, 0xffff0000, 0xff000000}, + {{ 0.0f, 0.0f, 0.5f}, 0xffff0000, 0xff000000}, + {{ 0.0f, -1.0f, 0.5f}, 0xffff0000, 0xff000000}, + }, + far_quad2[] = + { + {{-1.0f, 0.0f, 1.5f}, 0xffff0000, 0xff000000}, + {{-1.0f, 1.0f, 1.5f}, 0xffff0000, 0xff000000}, + {{ 0.0f, 1.0f, 1.5f}, 0xffff0000, 0xff000000}, + {{ 0.0f, 0.0f, 1.5f}, 0xffff0000, 0xff000000}, }; /* Untransformed ones. Give them a different diffuse color to make the test look * nicer. It also makes making sure that they are drawn correctly easier. @@ -523,20 +539,6 @@ static void fog_test(IDirect3DDevice7 *device) 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, -1.0f, 1.0f, }; - struct sVertex far_quad1[] = - { - {-1.0f, -1.0f, 0.5f, 0xffff0000, 0xff000000}, - {-1.0f, 0.0f, 0.5f, 0xffff0000, 0xff000000}, - { 0.0f, 0.0f, 0.5f, 0xffff0000, 0xff000000}, - { 0.0f, -1.0f, 0.5f, 0xffff0000, 0xff000000}, - }; - struct sVertex far_quad2[] = - { - {-1.0f, 0.0f, 1.5f, 0xffff0000, 0xff000000}, - {-1.0f, 1.0f, 1.5f, 0xffff0000, 0xff000000}, - { 0.0f, 1.0f, 1.5f, 0xffff0000, 0xff000000}, - { 0.0f, 0.0f, 1.5f, 0xffff0000, 0xff000000}, - }; memset(&caps, 0, sizeof(caps)); hr = IDirect3DDevice7_GetCaps(device, &caps);

1 0

Henri Verbeet : wined3d: Make vp_ffp_states static.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: 0ef760ef8264be50720dde36944982dacb77d151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ef760ef8264be50720dde369… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 14 10:04:24 2014 +0200 wined3d: Make vp_ffp_states static. --- dlls/wined3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f450f20..36c4e71 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5091,7 +5091,7 @@ const struct StateEntryTemplate misc_state_template[] = { {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, }; -const struct StateEntryTemplate vp_ffp_states[] = +static const struct StateEntryTemplate vp_ffp_states[] = { { STATE_VDECL, { STATE_VDECL, vertexdeclaration }, WINED3D_GL_EXT_NONE }, { STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), { STATE_VDECL, NULL }, WINED3D_GL_EXT_NONE },

1 0

Bruno Jesus : rsaenh/tests: Add a pre XP DES compatibility test.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: 3b7c61dc2a888e0b3bb39e90ae1b91f466ca62f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b7c61dc2a888e0b3bb39e90a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jul 12 13:11:51 2014 -0300 rsaenh/tests: Add a pre XP DES compatibility test. --- dlls/rsaenh/tests/rsaenh.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 4fabaad..467551e 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -894,6 +894,9 @@ static void test_des(void) static const BYTE des[16] = { 0x58, 0x86, 0x42, 0x46, 0x65, 0x4b, 0x92, 0x62, 0xcf, 0x0f, 0x65, 0x37, 0x43, 0x7a, 0x82, 0xb9 }; + static const BYTE des_old_behavior[16] = { + 0xb0, 0xfd, 0x11, 0x69, 0x76, 0xb1, 0xa1, 0x03, + 0xf7, 0xbc, 0x23, 0xaa, 0xd4, 0xc1, 0xc9, 0x55 }; int i; result = derive_key(CALG_DES, &hKey, 0); @@ -981,6 +984,25 @@ static void test_des(void) result = CryptDestroyKey(hKey); ok(result, "%08x\n", GetLastError()); + + /* Windows >= XP changed the way DES keys are derived, this test ensures we don't break that */ + derive_key(CALG_DES, &hKey, 56); + + dwMode = CRYPT_MODE_ECB; + result = CryptSetKeyParam(hKey, KP_MODE, (BYTE*)&dwMode, 0); + ok(result, "%08x\n", GetLastError()); + + for (i=0; i<sizeof(pbData); i++) pbData[i] = (unsigned char)i; + + dwLen = 13; + result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, 16); + ok(result, "%08x\n", GetLastError()); + + ok(!memcmp(pbData, des, sizeof(des)) || broken(!memcmp(pbData, des_old_behavior, sizeof(des))) /* <= 2000 */, + "DES encryption failed!\n"); + + result = CryptDestroyKey(hKey); + ok(result, "%08x\n", GetLastError()); } static void test_3des(void)

1 0

Thomas Faber : gdi32: Do not omit mandatory argument to WriteFile.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: 07ca1afbd38b9f863c090dd0fd920469387e57fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ca1afbd38b9f863c090dd0f… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 12 10:35:15 2014 +0200 gdi32: Do not omit mandatory argument to WriteFile. --- dlls/gdi32/enhmfdrv/init.c | 6 ++++-- dlls/gdi32/mfdrv/init.c | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 18f9eae..682f412 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -193,6 +193,7 @@ static BOOL EMFDRV_DeleteDC( PHYSDEV dev ) BOOL EMFDRV_WriteRecord( PHYSDEV dev, EMR *emr ) { DWORD len; + DWORD bytes_written; ENHMETAHEADER *emh; EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE *)dev; @@ -205,7 +206,7 @@ BOOL EMFDRV_WriteRecord( PHYSDEV dev, EMR *emr ) physDev->emh->nRecords++; if(physDev->hFile) { - if (!WriteFile(physDev->hFile, emr, emr->nSize, NULL, NULL)) + if (!WriteFile(physDev->hFile, emr, emr->nSize, &bytes_written, NULL)) return FALSE; } else { DWORD nEmfSize = HeapSize(GetProcessHeap(), 0, physDev->emh); @@ -316,6 +317,7 @@ HDC WINAPI CreateEnhMetaFileW( EMFDRV_PDEVICE *physDev; HANDLE hFile; DWORD size = 0, length = 0; + DWORD bytes_written; TRACE("%s\n", debugstr_w(filename) ); @@ -407,7 +409,7 @@ HDC WINAPI CreateEnhMetaFileW( free_dc_ptr( dc ); return 0; } - if (!WriteFile( hFile, physDev->emh, size, NULL, NULL )) { + if (!WriteFile( hFile, physDev->emh, size, &bytes_written, NULL )) { free_dc_ptr( dc ); CloseHandle( hFile ); return 0; diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 8f312a1..7b53244 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -321,6 +321,7 @@ HDC WINAPI CreateMetaFileW( LPCWSTR filename ) DC *dc; METAFILEDRV_PDEVICE *physDev; HANDLE hFile; + DWORD bytes_written; TRACE("%s\n", debugstr_w(filename) ); @@ -335,8 +336,8 @@ HDC WINAPI CreateMetaFileW( LPCWSTR filename ) free_dc_ptr( dc ); return 0; } - if (!WriteFile( hFile, physDev->mh, sizeof(*physDev->mh), NULL, - NULL )) { + if (!WriteFile( hFile, physDev->mh, sizeof(*physDev->mh), + &bytes_written, NULL )) { free_dc_ptr( dc ); CloseHandle (hFile ); return 0; @@ -387,6 +388,7 @@ static DC *MFDRV_CloseMetaFile( HDC hdc ) { DC *dc; METAFILEDRV_PDEVICE *physDev; + DWORD bytes_written; TRACE("(%p)\n", hdc ); @@ -423,7 +425,7 @@ static DC *MFDRV_CloseMetaFile( HDC hdc ) physDev->mh->mtType = METAFILE_MEMORY; /* This is what windows does */ if (!WriteFile(physDev->hFile, physDev->mh, sizeof(*physDev->mh), - NULL, NULL)) { + &bytes_written, NULL)) { free_dc_ptr( dc ); return 0; }

1 0

Jacek Caban : mshtml: Added IDispatch support for IHTMLTable[23] interfaces.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: cf50d5f70054c9759f4da89343c0ced62e76643f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf50d5f70054c9759f4da8934… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 14 11:57:36 2014 +0200 mshtml: Added IDispatch support for IHTMLTable[23] interfaces. --- dlls/mshtml/htmltable.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index fd7c265..de12537 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -946,6 +946,8 @@ static const NodeImplVtbl HTMLTableImplVtbl = { static const tid_t HTMLTable_iface_tids[] = { HTMLELEMENT_TIDS, IHTMLTable_tid, + IHTMLTable2_tid, + IHTMLTable3_tid, 0 };

1 0

Henri Verbeet : wined3d: Make wined3d_arbfp_blit_rb_functions static.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: 8b8af4bee0ad1f65cfbdd4d3c951b71186eee68a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b8af4bee0ad1f65cfbdd4d3c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 14 10:04:25 2014 +0200 wined3d: Make wined3d_arbfp_blit_rb_functions static. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 819a04f..d312ecf 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6791,7 +6791,7 @@ static void arbfp_free_blit_shader(struct wine_rb_entry *entry, void *context) HeapFree(GetProcessHeap(), 0, entry_arb); } -const struct wine_rb_functions wined3d_arbfp_blit_rb_functions = +static const struct wine_rb_functions wined3d_arbfp_blit_rb_functions = { wined3d_rb_alloc, wined3d_rb_realloc,

1 0

Henri Verbeet : wined3d: Always mark vertex buffers as used in context_apply_draw_state().
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: 68339456a8f7543ae46ac504c2ce7f4f0221a789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68339456a8f7543ae46ac504c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 14 10:04:21 2014 +0200 wined3d: Always mark vertex buffers as used in context_apply_draw_state(). The issue this solves is that buffer_internal_preload() is only called when STATE_VDECL or STATE_STREAMSRC is invalidated, but that doesn't happen for regular buffer maps. We'd like to be able to just call buffer_internal_preload() here, but buffer_internal_preload() has dependencies on context_stream_info_from_declaration() and vice versa. --- dlls/wined3d/buffer.c | 7 ++++++- dlls/wined3d/context.c | 11 +++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index fbbe398..901382c 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -721,6 +721,11 @@ static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined checkGLcall("glUnmapBufferARB"); } +void buffer_mark_used(struct wined3d_buffer *buffer) +{ + buffer->flags &= ~(WINED3D_BUFFER_NOSYNC | WINED3D_BUFFER_DISCARD); +} + /* Context activation is done by the caller. */ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) @@ -741,7 +746,7 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte return; } - buffer->flags &= ~(WINED3D_BUFFER_NOSYNC | WINED3D_BUFFER_DISCARD); + buffer_mark_used(buffer); if (!buffer->buffer_object) { diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 32cc191..e8423f4 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2958,6 +2958,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de const struct StateEntry *state_table = context->state_table; const struct wined3d_fb_state *fb = state->fb; unsigned int i; + WORD map; if (!context_validate_rt_config(context->gl_info->limits.buffers, fb->render_targets, fb->depth_stencil)) @@ -2974,7 +2975,17 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de context_update_tex_unit_map(context, state); context_preload_textures(context, state); if (isStateDirty(context, STATE_VDECL) || isStateDirty(context, STATE_STREAMSRC)) + { context_update_stream_info(context, state); + } + else + { + for (i = 0, map = context->stream_info.use_map; map; map >>= 1, ++i) + { + if (map & 1) + buffer_mark_used(state->streams[context->stream_info.elements[i].stream_idx].buffer); + } + } if (state->index_buffer) { if (context->stream_info.all_vbo) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8f411cd..0c11528 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2590,6 +2590,7 @@ void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *co BYTE *buffer_get_sysmem(struct wined3d_buffer *This, 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; struct wined3d_rendertarget_view {

1 0

Austin English : setupapi: Add a stub for SetupDiSetClassInstallParamsW.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: 3013b6c6da9f02fa7afc3b49a036d063d4c4837a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3013b6c6da9f02fa7afc3b49a… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jul 13 16:45:25 2014 -0700 setupapi: Add a stub for SetupDiSetClassInstallParamsW. --- dlls/setupapi/devinst.c | 14 ++++++++++++++ dlls/setupapi/setupapi.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index ef56d2b..966af75 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3648,6 +3648,20 @@ BOOL WINAPI SetupDiSetClassInstallParamsA( } /*********************************************************************** + * SetupDiSetClassInstallParamsW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiSetClassInstallParamsW( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + PSP_CLASSINSTALL_HEADER ClassInstallParams, + DWORD ClassInstallParamsSize) +{ + FIXME("%p %p %x %u\n",DeviceInfoSet, DeviceInfoData, + ClassInstallParams->InstallFunction, ClassInstallParamsSize); + return FALSE; +} + +/*********************************************************************** * SetupDiCallClassInstaller (SETUPAPI.@) */ BOOL WINAPI SetupDiCallClassInstaller( diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index a8ce41a..48ab1e4 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -384,7 +384,7 @@ @ stub SetupDiSelectDevice @ stub SetupDiSelectOEMDrv @ stdcall SetupDiSetClassInstallParamsA(ptr ptr ptr long) -@ stub SetupDiSetClassInstallParamsW +@ stdcall SetupDiSetClassInstallParamsW(ptr ptr ptr long) @ stdcall SetupDiSetDeviceInstallParamsA(ptr ptr ptr) @ stub SetupDiSetDeviceInstallParamsW @ stdcall SetupDiSetDeviceRegistryPropertyA(ptr ptr long ptr ptr)

1 0

Bruno Jesus : wineconsole: Free registry key name (valgrind).
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: 421d3cd9e802ec63fe5928b4f331ff85064f83d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=421d3cd9e802ec63fe5928b4f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jul 12 16:02:13 2014 -0300 wineconsole: Free registry key name (valgrind). --- programs/wineconsole/wineconsole.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 7698521..3c2faf5 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -519,6 +519,7 @@ static void WINECON_Delete(struct inner_data* data) if (data->hConIn) CloseHandle(data->hConIn); if (data->hConOut) CloseHandle(data->hConOut); if (data->hSynchro) CloseHandle(data->hSynchro); + HeapFree(GetProcessHeap(), 0, data->curcfg.registry); HeapFree(GetProcessHeap(), 0, data->cells); HeapFree(GetProcessHeap(), 0, data); }

1 0

Bruno Jesus : psapi/tests: Free buffer on error (valgrind).
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: 78eac8156e93d65cc15c7e7241ec90639bea3d24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78eac8156e93d65cc15c7e724… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jul 12 15:24:36 2014 -0300 psapi/tests: Free buffer on error (valgrind). --- dlls/psapi/tests/psapi_main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index ee7e8bd..62d4f5c 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -228,7 +228,11 @@ static BOOL nt_get_mapped_file_name(HANDLE process, LPVOID addr, LPWSTR name, DW todo_wine ok(!status, "NtQueryVirtualMemory error %x\n", status); /* FIXME: remove once Wine is fixed */ - if (status) return FALSE; + if (status) + { + HeapFree(GetProcessHeap(), 0, buf); + return FALSE; + } section_name = (MEMORY_SECTION_NAME *)buf; ok(ret_len == section_name->SectionFileName.MaximumLength + sizeof(*section_name), "got %lu, %u\n",

1 0

Bruno Jesus : dinput/tests: Release the instance after tests (valgrind).
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: 1242417d131ae9fafd66ee79e96352a1e0215fc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1242417d131ae9fafd66ee79e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jul 12 13:40:04 2014 -0300 dinput/tests: Release the instance after tests (valgrind). --- dlls/dinput/tests/dinput.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index cc28985..0490642 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -603,6 +603,7 @@ static void test_DirectInputJoyConfig8(void) "IDirectInput_CreateDevice failed with guid from GetConfig hr = 0x%08x\n", hr); } + IDirectInput_Release(pDI); } START_TEST(dinput)

1 0

Piotr Caban : usp10: Limit trace length in dump_types.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: 6d7ce98fec4bbdff86bd901e91e5636bd6680bcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d7ce98fec4bbdff86bd901e9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jul 12 11:56:56 2014 +0200 usp10: Limit trace length in dump_types. --- dlls/usp10/bidi.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 63ffa6a..2926454 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -146,10 +146,15 @@ static const char debug_type[][4] = static inline void dump_types(const char* header, WORD *types, int start, int end) { - int i; + int i, len = 0; TRACE("%s:",header); - for (i = start; i< end; i++) + for (i = start; i < end && len < 200; i++) + { TRACE(" %s",debug_type[types[i]]); + len += strlen(debug_type[types[i]])+1; + } + if (i != end) + TRACE("..."); TRACE("\n"); }

1 0

Thomas Faber : dxdiag: Do not omit mandatory argument to WriteFile.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: f325bf745872cfeec383f33ea2b19dcaa67361c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f325bf745872cfeec383f33ea… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 12 10:40:12 2014 +0200 dxdiag: Do not omit mandatory argument to WriteFile. --- programs/dxdiag/output.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/programs/dxdiag/output.c b/programs/dxdiag/output.c index 7fb9a4c..c18c75d 100644 --- a/programs/dxdiag/output.c +++ b/programs/dxdiag/output.c @@ -72,6 +72,7 @@ static BOOL output_text_header(HANDLE hFile, const char *caption) DWORD len = strlen(caption); DWORD total_len = 3 * (len + sizeof(crlf)); char *ptr = output_buffer; + DWORD bytes_written; assert(total_len <= sizeof(output_buffer)); @@ -92,7 +93,7 @@ static BOOL output_text_header(HANDLE hFile, const char *caption) memcpy(ptr, crlf, sizeof(crlf)); - return WriteFile(hFile, output_buffer, total_len, NULL, NULL); + return WriteFile(hFile, output_buffer, total_len, &bytes_written, NULL); } static BOOL output_text_field(HANDLE hFile, const char *field_name, DWORD field_width, const WCHAR *value) @@ -102,6 +103,7 @@ static BOOL output_text_field(HANDLE hFile, const char *field_name, DWORD field_ DWORD total_len = field_width + sizeof(": ") - 1 + value_lenA + sizeof(crlf); char sprintf_fmt[1 + 10 + 3 + 1]; char *ptr = output_buffer; + DWORD bytes_written; assert(total_len <= sizeof(output_buffer)); @@ -111,12 +113,13 @@ static BOOL output_text_field(HANDLE hFile, const char *field_name, DWORD field_ ptr += WideCharToMultiByte(CP_ACP, 0, value, value_lenW, ptr, value_lenA, NULL, NULL); memcpy(ptr, crlf, sizeof(crlf)); - return WriteFile(hFile, output_buffer, total_len, NULL, NULL); + return WriteFile(hFile, output_buffer, total_len, &bytes_written, NULL); } static BOOL output_crlf(HANDLE hFile) { - return WriteFile(hFile, crlf, sizeof(crlf), NULL, NULL); + DWORD bytes_written; + return WriteFile(hFile, crlf, sizeof(crlf), &bytes_written, NULL); } static inline void fill_system_text_output_table(struct dxdiag_information *dxdiag_info, struct text_information_field *fields)

1 0

Piotr Caban : usp10: Limit trace length in iso_dump_types.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: 43871921204d4b598f55b6be1bfab076572ae69c URL: http://source.winehq.org/git/wine.git/?a=commit;h=43871921204d4b598f55b6be1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jul 12 11:57:12 2014 +0200 usp10: Limit trace length in iso_dump_types. --- dlls/usp10/bidi.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 2926454..5b227d8 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -513,11 +513,16 @@ static inline int iso_previousChar(IsolatedRun *iso_run, int index) static inline void iso_dump_types(const char* header, IsolatedRun *iso_run) { - int i; + int i, len = 0; TRACE("%s:",header); TRACE("[ "); - for (i = 0; i < iso_run->length; i++) + for (i = 0; i < iso_run->length && len < 200; i++) + { TRACE(" %s",debug_type[*iso_run->item[i].pcls]); + len += strlen(debug_type[*iso_run->item[i].pcls])+1; + } + if (i != iso_run->length) + TRACE("..."); TRACE(" ]\n"); }

1 0

Henri Verbeet : wined3d: Don' t try to resolve vertex buffer locations in context_stream_info_from_declaration ().
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: 1360af6adcbc5c77a7b3c5e32f3c886e450456f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1360af6adcbc5c77a7b3c5e32… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 14 10:04:22 2014 +0200 wined3d: Don't try to resolve vertex buffer locations in context_stream_info_from_declaration(). --- dlls/wined3d/context.c | 99 +++++++++++++++++++++++--------------------------- dlls/wined3d/device.c | 18 +++++---- 2 files changed, 55 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1360af6adcbc5c77a7b3c…

1 0

Bruno Jesus : rsaenh/tests: Make the tests pass in Windows <= NT4.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: 50ded4b2f8eb84001a318487dcffd9bec175fc90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50ded4b2f8eb84001a318487d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jul 12 13:11:14 2014 -0300 rsaenh/tests: Make the tests pass in Windows <= NT4. --- dlls/rsaenh/tests/rsaenh.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index abc90e1..c90bc79 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -450,6 +450,11 @@ static void test_hashes(void) ok(!result && GetLastError() == NTE_BAD_FLAGS, "%08x\n", GetLastError()); result = CryptHashData(hHash, pbData, sizeof(pbData), CRYPT_USERDATA); + if (!result && GetLastError() == NTE_BAD_FLAGS) /* <= NT4 */ + { + ok(broken(1), "Failed to support CRYPT_USERDATA flag\n"); + result = CryptHashData(hHash, pbData, sizeof(pbData), 0); + } ok(result, "%08x\n", GetLastError()); len = sizeof(DWORD); @@ -477,6 +482,11 @@ static void test_hashes(void) ok(!result && GetLastError() == NTE_BAD_FLAGS, "%08x\n", GetLastError()); result = CryptHashData(hHash, pbData, sizeof(pbData), CRYPT_USERDATA); + if (!result && GetLastError() == NTE_BAD_FLAGS) /* <= NT4 */ + { + ok(broken(1), "Failed to support CRYPT_USERDATA flag\n"); + result = CryptHashData(hHash, pbData, sizeof(pbData), 0); + } ok(result, "%08x\n", GetLastError()); len = 16; @@ -526,6 +536,11 @@ static void test_hashes(void) ok(result, "%08x\n", GetLastError()); result = CryptHashData(hHash, pbData, 5, CRYPT_USERDATA); + if (!result && GetLastError() == NTE_BAD_FLAGS) /* <= NT4 */ + { + ok(broken(1), "Failed to support CRYPT_USERDATA flag\n"); + result = CryptHashData(hHash, pbData, 5, 0); + } ok(result, "%08x\n", GetLastError()); if(pCryptDuplicateHash) {

1 0

Henri Verbeet : wined3d: Clarify WINED3DUSAGE_WRITEONLY a bit.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: 63f2b65141ada3e5c5ba55d606c0f2bf6dc7c626 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63f2b65141ada3e5c5ba55d60… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 14 10:04:23 2014 +0200 wined3d: Clarify WINED3DUSAGE_WRITEONLY a bit. --- dlls/wined3d/resource.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index caec580..934cabc 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -59,6 +59,12 @@ static void resource_check_usage(DWORD usage) | WINED3DUSAGE_OVERLAY | WINED3DUSAGE_TEXTURE; + /* WINED3DUSAGE_WRITEONLY is supposed to result in write-combined mappings + * being returned. OpenGL doesn't give us explicit control over that, but + * the hints and access flags we set for typical access patterns on + * dynamic resources should in theory have the same effect on the OpenGL + * driver. */ + if (usage & ~handled) FIXME("Unhandled usage flags %#x.\n", usage & ~handled); if ((usage & (WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY)) == WINED3DUSAGE_DYNAMIC)

1 0

Bruno Jesus : rsaenh/tests: Add DES/3DES-112 const buffer test.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: c579945b98e86ad7dc7dbd4ae17a867d229cd6de URL: http://source.winehq.org/git/wine.git/?a=commit;h=c579945b98e86ad7dc7dbd4ae… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jul 12 13:11:30 2014 -0300 rsaenh/tests: Add DES/3DES-112 const buffer test. --- dlls/rsaenh/tests/rsaenh.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index c90bc79..4fabaad 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -802,6 +802,9 @@ static void test_3des112(void) BOOL result; DWORD dwLen; unsigned char pbData[16], enc_data[16], bad_data[16]; + static const BYTE des112[16] = { + 0x8e, 0x0c, 0x3c, 0xa3, 0x05, 0x88, 0x5f, 0x7a, + 0x32, 0xa1, 0x06, 0x52, 0x64, 0xd2, 0x44, 0x1c }; int i; result = derive_key(CALG_3DES_112, &hKey, 0); @@ -817,6 +820,8 @@ static void test_3des112(void) result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, 16); ok(result, "%08x\n", GetLastError()); + ok(!memcmp(pbData, des112, sizeof(des112)), "3DES_112 encryption failed!\n"); + result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); ok(result, "%08x\n", GetLastError()); @@ -886,9 +891,12 @@ static void test_des(void) BOOL result; DWORD dwLen, dwMode; unsigned char pbData[16], enc_data[16], bad_data[16]; + static const BYTE des[16] = { + 0x58, 0x86, 0x42, 0x46, 0x65, 0x4b, 0x92, 0x62, + 0xcf, 0x0f, 0x65, 0x37, 0x43, 0x7a, 0x82, 0xb9 }; int i; - result = derive_key(CALG_DES, &hKey, 56); + result = derive_key(CALG_DES, &hKey, 0); if (!result) { /* rsaenh compiled without OpenSSL */ ok(GetLastError()==NTE_BAD_ALGID, "%08x\n", GetLastError()); @@ -909,6 +917,8 @@ static void test_des(void) result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, 16); ok(result, "%08x\n", GetLastError()); + ok(!memcmp(pbData, des, sizeof(des)), "DES encryption failed!\n"); + result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); ok(result, "%08x\n", GetLastError());

1 0

Thomas Faber : cmd: Do not omit mandatory argument to WriteFile.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: d4c4f0ab95871201ff120b6382bfbe722293d539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4c4f0ab95871201ff120b638… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 12 10:39:13 2014 +0200 cmd: Do not omit mandatory argument to WriteFile. --- programs/cmd/builtins.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 4c95b43..cb7dfef 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -436,6 +436,7 @@ void WCMD_choice (const WCHAR * args) { static BOOL WCMD_AppendEOF(WCHAR *filename) { HANDLE h; + DWORD bytes_written; char eof = '\x1a'; @@ -448,7 +449,7 @@ static BOOL WCMD_AppendEOF(WCHAR *filename) return FALSE; } else { SetFilePointer (h, 0, NULL, FILE_END); - if (!WriteFile(h, &eof, 1, NULL, NULL)) { + if (!WriteFile(h, &eof, 1, &bytes_written, NULL)) { WINE_ERR("Failed to append EOF to %s (%d)\n", wine_dbgstr_w(filename), GetLastError()); CloseHandle(h); return FALSE;

1 0

Thomas Faber : wininet: Do not omit mandatory argument to WriteFile.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: 9609df86e3ad9ec90ca936c3f11de7c60a4482ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=9609df86e3ad9ec90ca936c3f… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 12 10:30:29 2014 +0200 wininet: Do not omit mandatory argument to WriteFile. --- dlls/wininet/cookie.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 34234db..2c8dd84 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -416,6 +416,7 @@ static BOOL save_persistent_cookie(cookie_container_t *container) BOOL do_save = FALSE; char buf[64], *dyn_buf; FILETIME time; + DWORD bytes_written; if (!create_cookie_url(container->domain->domain, container->path, cookie_url, sizeof(cookie_url)/sizeof(cookie_url[0]))) return FALSE; @@ -454,31 +455,31 @@ static BOOL save_persistent_cookie(cookie_container_t *container) continue; dyn_buf = heap_strdupWtoA(cookie_container->name); - if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), NULL, NULL)) { + if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), &bytes_written, NULL)) { heap_free(dyn_buf); do_save = FALSE; break; } heap_free(dyn_buf); - if(!WriteFile(cookie_handle, "\n", 1, NULL, NULL)) { + if(!WriteFile(cookie_handle, "\n", 1, &bytes_written, NULL)) { do_save = FALSE; break; } dyn_buf = heap_strdupWtoA(cookie_container->data); - if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), NULL, NULL)) { + if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), &bytes_written, NULL)) { heap_free(dyn_buf); do_save = FALSE; break; } heap_free(dyn_buf); - if(!WriteFile(cookie_handle, "\n", 1, NULL, NULL)) { + if(!WriteFile(cookie_handle, "\n", 1, &bytes_written, NULL)) { do_save = FALSE; break; } dyn_buf = heap_strdupWtoA(container->domain->domain); - if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), NULL, NULL)) { + if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), &bytes_written, NULL)) { heap_free(dyn_buf); do_save = FALSE; break; @@ -486,7 +487,7 @@ static BOOL save_persistent_cookie(cookie_container_t *container) heap_free(dyn_buf); dyn_buf = heap_strdupWtoA(container->path); - if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), NULL, NULL)) { + if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), &bytes_written, NULL)) { heap_free(dyn_buf); do_save = FALSE; break; @@ -496,7 +497,7 @@ static BOOL save_persistent_cookie(cookie_container_t *container) sprintf(buf, "\n%u\n%u\n%u\n%u\n%u\n*\n", cookie_container->flags, cookie_container->expiry.dwLowDateTime, cookie_container->expiry.dwHighDateTime, cookie_container->create.dwLowDateTime, cookie_container->create.dwHighDateTime); - if(!WriteFile(cookie_handle, buf, strlen(buf), NULL, NULL)) { + if(!WriteFile(cookie_handle, buf, strlen(buf), &bytes_written, NULL)) { do_save = FALSE; break; }

1 0

Jacek Caban : wininet: Rewrite structs storing cookies to represent domains as a tree.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: 4707b4483bfaa4ef55c6c0665dd20fe6c26226e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4707b4483bfaa4ef55c6c0665… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 14 15:21:38 2014 +0200 wininet: Rewrite structs storing cookies to represent domains as a tree. --- dlls/wininet/cookie.c | 571 ++++++++++++++++++++++++++------------------------ 1 file changed, 301 insertions(+), 270 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4707b4483bfaa4ef55c6c…

1 0

Thomas Faber : d3dx9_36: Do not omit mandatory argument to WriteFile.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: 5bd5c89596f66bb13a0f2ceb4be41dd24b438d83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bd5c89596f66bb13a0f2ceb4… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 12 10:32:44 2014 +0200 d3dx9_36: Do not omit mandatory argument to WriteFile. --- dlls/d3dx9_36/util.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 3b3f308..94899cf 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -181,6 +181,7 @@ HRESULT write_buffer_to_file(const WCHAR *dst_filename, ID3DXBuffer *buffer) HRESULT hr = S_OK; void *buffer_pointer; DWORD buffer_size; + DWORD bytes_written; HANDLE file = CreateFileW(dst_filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (file == INVALID_HANDLE_VALUE) return HRESULT_FROM_WIN32(GetLastError()); @@ -188,7 +189,7 @@ HRESULT write_buffer_to_file(const WCHAR *dst_filename, ID3DXBuffer *buffer) buffer_pointer = ID3DXBuffer_GetBufferPointer(buffer); buffer_size = ID3DXBuffer_GetBufferSize(buffer); - if (!WriteFile(file, buffer_pointer, buffer_size, NULL, NULL)) + if (!WriteFile(file, buffer_pointer, buffer_size, &bytes_written, NULL)) hr = HRESULT_FROM_WIN32(GetLastError()); CloseHandle(file);

1 0

Thomas Faber : d3dxof: Do not omit mandatory argument to WriteFile.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: 21b821677394ce760ad4e3065031f2d358961bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=21b821677394ce760ad4e3065… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 12 10:33:21 2014 +0200 d3dxof: Do not omit mandatory argument to WriteFile. --- dlls/d3dxof/d3dxof.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 4172c62..8ca5793 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -136,6 +136,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV HRESULT hr; LPBYTE file_buffer; DWORD file_size; + DWORD bytes_written; TRACE("(%p/%p)->(%p,%x,%p)\n", This, iface, pvSource, dwLoadOptions, ppEnumObj); @@ -240,7 +241,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV file = CreateFileA(tmp, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, NULL); if (file != INVALID_HANDLE_VALUE) { - WriteFile(file, file_buffer, file_size, NULL, NULL); + WriteFile(file, file_buffer, file_size, &bytes_written, NULL); CloseHandle(file); } } @@ -304,6 +305,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP parse_buffer buf; HRESULT hr; LPBYTE decomp_buffer = NULL; + DWORD bytes_written; ZeroMemory(&buf, sizeof(buf)); buf.buffer = pvData; @@ -325,7 +327,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP file = CreateFileA(tmp, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, NULL); if (file != INVALID_HANDLE_VALUE) { - WriteFile(file, pvData, cbSize, NULL, NULL); + WriteFile(file, pvData, cbSize, &bytes_written, NULL); CloseHandle(file); } }

1 0

Jacek Caban : wininet: Use stored server name in HTTP_InsertCookies.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: ffec675b4f1dfdadda6635f2a819b126ac00338c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffec675b4f1dfdadda6635f2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 14 15:21:11 2014 +0200 wininet: Use stored server name in HTTP_InsertCookies. --- dlls/wininet/http.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ffd31e6..8ff42a2 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4177,16 +4177,11 @@ static LPWSTR HTTP_build_req( LPCWSTR *list, int len ) static void HTTP_InsertCookies(http_request_t *request) { DWORD cookie_size, size, cnt = 0; - HTTPHEADERW *host; WCHAR *cookies; static const WCHAR cookieW[] = {'C','o','o','k','i','e',':',' ',0}; - host = HTTP_GetHeader(request, hostW); - if(!host) - return; - - if(get_cookie(host->lpszValue, request->path, NULL, &cookie_size, INTERNET_COOKIE_HTTPONLY) != ERROR_SUCCESS) + if(get_cookie(request->server->name, request->path, NULL, &cookie_size, INTERNET_COOKIE_HTTPONLY) != ERROR_SUCCESS) return; size = sizeof(cookieW) + cookie_size * sizeof(WCHAR) + sizeof(szCrLf); @@ -4194,7 +4189,7 @@ static void HTTP_InsertCookies(http_request_t *request) return; cnt += sprintfW(cookies, cookieW); - get_cookie(host->lpszValue, request->path, cookies+cnt, &cookie_size, INTERNET_COOKIE_HTTPONLY); + get_cookie(request->server->name, request->path, cookies+cnt, &cookie_size, INTERNET_COOKIE_HTTPONLY); strcatW(cookies, szCrLf); HTTP_HttpAddRequestHeadersW(request, cookies, strlenW(cookies), HTTP_ADDREQ_FLAG_REPLACE);

1 0