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

Hugh McMaster : regedit: Rewrite processRegLinesA into an ANSI version of processRegLinesW.
by Alexandre Julliard July 21, 2016

July 21, 2016

Module: wine Branch: master Commit: 3763c7a61055045bacd98dd592f03346ba365264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3763c7a61055045bacd98dd59… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 21 05:48:30 2016 +0000 regedit: Rewrite processRegLinesA into an ANSI version of processRegLinesW. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 198 ++++++++++++++++++++------------------------- 1 file changed, 87 insertions(+), 111 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index e3acecd..be6f7a5 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -596,144 +596,120 @@ static void processRegEntry(WCHAR* stdInput, BOOL isUnicode) */ static void processRegLinesA(FILE *in, char* first_chars) { - LPSTR line = NULL; /* line read from input stream */ - ULONG lineSize = REG_VAL_BUF_SIZE; + char *buf = NULL; /* the line read from the input stream */ + unsigned long line_size = REG_VAL_BUF_SIZE; + size_t chars_in_buf = -1; + char *s; /* A pointer to buf for fread */ + char *line; /* The start of the current line */ + WCHAR *lineW; + + buf = HeapAlloc(GetProcessHeap(), 0, line_size); + CHECK_ENOUGH_MEMORY(buf); + s = buf; + line = buf; - line = HeapAlloc(GetProcessHeap(), 0, lineSize); - CHECK_ENOUGH_MEMORY(line); memcpy(line, first_chars, 2); + if (first_chars) + s += 2; + while (!feof(in)) { - LPSTR s; /* The pointer into line for where the current fgets should read */ - WCHAR* lineW; - s = line; + size_t size_remaining; + int size_to_get; + char *s_eol = NULL; /* various local uses */ - if(first_chars) + /* Do we need to expand the buffer? */ + assert(s >= buf && s <= buf + line_size); + size_remaining = line_size - (s - buf); + if (size_remaining < 3) /* we need at least 3 bytes of room for \r\n\0 */ { - s += 2; - first_chars = NULL; + char *new_buffer; + size_t new_size = line_size + REG_VAL_BUF_SIZE; + if (new_size > line_size) /* no arithmetic overflow */ + new_buffer = HeapReAlloc(GetProcessHeap(), 0, buf, new_size); + else + new_buffer = NULL; + CHECK_ENOUGH_MEMORY(new_buffer); + buf = new_buffer; + line = buf; + s = buf + line_size - size_remaining; + line_size = new_size; + size_remaining = line_size - (s - buf); } - for (;;) { - size_t size_remaining; - int size_to_get, i; - char *s_eol; /* various local uses */ + /* Get as much as possible into the buffer, terminating on EOF, + * error or once we have read the maximum amount. Abort on error. + */ + size_to_get = (size_remaining > INT_MAX ? INT_MAX : size_remaining); - /* Do we need to expand the buffer ? */ - assert (s >= line && s <= line + lineSize); - size_remaining = lineSize - (s-line); - if (size_remaining < 3) /* need at least 3 bytes of room for \r\n\0 */ - { - char *new_buffer; - size_t new_size = lineSize + REG_VAL_BUF_SIZE; - if (new_size > lineSize) /* no arithmetic overflow */ - new_buffer = HeapReAlloc (GetProcessHeap(), 0, line, new_size); - else - new_buffer = NULL; - CHECK_ENOUGH_MEMORY(new_buffer); - line = new_buffer; - s = line + lineSize - size_remaining; - lineSize = new_size; - size_remaining = lineSize - (s-line); - } + chars_in_buf = fread(s, 1, size_to_get - 1, in); + s[chars_in_buf] = 0; - /* Get as much as possible into the buffer, terminated either by - * eof, error, eol or getting the maximum amount. Abort on error. - */ - size_to_get = (size_remaining > INT_MAX ? INT_MAX : size_remaining); - - /* get a single line. note that `i' must be one past the last - * meaningful character in `s' when this loop exits */ - for(i = 0; i < size_to_get-1; ++i){ - int xchar; - - xchar = fgetc(in); - s[i] = xchar; - if(xchar == EOF){ - if(ferror(in)){ - perror("While reading input"); - exit(IO_ERROR); - }else - assert(feof(in)); - break; - } - if(s[i] == '\r'){ - /* read the next character iff it's \n */ - if(i+2 >= size_to_get){ - /* buffer too short, so put back the EOL char to - * read next cycle */ - ungetc('\r', in); - break; - } - s[i+1] = fgetc(in); - if(s[i+1] != '\n'){ - ungetc(s[i+1], in); - i = i+1; - }else - i = i+2; - break; - } - if(s[i] == '\n'){ - i = i+1; - break; - } + if (chars_in_buf == 0) { + if (ferror(in)) { + perror("While reading input"); + exit(IO_ERROR); + } else { + assert(feof(in)); + *s = '\0'; } - s[i] = '\0'; + } - /* If we didn't read the eol nor the eof go around for the rest */ - s_eol = strpbrk (s, "\r\n"); - if (!feof (in) && !s_eol) { - s = strchr (s, '\0'); - continue; + /* If we didn't read the end-of-line sequence or EOF, go around again */ + while (1) + { + s_eol = strpbrk(line, "\r\n"); + if (!s_eol) { + /* Move the stub of the line to the start of the buffer so + * we get the maximum space to read into, and so we don't + * have to recalculate 'line' if the buffer expands */ + MoveMemory(buf, line, strlen(line) + 1); + line = buf; + s = strchr(line, '\0'); + break; } - /* If it is a comment line then discard it and go around again */ + /* If we find a comment line, discard it and go around again */ if (line [0] == '#' || line [0] == ';') { - s = line; + if (*s_eol == '\r' && *(s_eol + 1) == '\n') + line = s_eol + 2; + else + line = s_eol + 1; continue; } - /* Remove any line feed. Leave s_eol on the first \0 */ - if (s_eol) { - if (*s_eol == '\r' && *(s_eol+1) == '\n') - *(s_eol+1) = '\0'; - *s_eol = '\0'; - } else - s_eol = strchr (s, '\0'); + /* If there is a concatenating '\\', go around again */ + if (*(s_eol - 1) == '\\') { + char *next_line = s_eol + 1; - /* If there is a concatenating \\ then go around again */ - if (s_eol > line && *(s_eol-1) == '\\') { - int c; - s = s_eol-1; - - do - { - c = fgetc(in); - } while(c == ' ' || c == '\t'); - - if(c == EOF) - { - fprintf(stderr, "regedit: ERROR - invalid continuation.\n"); - } - else - { - *s = c; - s++; - } + if (*s_eol == '\r' && *(s_eol + 1) == '\n') + next_line++; + + while (*(next_line + 1) == ' ' || *(next_line + 1) == '\t') + next_line++; + + MoveMemory(s_eol - 1, next_line, chars_in_buf - (next_line - s) + 1); + chars_in_buf -= next_line - s_eol + 1; + s_eol = 0; continue; } - lineW = GetWideString(line); + /* Remove any line feed. Leave s_eol on the last \0 */ + if (*s_eol == '\r' && *(s_eol + 1) == '\n') + *s_eol++ = '\0'; + *s_eol = '\0'; - break; /* That is the full virtual line */ + lineW = GetWideString(line); + processRegEntry(lineW, FALSE); + HeapFree(GetProcessHeap(), 0, lineW); + line = s_eol + 1; + s_eol = 0; + continue; /* That is the full virtual line */ } - - processRegEntry(lineW, FALSE); - HeapFree(GetProcessHeap(), 0, lineW); } processRegEntry(NULL, FALSE); - HeapFree(GetProcessHeap(), 0, line); + HeapFree(GetProcessHeap(), 0, buf); } static void processRegLinesW(FILE *in)

1 0

Józef Kucia : d3d11: Allow creating SRVs for structured buffers with NULL description.
by Alexandre Julliard July 21, 2016

July 21, 2016

Module: wine Branch: master Commit: 3056608fb86618b82ca21b7d5c268e78b0282781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3056608fb86618b82ca21b7d5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 20 15:49:44 2016 +0200 d3d11: Allow creating SRVs for structured buffers with NULL description. 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/d3d11/tests/d3d11.c | 35 +++++++++++++++++++++++++++++++++++ dlls/d3d11/view.c | 27 ++++++++++++++++++++++++++- 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2ffad87..df45eb5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3060,6 +3060,7 @@ static void test_create_shader_resource_view(void) ULONG refcount, expected_refcount; ID3D11ShaderResourceView *srview; D3D_FEATURE_LEVEL feature_level; + D3D11_BUFFER_DESC buffer_desc; ID3D11Device *device, *tmp; ID3D11Texture3D *texture3d; ID3D11Texture2D *texture2d; @@ -3255,6 +3256,40 @@ static void test_create_shader_resource_view(void) ID3D11ShaderResourceView_Release(srview); ID3D11Buffer_Release(buffer); + if (feature_level >= D3D_FEATURE_LEVEL_11_0) + { + buffer_desc.ByteWidth = 1024; + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = D3D11_RESOURCE_MISC_BUFFER_STRUCTURED; + buffer_desc.StructureByteStride = 4; + + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &buffer); + ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x.\n", hr); + + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)buffer, NULL, &srview); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + memset(&srv_desc, 0, sizeof(srv_desc)); + ID3D11ShaderResourceView_GetDesc(srview, &srv_desc); + + ok(srv_desc.Format == DXGI_FORMAT_UNKNOWN, "Got unexpected format %#x.\n", srv_desc.Format); + ok(srv_desc.ViewDimension == D3D11_SRV_DIMENSION_BUFFER, "Got unexpected view dimension %#x.\n", + srv_desc.ViewDimension); + ok(!U(srv_desc).Buffer.FirstElement, "Got unexpected first element %u.\n", + U(srv_desc).Buffer.FirstElement); + ok(U(srv_desc).Buffer.NumElements == 256, "Got unexpected num elements %u.\n", + U(srv_desc).Buffer.NumElements); + + ID3D11ShaderResourceView_Release(srview); + ID3D11Buffer_Release(buffer); + } + else + { + skip("Structured buffers require feature level 11_0.\n"); + } + texture2d_desc.Width = 512; texture2d_desc.Height = 512; texture2d_desc.SampleDesc.Count = 1; diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 18ec0a2..a13316f 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -446,6 +446,32 @@ static HRESULT set_srv_desc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, switch (dimension) { + case D3D11_RESOURCE_DIMENSION_BUFFER: + { + D3D11_BUFFER_DESC buffer_desc; + ID3D11Buffer *buffer; + + if (FAILED(ID3D11Resource_QueryInterface(resource, &IID_ID3D11Buffer, (void **)&buffer))) + { + ERR("Resource of type BUFFER doesn't implement ID3D11Buffer.\n"); + return E_INVALIDARG; + } + + ID3D11Buffer_GetDesc(buffer, &buffer_desc); + ID3D11Buffer_Release(buffer); + + if (buffer_desc.MiscFlags & D3D11_RESOURCE_MISC_BUFFER_STRUCTURED) + { + desc->Format = DXGI_FORMAT_UNKNOWN; + desc->ViewDimension = D3D11_SRV_DIMENSION_BUFFER; + desc->u.Buffer.u1.FirstElement = 0; + desc->u.Buffer.u2.NumElements = buffer_desc.ByteWidth / buffer_desc.StructureByteStride; + return S_OK; + } + + return E_INVALIDARG; + } + case D3D11_RESOURCE_DIMENSION_TEXTURE1D: { D3D11_TEXTURE1D_DESC texture_desc; @@ -552,7 +578,6 @@ static HRESULT set_srv_desc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, default: ERR("Unhandled resource dimension %#x.\n", dimension); - case D3D11_RESOURCE_DIMENSION_BUFFER: return E_INVALIDARG; } }

1 0

Józef Kucia : d3d10core/tests: Add test for CreateBuffer() with invalid misc flags.
by Alexandre Julliard July 21, 2016

July 21, 2016

Module: wine Branch: master Commit: c51d16070c083462cdf07baef4d075ac54287482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c51d16070c083462cdf07baef… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 20 15:49:42 2016 +0200 d3d10core/tests: Add test for CreateBuffer() with invalid misc flags. 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/d3d10core/tests/device.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 90f8797..9b3a943 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1569,7 +1569,7 @@ static void test_create_texture3d(void) ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_buffer_interfaces(void) +static void test_create_buffer(void) { ID3D11Buffer *d3d11_buffer; D3D10_BUFFER_DESC desc; @@ -1686,6 +1686,17 @@ static void test_buffer_interfaces(void) ID3D11Buffer_Release(d3d11_buffer); } + desc.ByteWidth = 1024; + desc.Usage = D3D10_USAGE_DEFAULT; + desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + desc.CPUAccessFlags = 0; + desc.MiscFlags = D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS; + + hr = ID3D10Device_CreateBuffer(device, &desc, NULL, &buffer); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D10Buffer_Release(buffer); + refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); } @@ -8849,7 +8860,7 @@ START_TEST(device) test_create_texture2d(); test_texture2d_interfaces(); test_create_texture3d(); - test_buffer_interfaces(); + test_create_buffer(); test_create_depthstencil_view(); test_depthstencil_view_interfaces(); test_create_rendertarget_view();

1 0

Józef Kucia : d3d11: Allow creating UAVs for structured buffers with NULL description.
by Alexandre Julliard July 21, 2016

July 21, 2016

Module: wine Branch: master Commit: b68dfc5c8a56e20fb75386c70b75c0668f74fd02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b68dfc5c8a56e20fb75386c70… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 20 15:49:43 2016 +0200 d3d11: Allow creating UAVs for structured buffers with NULL description. 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/d3d11/tests/d3d11.c | 25 +++++++++++++++++++++++++ dlls/d3d11/view.c | 27 +++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9a20b8b..2ffad87 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -9245,6 +9245,9 @@ static void test_create_unordered_access_view(void) U(uav_desc).Buffer.NumElements = 64; U(uav_desc).Buffer.Flags = 0; + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, NULL, &uav); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav); ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); @@ -9261,6 +9264,28 @@ static void test_create_unordered_access_view(void) ID3D11UnorderedAccessView_Release(uav); ID3D11Buffer_Release(buffer); + buffer_desc.MiscFlags = D3D11_RESOURCE_MISC_BUFFER_STRUCTURED; + buffer_desc.StructureByteStride = 4; + + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &buffer); + ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x.\n", hr); + + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, NULL, &uav); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + memset(&uav_desc, 0, sizeof(uav_desc)); + ID3D11UnorderedAccessView_GetDesc(uav, &uav_desc); + + ok(uav_desc.Format == DXGI_FORMAT_UNKNOWN, "Got unexpected format %#x.\n", uav_desc.Format); + ok(uav_desc.ViewDimension == D3D11_UAV_DIMENSION_BUFFER, "Got unexpected view dimension %#x.\n", + uav_desc.ViewDimension); + ok(!U(uav_desc).Buffer.FirstElement, "Got unexpected first element %u.\n", U(uav_desc).Buffer.FirstElement); + ok(U(uav_desc).Buffer.NumElements == 256, "Got unexpected num elements %u.\n", U(uav_desc).Buffer.NumElements); + ok(!U(uav_desc).Buffer.Flags, "Got unexpected flags %u.\n", U(uav_desc).Buffer.Flags); + + ID3D11UnorderedAccessView_Release(uav); + ID3D11Buffer_Release(buffer); + texture2d_desc.Width = 512; texture2d_desc.Height = 512; texture2d_desc.SampleDesc.Count = 1; diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 5e48965..18ec0a2 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -710,6 +710,33 @@ static HRESULT set_uav_desc_from_resource(D3D11_UNORDERED_ACCESS_VIEW_DESC *desc switch (dimension) { + case D3D11_RESOURCE_DIMENSION_BUFFER: + { + D3D11_BUFFER_DESC buffer_desc; + ID3D11Buffer *buffer; + + if (FAILED(ID3D11Resource_QueryInterface(resource, &IID_ID3D11Buffer, (void **)&buffer))) + { + ERR("Resource of type BUFFER doesn't implement ID3D11Buffer.\n"); + return E_INVALIDARG; + } + + ID3D11Buffer_GetDesc(buffer, &buffer_desc); + ID3D11Buffer_Release(buffer); + + if (buffer_desc.MiscFlags & D3D11_RESOURCE_MISC_BUFFER_STRUCTURED) + { + desc->Format = DXGI_FORMAT_UNKNOWN; + desc->ViewDimension = D3D11_UAV_DIMENSION_BUFFER; + desc->u.Buffer.FirstElement = 0; + desc->u.Buffer.NumElements = buffer_desc.ByteWidth / buffer_desc.StructureByteStride; + desc->u.Buffer.Flags = 0; + return S_OK; + } + + return E_INVALIDARG; + } + case D3D11_RESOURCE_DIMENSION_TEXTURE2D: { D3D11_TEXTURE2D_DESC texture_desc;

1 0

Michael Stefaniuc : comctl32: Avoid using the LPSTREAM COM iface type.
by Alexandre Julliard July 21, 2016

July 21, 2016

Module: wine Branch: master Commit: 23132e6329a6e6fbcb79089d55e901484e40d972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23132e6329a6e6fbcb79089d5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 21 10:48:41 2016 +0200 comctl32: Avoid using the LPSTREAM COM iface type. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/imagelist.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index a7301d1..58a7b67 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2167,7 +2167,7 @@ ImageList_Merge (HIMAGELIST himl1, INT i1, HIMAGELIST himl2, INT i2, /* helper for ImageList_Read, see comments below */ -static void *read_bitmap(LPSTREAM pstm, BITMAPINFO *bmi) +static void *read_bitmap(IStream *pstm, BITMAPINFO *bmi) { BITMAPFILEHEADER bmfh; int bitsperpixel, palspace; @@ -2243,7 +2243,7 @@ static void *read_bitmap(LPSTREAM pstm, BITMAPINFO *bmi) * * BYTE maskbits[imagesize]; */ -HIMAGELIST WINAPI ImageList_Read (LPSTREAM pstm) +HIMAGELIST WINAPI ImageList_Read(IStream *pstm) { char image_buf[sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * 256]; char mask_buf[sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * 256]; @@ -2977,8 +2977,7 @@ ImageList_SetOverlayImage (HIMAGELIST himl, INT iImage, INT iOverlay) /* helper for ImageList_Write - write bitmap to pstm * currently everything is written as 24 bit RGB, except masks */ -static BOOL -_write_bitmap(HBITMAP hBitmap, LPSTREAM pstm) +static BOOL _write_bitmap(HBITMAP hBitmap, IStream *pstm) { LPBITMAPFILEHEADER bmfh; LPBITMAPINFOHEADER bmih; @@ -3064,8 +3063,7 @@ failed: * probably. */ -BOOL WINAPI -ImageList_Write (HIMAGELIST himl, LPSTREAM pstm) +BOOL WINAPI ImageList_Write(HIMAGELIST himl, IStream *pstm) { ILHEAD ilHead; int i;

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard July 21, 2016

July 21, 2016

Module: wine Branch: master Commit: 4a5667f3c71d84ccddb9c276089818cc6ccd34f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5667f3c71d84ccddb9c2760… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Jul 21 10:58:32 2016 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 88 +++++++++++++++++++--------------------------------------------- 1 file changed, 26 insertions(+), 62 deletions(-) diff --git a/po/de.po b/po/de.po index d14d225..55b6edd 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-06-01 11:19+0200\n" +"PO-Revision-Date: 2016-07-21 10:58+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -11999,133 +11999,97 @@ msgid "" msgstr "" #: regedit.rc:360 -#, fuzzy -#| msgid "" -#| "regsvr32: Invalid or unrecognized switch [%1]\n" -#| "\n" msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "" -"regsvr32: Ungültiges oder nicht erkanntes Argument [%1]\n" -"\n" +msgstr "regedit: Ungültiges oder nicht erkanntes Argument [%1]\n" #: regedit.rc:361 -#, fuzzy -#| msgid "Type \"REG /?\" for help.\n" msgid "Type \"regedit /?\" for help.\n" -msgstr "Geben Sie \"REG /?\" ein, um Hilfe zu erhalten.\n" +msgstr "Geben Sie \"regedit /?\" ein, um Hilfe zu erhalten.\n" #: regedit.rc:362 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: No filename was specified.\n" -msgstr "Kein Befehl angegeben." +msgstr "regedit: Kein Dateiname angegeben.\n" #: regedit.rc:363 msgid "regedit: No registry key was specified for removal.\n" -msgstr "" +msgstr "regedit: Kein zu entfernender Schlüssel angegeben.\n" #: regedit.rc:364 -#, fuzzy -#| msgid "uninstaller: The application with GUID '%1' was not found\n" msgid "regedit: The file '%1' was not found.\n" -msgstr "Uninstaller: Die Anwendung mit der GUID '%1' wurde nicht gefunden\n" +msgstr "regedit: Die Datei '%1' wurde nicht gefunden.\n" #: regedit.rc:365 -#, fuzzy -#| msgid "reg: Unable to access remote machine\n" msgid "regedit: Unable to open the file '%1'.\n" -msgstr "reg: Auf den Remoterechner kann nicht zugegriffen werden\n" +msgstr "regedit: Die Datei '%1' konnte nicht geöffnet werden.\n" #: regedit.rc:366 -#, fuzzy -#| msgid "Invalid handle operation.\n" msgid "regedit: Unhandled action.\n" -msgstr "Ungültige Handle-Operation.\n" +msgstr "regedit: Unbehandelte Aktion.\n" #: regedit.rc:367 msgid "regedit: Out of memory! (%1!S!, line %2!u!)\n" -msgstr "" +msgstr "regedit: Freier Speicher erschöpft! (%1!S!, Zeile %2!u!)\n" #: regedit.rc:368 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "regedit: Invalid hexadecimal value.\n" -msgstr "reg: Ungültiger Schlüsselname\n" +msgstr "regedit: Ungültiger Hexadezimalwert.\n" #: regedit.rc:369 msgid "" "regedit: Unable to convert hexadecimal data. An invalid value was " "encountered at '%1'.\n" msgstr "" +"regedit: Hexadezimaldaten konnten nicht konvertiert werden. Ein ungültiger " +"Wert wurde bei '%1' gefunden.\n" #: regedit.rc:370 -#, fuzzy -#| msgid "" -#| "regsvr32: Invalid or unrecognized switch [%1]\n" -#| "\n" msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "" -"regsvr32: Ungültiges oder nicht erkanntes Argument [%1]\n" -"\n" +msgstr "regedit: Unbekannte Escape-Sequenz [\\%1!c!]\n" #: regedit.rc:371 -#, fuzzy -#| msgid "reg: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [%1!u!]\n" -msgstr "reg: Nicht unterstützter Registrierungsdatentyp [%1]\n" +msgstr "regedit: Nicht unterstützter Registrierungsdatentyp [%1!u!]\n" #: regedit.rc:372 -#, fuzzy -#| msgid "reg: Unable to access remote machine\n" msgid "regedit: Unexpected end of line in '%1'.\n" -msgstr "reg: Auf den Remoterechner kann nicht zugegriffen werden\n" +msgstr "regedit: Unerwartetes Zeilenende in '%1'.\n" #: regedit.rc:373 -#, fuzzy -#| msgid "uninstaller: The application with GUID '%1' was not found\n" msgid "regedit: The line '%1' was not recognized.\n" -msgstr "Uninstaller: Die Anwendung mit der GUID '%1' wurde nicht gefunden\n" +msgstr "regedit: Zeile '%1' wurde nicht erkannt.\n" #: regedit.rc:374 -#, fuzzy -#| msgid "reg: Unable to access remote machine\n" msgid "regedit: Unable to add the registry value '%1' to '%2'.\n" -msgstr "reg: Auf den Remoterechner kann nicht zugegriffen werden\n" +msgstr "regedit: Der Wert '%1' konnte nicht zu '%2' hinzugefügt werden.\n" #: regedit.rc:375 -#, fuzzy -#| msgid "reg: Unable to access remote machine\n" msgid "regedit: Unable to open the registry key '%1'.\n" -msgstr "reg: Auf den Remoterechner kann nicht zugegriffen werden\n" +msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" #: regedit.rc:376 -#, fuzzy -#| msgid "reg: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" -msgstr "reg: Nicht unterstützter Registrierungsdatentyp [%1]\n" +msgstr "" +"regedit: Nicht unterstützter Registrierungsdatentyp [%1!u!] wurde in '%2' " +"gefunden.\n" #: regedit.rc:377 msgid "regedit: The registry value '%1' will be exported as binary data.\n" -msgstr "" +msgstr "regedit: Der Wert '%1' wird in Form von Binärdaten exportiert.\n" #: regedit.rc:378 msgid "regedit: Incorrect registry class specification in '%1'.\n" -msgstr "" +msgstr "regedit: Ungültige Registrierungsklassen-Spezifikation in '%1'.\n" #: regedit.rc:379 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "" "regedit: Unable to export '%1'. The specified registry key was not found.\n" msgstr "" -"reg: Das System konnte den angegebenen Schlüssel oder Wert nicht finden\n" +"regedit: '%1' konnte nicht exportiert werden. Der angegebene Schlüssel wurde " +"nicht gefunden.\n" #: regedit.rc:380 -#, fuzzy -#| msgid "reg: Unable to access remote machine\n" msgid "regedit: Unable to delete the registry class '%1'.\n" -msgstr "reg: Auf den Remoterechner kann nicht zugegriffen werden\n" +msgstr "regedit: Die Registrierungsklasse '%1' konnte nicht gelöscht werden.\n" #: regedit.rc:163 msgid "Quits the registry editor"

1 0

Józef Kucia : d3d10core/tests: Add test for some shader instructions.
by Alexandre Julliard July 21, 2016

July 21, 2016

Module: wine Branch: master Commit: 9cb2c6db2f9fd69f3d6b6c1e2b38f924aa8c2f3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb2c6db2f9fd69f3d6b6c1e2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 20 15:49:39 2016 +0200 d3d10core/tests: Add test for some shader instructions. 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/d3d10core/tests/device.c | 183 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 171 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 7e161f5..90f8797 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -23,6 +23,13 @@ #include "wine/test.h" #include <limits.h> +#define BITS_NNAN 0xffc00000 +#define BITS_NAN 0x7fc00000 +#define BITS_NINF 0xff800000 +#define BITS_INF 0x7f800000 +#define BITS_N1_0 0xbf800000 +#define BITS_1_0 0x3f800000 + struct vec2 { float x, y; @@ -670,6 +677,52 @@ static void check_texture_vec4_(unsigned int line, ID3D10Texture2D *texture, check_texture_sub_resource_vec4_(line, texture, sub_resource_idx, expected_value, max_diff); } +#define check_texture_sub_resource_uvec4(a, b, c) check_texture_sub_resource_uvec4_(__LINE__, a, b, c) +static void check_texture_sub_resource_uvec4_(unsigned int line, ID3D10Texture2D *texture, + unsigned int sub_resource_idx, const struct uvec4 *expected_value) +{ + struct texture_readback rb; + unsigned int x = 0, y = 0; + struct uvec4 value = {0}; + BOOL all_match = TRUE; + + get_texture_readback(texture, sub_resource_idx, &rb); + for (y = 0; y < rb.height; ++y) + { + for (x = 0; x < rb.width; ++x) + { + value = *get_readback_uvec4(&rb, x, y); + if (!compare_uvec4(&value, expected_value)) + { + all_match = FALSE; + break; + } + } + if (!all_match) + break; + } + release_texture_readback(&rb); + ok_(__FILE__, line)(all_match, + "Got {0x%08x, 0x%08x, 0x%08x, 0x%08x}, expected {0x%08x, 0x%08x, 0x%08x, 0x%08x} " + "at (%u, %u), sub-resource %u.\n", + value.x, value.y, value.z, value.w, + expected_value->x, expected_value->y, expected_value->z, expected_value->w, + x, y, sub_resource_idx); +} + +#define check_texture_uvec4(a, b) check_texture_uvec4_(__LINE__, a, b) +static void check_texture_uvec4_(unsigned int line, ID3D10Texture2D *texture, + const struct uvec4 *expected_value) +{ + unsigned int sub_resource_idx, sub_resource_count; + D3D10_TEXTURE2D_DESC texture_desc; + + ID3D10Texture2D_GetDesc(texture, &texture_desc); + sub_resource_count = texture_desc.ArraySize * texture_desc.MipLevels; + for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx) + check_texture_sub_resource_uvec4_(line, texture, sub_resource_idx, expected_value); +} + static ID3D10Device *create_device(void) { ID3D10Device *device; @@ -8621,11 +8674,9 @@ static void test_fp_specials(void) struct d3d10core_test_context test_context; D3D10_TEXTURE2D_DESC texture_desc; ID3D10RenderTargetView *rtv; - struct texture_readback rb; ID3D10Texture2D *texture; ID3D10PixelShader *ps; ID3D10Device *device; - unsigned int x, y; HRESULT hr; static const DWORD ps_code[] = @@ -8643,7 +8694,7 @@ static void test_fp_specials(void) 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0xffc00000, 0x7f800000, 0xff800000, 0x3f800000, 0x0100003e, }; - const struct uvec4 expected_result = {0xffc00000, 0x7f800000, 0xff800000, 0x3f800000}; + static const struct uvec4 expected_result = {BITS_NNAN, BITS_INF, BITS_NINF, BITS_1_0}; if (!init_test_context(&test_context)) return; @@ -8665,20 +8716,127 @@ static void test_fp_specials(void) ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); draw_quad(&test_context); - get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) + check_texture_uvec4(texture, &expected_result); + + ID3D10PixelShader_Release(ps); + ID3D10Texture2D_Release(texture); + ID3D10RenderTargetView_Release(rtv); + release_test_context(&test_context); +} + +static void test_uint_shader_instructions(void) +{ + struct shader + { + const DWORD *code; + size_t size; + }; + + struct d3d10core_test_context test_context; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10RenderTargetView *rtv; + ID3D10Texture2D *texture; + ID3D10PixelShader *ps; + ID3D10Device *device; + ID3D10Buffer *cb; + unsigned int i; + HRESULT hr; + + static const DWORD ps_ftou_code[] = { - for (x = 0; x < texture_desc.Width; ++x) +#if 0 + float f; + + uint4 main() : SV_Target { - const struct uvec4 *value = get_readback_uvec4(&rb, x, y); - ok(compare_uvec4(value, &expected_result), - "Got unexpected value {0x%08x, 0x%08x, 0x%08x, 0x%08x} at (%u, %u).\n", - value->x, value->y, value->z, value->w, x, y); + return uint4(f, -f, 0, 0); } +#endif + 0x43425844, 0xfde0ee2d, 0x812b339a, 0xb9fc36d2, 0x5820bec6, 0x00000001, 0x000000f4, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x0000007c, 0x00000040, 0x0000001f, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x0600001c, + 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0700001c, 0x00102022, 0x00000000, + 0x8020800a, 0x00000041, 0x00000000, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, + }; + static const DWORD ps_not_code[] = + { +#if 0 + uint bits[2]; + + uint4 main() : SV_Target + { + return uint4(~bits[0], ~(bits[0] ^ ~0u), ~bits[1], ~(bits[1] ^ ~0u)); + } +#endif + 0x43425844, 0x1d56b429, 0xb5f4c0e1, 0x496a0bfd, 0xfc6f8e6f, 0x00000001, 0x00000140, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000c8, 0x00000040, 0x00000032, + 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x08000057, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x00004001, + 0xffffffff, 0x0500003b, 0x00102022, 0x00000000, 0x0010000a, 0x00000000, 0x08000057, 0x00100012, + 0x00000000, 0x0020800a, 0x00000000, 0x00000001, 0x00004001, 0xffffffff, 0x0500003b, 0x00102082, + 0x00000000, 0x0010000a, 0x00000000, 0x0600003b, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, + 0x00000000, 0x0600003b, 0x00102042, 0x00000000, 0x0020800a, 0x00000000, 0x00000001, 0x0100003e, + }; + static const struct shader ps_ftou = {ps_ftou_code, sizeof(ps_ftou_code)}; + static const struct shader ps_not = {ps_not_code, sizeof(ps_not_code)}; + static const struct + { + const struct shader *ps; + unsigned int bits[4]; + struct uvec4 expected_result; + BOOL todo; } - release_texture_readback(&rb); + tests[] = + { + {&ps_ftou, {BITS_NNAN}, { 0, 0}}, + {&ps_ftou, {BITS_NAN}, { 0, 0}}, + {&ps_ftou, {BITS_NINF}, { 0, ~0u}}, + {&ps_ftou, {BITS_INF}, {~0u, 0}}, + {&ps_ftou, {BITS_N1_0}, { 0, 1}}, + {&ps_ftou, {BITS_1_0}, { 1, 0}}, + {&ps_not, {0x00000000, 0xffffffff}, {0xffffffff, 0x00000000, 0x00000000, 0xffffffff}}, + {&ps_not, {0xf0f0f0f0, 0x0f0f0f0f}, {0x0f0f0f0f, 0xf0f0f0f0, 0xf0f0f0f0, 0x0f0f0f0f}}, + }; - ID3D10PixelShader_Release(ps); + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + cb = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, 4 * sizeof(tests[0].bits), NULL); + ID3D10Device_PSSetConstantBuffers(device, 0, 1, &cb); + + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_R32G32B32A32_UINT; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + hr = ID3D10Device_CreatePixelShader(device, tests[i].ps->code, tests[i].ps->size, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, tests[i].bits, 0, 0); + + draw_quad(&test_context); + todo_wine_if(tests[i].todo) + check_texture_uvec4(texture, &tests[i].expected_result); + + ID3D10PixelShader_Release(ps); + } + + ID3D10Buffer_Release(cb); ID3D10Texture2D_Release(texture); ID3D10RenderTargetView_Release(rtv); release_test_context(&test_context); @@ -8730,4 +8888,5 @@ START_TEST(device) test_null_sampler(); test_immediate_constant_buffer(); test_fp_specials(); + test_uint_shader_instructions(); }

1 0

Józef Kucia : d3d11/tests: Add more tests for structured and raw buffers.
by Alexandre Julliard July 21, 2016

July 21, 2016

Module: wine Branch: master Commit: 70ce8f435ffb0232329624832821d1ffa50cc9fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=70ce8f435ffb0232329624832… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 20 15:49:41 2016 +0200 d3d11/tests: Add more tests for structured and raw buffers. 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/d3d11/tests/d3d11.c | 168 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 149 insertions(+), 19 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9e6e843..9a20b8b 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2181,7 +2181,7 @@ static void test_texture3d_interfaces(void) ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_buffer_interfaces(void) +static void test_create_buffer(void) { ID3D10Buffer *d3d10_buffer; D3D11_BUFFER_DESC desc; @@ -2193,6 +2193,7 @@ static void test_buffer_interfaces(void) static const struct test { + BOOL succeeds; BOOL implements_d3d10_interfaces; UINT bind_flags; UINT misc_flags; @@ -2200,65 +2201,171 @@ static void test_buffer_interfaces(void) UINT expected_bind_flags; UINT expected_misc_flags; } - desc_conversion_tests[] = + tests[] = { { - TRUE, + TRUE, TRUE, D3D11_BIND_VERTEX_BUFFER, 0, 0, D3D10_BIND_VERTEX_BUFFER, 0 }, { - TRUE, + TRUE, TRUE, D3D11_BIND_INDEX_BUFFER, 0, 0, D3D10_BIND_INDEX_BUFFER, 0 }, { - TRUE, + TRUE, TRUE, D3D11_BIND_CONSTANT_BUFFER, 0, 0, D3D10_BIND_CONSTANT_BUFFER, 0 }, { - TRUE, + TRUE, TRUE, D3D11_BIND_SHADER_RESOURCE, 0, 0, D3D10_BIND_SHADER_RESOURCE, 0 }, { - TRUE, + TRUE, TRUE, D3D11_BIND_STREAM_OUTPUT, 0, 0, D3D10_BIND_STREAM_OUTPUT, 0 }, { - TRUE, + TRUE, TRUE, D3D11_BIND_RENDER_TARGET, 0, 0, D3D10_BIND_RENDER_TARGET, 0 }, { - TRUE, + TRUE, TRUE, D3D11_BIND_UNORDERED_ACCESS, 0, 0, D3D11_BIND_UNORDERED_ACCESS, 0 }, { - TRUE, + TRUE, TRUE, 0, D3D11_RESOURCE_MISC_SHARED, 0, 0, D3D10_RESOURCE_MISC_SHARED }, { - TRUE, + TRUE, TRUE, 0, D3D11_RESOURCE_MISC_DRAWINDIRECT_ARGS, 0, 0, 0 }, { - TRUE, + FALSE, FALSE, + D3D11_BIND_VERTEX_BUFFER, D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS, 0, + }, + { + FALSE, FALSE, + D3D11_BIND_INDEX_BUFFER, D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS, 0, + }, + { + FALSE, FALSE, + D3D11_BIND_CONSTANT_BUFFER, D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS, 0, + }, + { + TRUE, TRUE, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS, 0, D3D10_BIND_SHADER_RESOURCE, 0 }, { - FALSE /* Structured buffers do not implement ID3D10Buffer. */, + FALSE, FALSE, + D3D11_BIND_STREAM_OUTPUT, D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS, 0, + }, + { + FALSE, FALSE, + D3D11_BIND_RENDER_TARGET, D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS, 0, + }, + { + TRUE, TRUE, + D3D11_BIND_UNORDERED_ACCESS, D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS, 0, + D3D11_BIND_UNORDERED_ACCESS, 0 + }, + { + FALSE, FALSE, + 0, D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS, 0, + }, + /* Structured buffers do not implement ID3D10Buffer. */ + { + TRUE, FALSE, 0, D3D11_RESOURCE_MISC_BUFFER_STRUCTURED, 16, + }, + { + TRUE, FALSE, + D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_BUFFER_STRUCTURED, 16, + }, + { + FALSE, FALSE, + D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_BUFFER_STRUCTURED, ~0u, + }, + { + FALSE, FALSE, + D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_BUFFER_STRUCTURED, 0, + }, + { + FALSE, FALSE, + D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_BUFFER_STRUCTURED, 1, + }, + { + FALSE, FALSE, + D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_BUFFER_STRUCTURED, 2, + }, + { + FALSE, FALSE, + D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_BUFFER_STRUCTURED, 3, + }, + { + TRUE, FALSE, + D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_BUFFER_STRUCTURED, 4, + }, + { + FALSE, FALSE, + D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_BUFFER_STRUCTURED, 5, + }, + { + TRUE, FALSE, + D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_BUFFER_STRUCTURED, 8, + }, + { + TRUE, FALSE, + D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_BUFFER_STRUCTURED, 512, + }, + { + FALSE, FALSE, + D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_BUFFER_STRUCTURED, 513, + }, + { + TRUE, FALSE, + D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_BUFFER_STRUCTURED, 1024, + }, + { + TRUE, TRUE, + 0, 0, 513, 0, 0 }, { - TRUE, + TRUE, TRUE, + D3D11_BIND_CONSTANT_BUFFER, 0, 513, + D3D10_BIND_CONSTANT_BUFFER, 0 + }, + { + TRUE, TRUE, + D3D11_BIND_SHADER_RESOURCE, 0, 513, + D3D10_BIND_SHADER_RESOURCE, 0 + }, + { + TRUE, TRUE, + D3D11_BIND_UNORDERED_ACCESS, 0, 513, + D3D11_BIND_UNORDERED_ACCESS, 0 + }, + { + FALSE, FALSE, + 0, D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS | D3D11_RESOURCE_MISC_BUFFER_STRUCTURED, 16, + }, + { + FALSE, FALSE, + D3D11_BIND_SHADER_RESOURCE, + D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS | D3D11_RESOURCE_MISC_BUFFER_STRUCTURED, 16, + }, + { + TRUE, TRUE, 0, D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX, 0, 0, D3D10_RESOURCE_MISC_SHARED_KEYEDMUTEX }, @@ -2284,11 +2391,13 @@ static void test_buffer_interfaces(void) return; } - for (i = 0; i < sizeof(desc_conversion_tests) / sizeof(*desc_conversion_tests); ++i) + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) { - const struct test *current = &desc_conversion_tests[i]; + const struct test *current = &tests[i]; + D3D11_BUFFER_DESC obtained_desc; D3D10_BUFFER_DESC d3d10_desc; ID3D10Device *d3d10_device; + HRESULT expected_hr; desc.ByteWidth = 1024; desc.Usage = D3D11_USAGE_DEFAULT; @@ -2298,14 +2407,35 @@ static void test_buffer_interfaces(void) desc.StructureByteStride = current->structure_stride; hr = ID3D11Device_CreateBuffer(device, &desc, NULL, &buffer); + expected_hr = current->succeeds ? S_OK : E_INVALIDARG; /* Shared resources are not supported by REF and WARP devices. */ - ok(SUCCEEDED(hr) || broken(hr == E_OUTOFMEMORY), "Test %u: Failed to create a buffer, hr %#x.\n", i, hr); + ok(hr == expected_hr || broken(hr == E_OUTOFMEMORY), "Test %u: Got hr %#x, expected %#x.\n", + i, hr, expected_hr); if (FAILED(hr)) { - win_skip("Failed to create a buffer, skipping test %u.\n", i); + if (hr == E_OUTOFMEMORY) + win_skip("Failed to create a buffer, skipping test %u.\n", i); continue; } + if (!(desc.MiscFlags & D3D11_RESOURCE_MISC_BUFFER_STRUCTURED)) + desc.StructureByteStride = 0; + + ID3D11Buffer_GetDesc(buffer, &obtained_desc); + + ok(obtained_desc.ByteWidth == desc.ByteWidth, + "Test %u: Got unexpected ByteWidth %u.\n", i, obtained_desc.ByteWidth); + ok(obtained_desc.Usage == desc.Usage, + "Test %u: Got unexpected Usage %u.\n", i, obtained_desc.Usage); + ok(obtained_desc.BindFlags == desc.BindFlags, + "Test %u: Got unexpected BindFlags %#x.\n", i, obtained_desc.BindFlags); + ok(obtained_desc.CPUAccessFlags == desc.CPUAccessFlags, + "Test %u: Got unexpected CPUAccessFlags %#x.\n", i, obtained_desc.CPUAccessFlags); + ok(obtained_desc.MiscFlags == desc.MiscFlags, + "Test %u: Got unexpected MiscFlags %#x.\n", i, obtained_desc.MiscFlags); + ok(obtained_desc.StructureByteStride == desc.StructureByteStride, + "Test %u: Got unexpected StructureByteStride %u.\n", i, obtained_desc.StructureByteStride); + hr = ID3D11Buffer_QueryInterface(buffer, &IID_ID3D10Buffer, (void **)&d3d10_buffer); ID3D11Buffer_Release(buffer); @@ -9575,7 +9705,7 @@ START_TEST(d3d11) test_texture2d_interfaces(); test_create_texture3d(); test_texture3d_interfaces(); - test_buffer_interfaces(); + test_create_buffer(); test_create_depthstencil_view(); test_depthstencil_view_interfaces(); test_create_rendertarget_view();

1 0

Józef Kucia : d3d11/tests: Add test for bitwise shader instructions.
by Alexandre Julliard July 21, 2016

July 21, 2016

Module: wine Branch: master Commit: 456358e0b1db9bee2889645296ba10e7d4cc3e7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=456358e0b1db9bee288964529… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 20 15:49:38 2016 +0200 d3d11/tests: Add test for bitwise shader instructions. 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/d3d11/tests/d3d11.c | 243 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 231 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=456358e0b1db9bee28896…

1 0

Józef Kucia : d3d11: Validate "MiscFlags" and " StructureByteStride" for raw and structured buffers.
by Alexandre Julliard July 21, 2016

July 21, 2016

Module: wine Branch: master Commit: 888de4efd86a698789ed1334c9c8a281257b9d13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=888de4efd86a698789ed1334c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 20 15:49:40 2016 +0200 d3d11: Validate "MiscFlags" and "StructureByteStride" for raw and structured buffers. 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/d3d11/buffer.c | 55 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index 5af121f..5a5e66e 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -372,7 +372,7 @@ struct d3d_buffer *unsafe_impl_from_ID3D10Buffer(ID3D10Buffer *iface) return CONTAINING_RECORD(iface, struct d3d_buffer, ID3D10Buffer_iface); } -static void STDMETHODCALLTYPE d3d10_buffer_wined3d_object_released(void *parent) +static void STDMETHODCALLTYPE d3d_buffer_wined3d_object_released(void *parent) { struct d3d_buffer *buffer = parent; @@ -380,9 +380,9 @@ static void STDMETHODCALLTYPE d3d10_buffer_wined3d_object_released(void *parent) HeapFree(GetProcessHeap(), 0, parent); } -static const struct wined3d_parent_ops d3d10_buffer_wined3d_parent_ops = +static const struct wined3d_parent_ops d3d_buffer_wined3d_parent_ops = { - d3d10_buffer_wined3d_object_released, + d3d_buffer_wined3d_object_released, }; static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *device, @@ -398,18 +398,51 @@ static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *dev wined3d_private_store_init(&buffer->private_store); buffer->desc = *desc; - wined3d_desc.byte_width = desc->ByteWidth; - wined3d_desc.usage = wined3d_usage_from_d3d11(0, desc->Usage); - wined3d_desc.bind_flags = desc->BindFlags; - wined3d_desc.cpu_access_flags = desc->CPUAccessFlags; - wined3d_desc.misc_flags = desc->MiscFlags; + if (buffer->desc.MiscFlags & D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS) + { + if (buffer->desc.MiscFlags & D3D11_RESOURCE_MISC_BUFFER_STRUCTURED) + { + WARN("Raw and structure buffers are mutually exclusive.\n"); + return E_INVALIDARG; + } + if (!(buffer->desc.BindFlags & (D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_UNORDERED_ACCESS))) + { + WARN("Invalid bind flags %#x for raw buffer.\n", buffer->desc.BindFlags); + return E_INVALIDARG; + } + } + + if (buffer->desc.MiscFlags & D3D11_RESOURCE_MISC_BUFFER_STRUCTURED) + { + if (!buffer->desc.StructureByteStride || buffer->desc.StructureByteStride % 4) + { + WARN("Invalid structure byte stride %u.\n", buffer->desc.StructureByteStride); + return E_INVALIDARG; + } + if (buffer->desc.ByteWidth % buffer->desc.StructureByteStride) + { + WARN("Byte width %u is not divisible by structure byte stride %u.\n", + buffer->desc.ByteWidth, buffer->desc.StructureByteStride); + return E_INVALIDARG; + } + } + else + { + buffer->desc.StructureByteStride = 0; + } + + wined3d_desc.byte_width = buffer->desc.ByteWidth; + wined3d_desc.usage = wined3d_usage_from_d3d11(0, buffer->desc.Usage); + wined3d_desc.bind_flags = buffer->desc.BindFlags; + wined3d_desc.cpu_access_flags = buffer->desc.CPUAccessFlags; + wined3d_desc.misc_flags = buffer->desc.MiscFlags; - if (desc->StructureByteStride) - FIXME("Ignoring structure byte stride %u.\n", desc->StructureByteStride); + if (buffer->desc.StructureByteStride) + FIXME("Ignoring structure byte stride %u.\n", buffer->desc.StructureByteStride); if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &wined3d_desc, (const struct wined3d_sub_resource_data *)data, buffer, - &d3d10_buffer_wined3d_parent_ops, &buffer->wined3d_buffer))) + &d3d_buffer_wined3d_parent_ops, &buffer->wined3d_buffer))) { WARN("Failed to create wined3d buffer, hr %#x.\n", hr); wined3d_private_store_cleanup(&buffer->private_store);

1 0