June 2015 - Wine-Commits - list.winehq.org

Matteo Bruni : d3d9/tests: Test the default diffuse color for vertex shaders.
by Alexandre Julliard June 12, 2015

June 12, 2015

Module: wine Branch: master Commit: 3c7e48a13246866ece788a52c95e8b81e5100d40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c7e48a13246866ece788a52c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 11 23:13:38 2015 +0200 d3d9/tests: Test the default diffuse color for vertex shaders. --- dlls/d3d9/tests/visual.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index ae67d5c..c0ed616 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7388,6 +7388,7 @@ static void test_vshader_input(void) { IDirect3DVertexDeclaration9 *decl_twotexcrd, *decl_onetexcrd, *decl_twotex_wrongidx, *decl_twotexcrd_rightorder; IDirect3DVertexDeclaration9 *decl_texcoord_color, *decl_color_color, *decl_color_ubyte, *decl_color_float; + IDirect3DVertexDeclaration9 *decl_nocolor; IDirect3DVertexShader9 *swapped_shader, *texcoord_color_shader, *color_color_shader; D3DADAPTER_IDENTIFIER9 identifier; IDirect3DPixelShader9 *ps; @@ -7576,6 +7577,13 @@ static void test_vshader_input(void) 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, 0.0f, 1.0f, }; + static const struct vec3 quad_nocolor[] = + { + {-1.0f, -1.0f, 0.1f}, + {-1.0f, 1.0f, 0.1f}, + { 1.0f, -1.0f, 0.1f}, + { 1.0f, 1.0f, 0.1f}, + }; static const D3DVERTEXELEMENT9 decl_elements_twotexcrd[] = { {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, @@ -7627,6 +7635,11 @@ static void test_vshader_input(void) {0, 12, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0}, D3DDECL_END() }; + static const D3DVERTEXELEMENT9 decl_elements_nocolor[] = + { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + D3DDECL_END() + }; static const float normalize[4] = {1.0f / 256.0f, 1.0f / 256.0f, 1.0f / 256.0f, 1.0f / 256.0f}; static const float no_normalize[4] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -7670,6 +7683,8 @@ static void test_vshader_input(void) ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexDeclaration returned %08x\n", hr); hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements_color_float, &decl_color_float); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexDeclaration returned %08x\n", hr); + hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements_nocolor, &decl_nocolor); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexDeclaration returned %08x\n", hr); hr = IDirect3DDevice9_CreatePixelShader(device, ps3_code, &ps); ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader returned %08x\n", hr); @@ -7876,10 +7891,6 @@ static void test_vshader_input(void) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - IDirect3DDevice9_SetVertexShader(device, NULL); - IDirect3DDevice9_SetVertexDeclaration(device, NULL); - IDirect3DDevice9_SetPixelShader(device, NULL); - color = getPixelColor(device, 160, 360); ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xff, 0x80, 0x40), 1), "Input test: Quad 1(color-texcoord) returned color 0x%08x, expected 0x00ff8040\n", color); @@ -7896,6 +7907,30 @@ static void test_vshader_input(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + hr = IDirect3DDevice9_SetVertexDeclaration(device, decl_nocolor); + ok(SUCCEEDED(hr), "Failed to set vertex declaration, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad_nocolor, sizeof(quad_nocolor[0])); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + /* WARP ends up using the color attribute from the previous draw. Let's mark + * that behavior as broken. */ + color = getPixelColor(device, 160, 360); + ok(color_match(color, 0x00000000, 1) + || broken(color_match(color, 0x00ffff00, 1)), + "Got unexpected color 0x%08x for no color attribute test.\n", color); + + IDirect3DDevice9_SetVertexShader(device, NULL); + IDirect3DDevice9_SetVertexDeclaration(device, NULL); + IDirect3DDevice9_SetPixelShader(device, NULL); + IDirect3DVertexShader9_Release(texcoord_color_shader); IDirect3DVertexShader9_Release(color_color_shader); } @@ -7909,6 +7944,7 @@ static void test_vshader_input(void) IDirect3DVertexDeclaration9_Release(decl_color_color); IDirect3DVertexDeclaration9_Release(decl_color_ubyte); IDirect3DVertexDeclaration9_Release(decl_color_float); + IDirect3DVertexDeclaration9_Release(decl_nocolor); IDirect3DPixelShader9_Release(ps); refcount = IDirect3DDevice9_Release(device);

1 0

Iván Matellanes : msvcirt: Fix implementation of streambuf::sync.
by Alexandre Julliard June 12, 2015

June 12, 2015

Module: wine Branch: master Commit: c69ac67206c833d7b44d18d4e928fd41005ef636 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c69ac67206c833d7b44d18d4e… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jun 12 11:51:54 2015 +0200 msvcirt: Fix implementation of streambuf::sync. --- dlls/msvcirt/msvcirt.c | 2 +- dlls/msvcirt/tests/msvcirt.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index ae644b3..8c05fe3 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -457,7 +457,7 @@ DEFINE_THISCALL_WRAPPER(streambuf_sync, 4) int __thiscall streambuf_sync(streambuf *this) { TRACE("(%p)\n", this); - return (this->gptr == this->egptr && this->pbase == this->pptr) ? 0 : EOF; + return (this->gptr >= this->egptr && this->pbase >= this->pptr) ? 0 : EOF; } /* ?unbuffered(a)streambuf@@IAEXH(a)Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 3ee987b..1a6ce5d 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -372,7 +372,7 @@ static void test_streambuf(void) ok(ret == 0, "sync failed, expected 0 got %d\n", ret); sb.gptr = sb.egptr + 1; ret = (int) call_func1(p_streambuf_sync, &sb); - todo_wine ok(ret == 0, "sync failed, expected 0 got %d\n", ret); + ok(ret == 0, "sync failed, expected 0 got %d\n", ret); sb.gptr = sb.eback; ret = (int) call_func1(p_streambuf_sync, &sb2); ok(ret == EOF, "sync failed, expected EOF got %d\n", ret); @@ -381,7 +381,7 @@ static void test_streambuf(void) ok(ret == 0, "sync failed, expected 0 got %d\n", ret); sb2.pptr = sb2.pbase - 1; ret = (int) call_func1(p_streambuf_sync, &sb2); - todo_wine ok(ret == 0, "sync failed, expected 0 got %d\n", ret); + ok(ret == 0, "sync failed, expected 0 got %d\n", ret); sb2.pptr = sb2.epptr; ret = (int) call_func1(p_streambuf_sync, &sb3); ok(ret == 0, "sync failed, expected 0 got %d\n", ret);

1 0

Iván Matellanes : msvcirt/tests: Add more streambuf tests.
by Alexandre Julliard June 12, 2015

June 12, 2015

Module: wine Branch: master Commit: b36a526f5a568bd0075e264c73e1650aa2436980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b36a526f5a568bd0075e264c7… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jun 12 11:51:48 2015 +0200 msvcirt/tests: Add more streambuf tests. --- dlls/msvcirt/tests/msvcirt.c | 51 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 057c6c8..3ee987b 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -196,7 +196,7 @@ static DWORD WINAPI lock_streambuf(void *arg) static void test_streambuf(void) { - streambuf sb, sb2, *psb; + streambuf sb, sb2, sb3, *psb; struct streambuf_lock_arg lock_arg; HANDLE thread; char reserve[16]; @@ -205,6 +205,7 @@ static void test_streambuf(void) memset(&sb, 0xab, sizeof(streambuf)); memset(&sb2, 0xab, sizeof(streambuf)); + memset(&sb3, 0xab, sizeof(streambuf)); /* constructors */ call_func1(p_streambuf_ctor, &sb); @@ -219,6 +220,11 @@ static void test_streambuf(void) ok(sb2.base == reserve, "wrong base pointer, expected %p got %p\n", reserve, sb2.base); ok(sb2.ebuf == reserve+16, "wrong ebuf pointer, expected %p got %p\n", reserve+16, sb2.ebuf); ok(sb.lock.LockCount == -1, "wrong critical section state, expected -1 got %d\n", sb.lock.LockCount); + call_func1(p_streambuf_ctor, &sb3); + ok(sb3.allocated == 0, "wrong allocate value, expected 0 got %d\n", sb3.allocated); + ok(sb3.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", sb3.unbuffered); + ok(sb3.base == NULL, "wrong base pointer, expected %p got %p\n", NULL, sb3.base); + ok(sb3.ebuf == NULL, "wrong ebuf pointer, expected %p got %p\n", NULL, sb3.ebuf); /* setlock */ ok(sb.do_lock == -1, "expected do_lock value -1, got %d\n", sb.do_lock); @@ -326,34 +332,58 @@ static void test_streambuf(void) ok(ret == 1, "doallocate failed, got %d\n", ret); ok(sb2.allocated == 1, "wrong allocate value, expected 1 got %d\n", sb2.allocated); ok(sb2.ebuf - sb2.base == 512 , "wrong reserve area size, expected 512 got %p-%p\n", sb2.ebuf, sb2.base); + ret = (int) call_func1(p_streambuf_doallocate, &sb3); + ok(ret == 1, "doallocate failed, got %d\n", ret); + ok(sb3.allocated == 1, "wrong allocate value, expected 1 got %d\n", sb3.allocated); + ok(sb3.ebuf - sb3.base == 512 , "wrong reserve area size, expected 512 got %p-%p\n", sb3.ebuf, sb3.base); + + /* sb: buffered, space available */ + sb.eback = sb.gptr = sb.base; + sb.egptr = sb.base + 256; + sb.pbase = sb.pptr = sb.base + 256; + sb.epptr = sb.base + 512; + /* sb2: buffered, no space available */ + sb2.eback = sb2.base; + sb2.gptr = sb2.egptr = sb2.base + 256; + sb2.pbase = sb2.base + 256; + sb2.pptr = sb2.epptr = sb2.base + 512; + /* sb3: unbuffered */ + sb3.unbuffered = 1; /* gbump */ - sb.eback = sb.base + 100; - sb.gptr = sb.base + 104; - sb.egptr = sb.base + 110; call_func2(p_streambuf_gbump, &sb, 10); - ok(sb.gptr == sb.eback + 14, "advance get pointer failed, expected %p got %p\n", sb.eback + 14, sb.gptr); + ok(sb.gptr == sb.eback + 10, "advance get pointer failed, expected %p got %p\n", sb.eback + 10, sb.gptr); call_func2(p_streambuf_gbump, &sb, -15); - ok(sb.gptr == sb.eback - 1, "advance get pointer failed, expected %p got %p\n", sb.eback - 1, sb.gptr); + ok(sb.gptr == sb.eback - 5, "advance get pointer failed, expected %p got %p\n", sb.eback - 5, sb.gptr); + sb.gptr = sb.eback; /* pbump */ - sb.pbase = sb.pptr = sb.base + 200; - sb.epptr = sb.base + 210; call_func2(p_streambuf_pbump, &sb, -2); ok(sb.pptr == sb.pbase - 2, "advance put pointer failed, expected %p got %p\n", sb.pbase - 2, sb.pptr); call_func2(p_streambuf_pbump, &sb, 20); ok(sb.pptr == sb.pbase + 18, "advance put pointer failed, expected %p got %p\n", sb.pbase + 18, sb.pptr); + sb.pptr = sb.pbase; /* sync */ ret = (int) call_func1(p_streambuf_sync, &sb); ok(ret == EOF, "sync failed, expected EOF got %d\n", ret); sb.gptr = sb.egptr; ret = (int) call_func1(p_streambuf_sync, &sb); - ok(ret == EOF, "sync failed, expected EOF got %d\n", ret); - sb.pptr = sb.pbase; + ok(ret == 0, "sync failed, expected 0 got %d\n", ret); + sb.gptr = sb.egptr + 1; ret = (int) call_func1(p_streambuf_sync, &sb); + todo_wine ok(ret == 0, "sync failed, expected 0 got %d\n", ret); + sb.gptr = sb.eback; + ret = (int) call_func1(p_streambuf_sync, &sb2); + ok(ret == EOF, "sync failed, expected EOF got %d\n", ret); + sb2.pptr = sb2.pbase; + ret = (int) call_func1(p_streambuf_sync, &sb2); ok(ret == 0, "sync failed, expected 0 got %d\n", ret); + sb2.pptr = sb2.pbase - 1; ret = (int) call_func1(p_streambuf_sync, &sb2); + todo_wine ok(ret == 0, "sync failed, expected 0 got %d\n", ret); + sb2.pptr = sb2.epptr; + ret = (int) call_func1(p_streambuf_sync, &sb3); ok(ret == 0, "sync failed, expected 0 got %d\n", ret); SetEvent(lock_arg.test[3]); @@ -361,6 +391,7 @@ static void test_streambuf(void) call_func1(p_streambuf_dtor, &sb); call_func1(p_streambuf_dtor, &sb2); + call_func1(p_streambuf_dtor, &sb3); for (i = 0; i < 4; i++) { CloseHandle(lock_arg.lock[i]); CloseHandle(lock_arg.test[i]);

1 0

Thomas Faller : cmd: Fix access of uninitialized memory.
by Alexandre Julliard June 12, 2015

June 12, 2015

Module: wine Branch: master Commit: 43dfe7637670d51ddab43c487e772109b7708fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43dfe7637670d51ddab43c487… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Thu Jun 11 22:14:11 2015 +0200 cmd: Fix access of uninitialized memory. --- 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 724da20..30b8684 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3313,7 +3313,8 @@ void WCMD_setshow_default (const WCHAR *args) { WINE_TRACE("Request change to directory '%s'\n", wine_dbgstr_w(args)); /* Skip /D and trailing whitespace if on the front of the command line */ - if (CompareStringW(LOCALE_USER_DEFAULT, + if (strlenW(args) >= 2 && + CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, args, 2, parmD, -1) == CSTR_EQUAL) { args += 2;

1 0

Huw Davies : user32/tests: Use the correct codepage for WM_CHAR tests.
by Alexandre Julliard June 12, 2015

June 12, 2015

Module: wine Branch: master Commit: 30c529c9f7baf683faf66a100a1e754949720aad URL: http://source.winehq.org/git/wine.git/?a=commit;h=30c529c9f7baf683faf66a100… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 12 10:34:32 2015 +0100 user32/tests: Use the correct codepage for WM_CHAR tests. --- dlls/user32/tests/msg.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 5ef3840..5cbfec8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11964,6 +11964,18 @@ static void test_SetForegroundWindow(void) DestroyWindow(hwnd); } +static DWORD get_input_codepage( void ) +{ + DWORD cp; + int ret; + HKL hkl = GetKeyboardLayout( 0 ); + + ret = GetLocaleInfoW( LOWORD(hkl), LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, + (WCHAR *)&cp, sizeof(cp) / sizeof(WCHAR) ); + if (!ret) cp = CP_ACP; + return cp; +} + static void test_dbcs_wm_char(void) { BYTE dbch[2]; @@ -11977,6 +11989,7 @@ static void test_dbcs_wm_char(void) UINT i, j, k; struct message wmCharSeq[2]; BOOL ret; + DWORD cp = get_input_codepage(); if (!pGetCPInfoExA) { @@ -11984,7 +11997,7 @@ static void test_dbcs_wm_char(void) return; } - pGetCPInfoExA( CP_ACP, 0, &cpinfo ); + pGetCPInfoExA( cp, 0, &cpinfo ); if (cpinfo.MaxCharSize != 2) { skip( "Skipping DBCS WM_CHAR test in SBCS codepage '%s'\n", cpinfo.CodePageName ); @@ -12002,8 +12015,8 @@ static void test_dbcs_wm_char(void) WCHAR wstr[2]; str[0] = j; str[1] = k; - if (MultiByteToWideChar( CP_ACP, 0, str, 2, wstr, 2 ) == 1 && - WideCharToMultiByte( CP_ACP, 0, wstr, 1, str, 2, NULL, NULL ) == 2 && + if (MultiByteToWideChar( cp, 0, str, 2, wstr, 2 ) == 1 && + WideCharToMultiByte( cp, 0, wstr, 1, str, 2, NULL, NULL ) == 2 && (BYTE)str[0] == j && (BYTE)str[1] == k && HIBYTE(wstr[0]) && HIBYTE(wstr[0]) != 0xff) {

1 0

Huw Davies : wininet/tests: Fix tests on Win 2k.
by Alexandre Julliard June 12, 2015

June 12, 2015

Module: wine Branch: master Commit: 53dbffd31430e168234925f8406e49e24b09c7d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53dbffd31430e168234925f84… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 12 10:34:13 2015 +0100 wininet/tests: Fix tests on Win 2k. --- dlls/wininet/tests/http.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index bd4ca54..df7dd07 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4838,7 +4838,13 @@ static void test_secure_connection(void) ok(req != NULL, "HttpOpenRequest failed\n"); ret = HttpSendRequestA(req, NULL, 0, NULL, 0); - ok(ret, "HttpSendRequest failed: %d\n", GetLastError()); + ok(ret || broken(GetLastError() == ERROR_INTERNET_CANNOT_CONNECT), + "HttpSendRequest failed: %d\n", GetLastError()); + if (!ret) + { + win_skip("Cannot connect to https.\n"); + goto done; + } size = sizeof(flags); ret = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_FLAGS, &flags, &size); @@ -4963,6 +4969,7 @@ static void test_secure_connection(void) } HeapFree(GetProcessHeap(), 0, certificate_structW); +done: InternetCloseHandle(req); InternetCloseHandle(con); InternetCloseHandle(ses);

1 0

Michael Stefaniuc : dmcompos: Get rid of the extra pointer to a DMUS_OBJECTDESC.
by Alexandre Julliard June 12, 2015

June 12, 2015

Module: wine Branch: master Commit: 06e988a5d3b34f81e16576817ece8ae6a3636296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06e988a5d3b34f81e16576817… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 11 23:17:13 2015 +0200 dmcompos: Get rid of the extra pointer to a DMUS_OBJECTDESC. --- dlls/dmcompos/chordmap.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c index 5ae8e8b..e3259e6 100644 --- a/dlls/dmcompos/chordmap.c +++ b/dlls/dmcompos/chordmap.c @@ -30,7 +30,6 @@ typedef struct IDirectMusicChordMapImpl { IDirectMusicChordMap IDirectMusicChordMap_iface; struct dmobject dmobj; LONG ref; - DMUS_OBJECTDESC *pDesc; } IDirectMusicChordMapImpl; /* IDirectMusicChordMapImpl IDirectMusicChordMap part: */ @@ -296,20 +295,20 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS switch (chunkID) { case DMUS_FOURCC_GUID_CHUNK: { TRACE_(dmfile)(": GUID chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_OBJECT; - IStream_Read (pStm, &This->pDesc->guidObject, chunkSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_OBJECT; + IStream_Read (pStm, &This->dmobj.desc.guidObject, chunkSize, NULL); break; } case DMUS_FOURCC_VERSION_CHUNK: { TRACE_(dmfile)(": version chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_VERSION; - IStream_Read (pStm, &This->pDesc->vVersion, chunkSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_VERSION; + IStream_Read (pStm, &This->dmobj.desc.vVersion, chunkSize, NULL); break; } case DMUS_FOURCC_CATEGORY_CHUNK: { TRACE_(dmfile)(": category chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_CATEGORY; - IStream_Read (pStm, This->pDesc->wszCategory, chunkSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_CATEGORY; + IStream_Read (pStm, This->dmobj.desc.wszCategory, chunkSize, NULL); break; } case FOURCC_LIST: { @@ -331,8 +330,8 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS case mmioFOURCC('I','N','A','M'): case DMUS_FOURCC_UNAM_CHUNK: { TRACE_(dmfile)(": name chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_NAME; - IStream_Read (pStm, This->pDesc->wszName, chunkSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_NAME; + IStream_Read (pStm, This->dmobj.desc.wszName, chunkSize, NULL); break; } case mmioFOURCC('I','A','R','T'): @@ -443,7 +442,6 @@ HRESULT WINAPI create_dmchordmap(REFIID lpcGUID, void **ppobj) (IUnknown *)&obj->IDirectMusicChordMap_iface); obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - obj->pDesc = &obj->dmobj.desc; DMCOMPOS_LockModule(); hr = IDirectMusicChordMap_QueryInterface(&obj->IDirectMusicChordMap_iface, lpcGUID, ppobj);

1 0

Ken Thomases : ntdll: Fix the "not found" status set by read_directory_stat() and read_directory_getattrlist() for when restart_scan is set.
by Alexandre Julliard June 12, 2015

June 12, 2015

Module: wine Branch: master Commit: 3b74ac0f088f0eed37ef9280f8a1d558a1ec46e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b74ac0f088f0eed37ef9280f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jun 11 16:04:14 2015 -0500 ntdll: Fix the "not found" status set by read_directory_stat() and read_directory_getattrlist() for when restart_scan is set. --- dlls/ntdll/directory.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 8e4db83..0e02f2e 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2103,7 +2103,7 @@ static int read_directory_stat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG info->next = 0; if (io->u.Status != STATUS_BUFFER_OVERFLOW) lseek( fd, 1, SEEK_CUR ); } - else io->u.Status = STATUS_NO_MORE_FILES; + else io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; } else if (!case_sensitive && ret && (errno == ENOENT || errno == ENOTDIR)) { @@ -2112,7 +2112,7 @@ static int read_directory_stat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG * read_directory_* function (we need to return the case-preserved * filename stored on the filesystem). */ ret = 0; - io->u.Status = STATUS_NO_MORE_FILES; + io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; } else { @@ -2197,11 +2197,11 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer info->next = 0; if (io->u.Status != STATUS_BUFFER_OVERFLOW) lseek( fd, 1, SEEK_CUR ); } - else io->u.Status = STATUS_NO_MORE_FILES; + else io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; } else if ((errno == ENOENT || errno == ENOTDIR) && !get_dir_case_sensitivity(".")) { - io->u.Status = STATUS_NO_MORE_FILES; + io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; ret = 0; } }

1 0

Piotr Caban : msvcr: Add _ungetch_nolock implementation.
by Alexandre Julliard June 12, 2015

June 12, 2015

Module: wine Branch: master Commit: 853d4343dba89b8df47d4f21f2170b52fcea1fa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=853d4343dba89b8df47d4f21f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 11 17:54:44 2015 +0200 msvcr: Add _ungetch_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/console.c | 17 +++++++++++++---- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 002ed36..194554b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1410,7 +1410,7 @@ @ stub _umask_s @ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock @ cdecl _ungetch(long) -@ stub _ungetch_nolock +@ cdecl _ungetch_nolock(long) @ cdecl _ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock @ stub _ungetwch @ stub _ungetwch_nolock diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 7b06c5f..9114632 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1768,7 +1768,7 @@ @ stub _umask_s @ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock @ cdecl _ungetch(long) -@ stub _ungetch_nolock +@ cdecl _ungetch_nolock(long) @ cdecl _ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock @ stub _ungetwch @ stub _ungetwch_nolock diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 64eb2f5..9537d79 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1782,7 +1782,7 @@ @ stub _umask_s @ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock @ cdecl _ungetch(long) -@ stub _ungetch_nolock +@ cdecl _ungetch_nolock(long) @ cdecl _ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock @ stub _ungetwch @ stub _ungetwch_nolock diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 0bef364..00f7ab2 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1090,7 +1090,7 @@ @ stub _umask_s @ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock @ cdecl _ungetch(long) -@ stub _ungetch_nolock +@ cdecl _ungetch_nolock(long) @ cdecl _ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock @ stub _ungetwch @ stub _ungetwch_nolock diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index fafed02..9384a3f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1065,7 +1065,7 @@ @ stub _umask_s @ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock @ cdecl _ungetch(long) -@ stub _ungetch_nolock +@ cdecl _ungetch_nolock(long) @ cdecl _ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock @ stub _ungetwch @ stub _ungetwch_nolock diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index ed8b728..0acaa03 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -280,19 +280,28 @@ char* CDECL _cgets(char* str) } /********************************************************************* - * _ungetch (MSVCRT.@) + * _ungetch_nolock (MSVCRT.@) */ -int CDECL _ungetch(int c) +int CDECL _ungetch_nolock(int c) { int retval = MSVCRT_EOF; - LOCK_CONSOLE; if (c != MSVCRT_EOF && __MSVCRT_console_buffer == MSVCRT_EOF) retval = __MSVCRT_console_buffer = c; - UNLOCK_CONSOLE; return retval; } /********************************************************************* + * _ungetch (MSVCRT.@) + */ +int CDECL _ungetch(int c) +{ + LOCK_CONSOLE; + c = _ungetch_nolock(c); + UNLOCK_CONSOLE; + return c; +} + +/********************************************************************* * _kbhit (MSVCRT.@) */ int CDECL _kbhit(void)

1 0

Michael Stefaniuc : dmcompos: Use the generic DirectMusicObject implementation for DMChordMap.
by Alexandre Julliard June 12, 2015

June 12, 2015

Module: wine Branch: master Commit: c64d41fa470cfe9127aea2bb975971adf6d3335e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c64d41fa470cfe9127aea2bb9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 11 23:16:06 2015 +0200 dmcompos: Use the generic DirectMusicObject implementation for DMChordMap. --- dlls/dmcompos/Makefile.in | 1 + dlls/dmcompos/chordmap.c | 152 ++++++++------------------------- dlls/dmcompos/dmobject.c | 185 +++++++++++++++++++++++++++++++++++++++++ dlls/dmcompos/dmobject.h | 55 ++++++++++++ dlls/dmcompos/tests/dmcompos.c | 6 +- 5 files changed, 278 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c64d41fa470cfe9127aea…

1 0