February 2020 - Wine-commits

Sven Baars : d3dx9: Implement ID3DXFont_GetGlyphData.
by Alexandre Julliard 27 Feb '20

27 Feb '20

Module: wine Branch: master Commit: e9ea8a05e54f1c950e5c15979d1393ad013402b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9ea8a05e54f1c950e5c1597… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Thu Feb 27 13:01:40 2020 +0100 d3dx9: Implement ID3DXFont_GetGlyphData. Based on a patch by Tony Wasserka. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/font.c | 35 ++++++++++++++++++++++++++---- dlls/d3dx9_36/tests/core.c | 53 +++++++++++++++++++++------------------------- 2 files changed, 55 insertions(+), 33 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 0ea19bdee3..af743310d1 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -184,11 +184,38 @@ static HDC WINAPI ID3DXFontImpl_GetDC(ID3DXFont *iface) } static HRESULT WINAPI ID3DXFontImpl_GetGlyphData(ID3DXFont *iface, UINT glyph, - IDirect3DTexture9 **texture, RECT *blackbox, POINT *cellinc) + IDirect3DTexture9 **texture, RECT *black_box, POINT *cell_inc) { - FIXME("iface %p, glyph %#x, texture %p, blackbox %p, cellinc %p stub!\n", - iface, glyph, texture, blackbox, cellinc); - return E_NOTIMPL; + struct d3dx_font *font = impl_from_ID3DXFont(iface); + struct wine_rb_entry *entry; + HRESULT hr; + + TRACE("iface %p, glyph %#x, texture %p, black_box %p, cell_inc %p.\n", + iface, glyph, texture, black_box, cell_inc); + + hr = ID3DXFont_PreloadGlyphs(iface, glyph, glyph); + if (FAILED(hr)) + return hr; + + entry = wine_rb_get(&font->glyph_tree, ULongToPtr(glyph)); + if (entry) + { + struct d3dx_glyph *current_glyph = WINE_RB_ENTRY_VALUE(entry, struct d3dx_glyph, entry); + + if (cell_inc) + *cell_inc = current_glyph->cell_inc; + if (black_box) + *black_box = current_glyph->black_box; + if (texture) + { + *texture = current_glyph->texture; + if (*texture) + IDirect3DTexture9_AddRef(current_glyph->texture); + } + return D3D_OK; + } + + return D3DXERR_INVALIDDATA; } static HRESULT WINAPI ID3DXFontImpl_PreloadCharacters(ID3DXFont *iface, UINT first, UINT last) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 22d265b9fc..b8e680d1c5 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -543,16 +543,15 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) hdc = ID3DXFont_GetDC(font); ok(!!hdc, "Got unexpected hdc %p.\n", hdc); - todo_wine { hr = ID3DXFont_GetGlyphData(font, 0, NULL, &blackbox, &cellinc); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = ID3DXFont_GetGlyphData(font, 0, &texture, NULL, &cellinc); - if(SUCCEEDED(hr)) check_release((IUnknown *)texture, 1); + check_release((IUnknown *)texture, 1); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = ID3DXFont_GetGlyphData(font, 0, &texture, &blackbox, NULL); - if(SUCCEEDED(hr)) check_release((IUnknown *)texture, 1); + check_release((IUnknown *)texture, 1); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - } + hr = ID3DXFont_PreloadCharacters(font, 'b', 'a'); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = ID3DXFont_PreloadGlyphs(font, 1, 0); @@ -567,12 +566,10 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ok(count != GDI_ERROR, "Got unexpected count %u.\n", count); hr = ID3DXFont_GetGlyphData(font, glyph, &texture, &blackbox, &cellinc); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - if (FAILED(hr)) - continue; + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); levels = IDirect3DTexture9_GetLevelCount(texture); - ok(levels == 5, "Character %c: got unexpected levels %u.\n", c, levels); + todo_wine ok(levels == 5, "Character %c: got unexpected levels %u.\n", c, levels); hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &surf_desc); ok(hr == D3D_OK, "Character %c: got unexpected hr %#x.\n", c, hr); ok(surf_desc.Format == D3DFMT_A8R8G8B8, "Character %c: got unexpected format %#x.\n", c, surf_desc.Format); @@ -587,9 +584,9 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ret = ID3DXFont_GetTextMetricsW(font, &tm); ok(ret, "Got unexpected ret %#x.\n", ret); - ok(blackbox.right - blackbox.left == glyph_metrics.gmBlackBoxX + 2, "Character %c: got %d, expected %d.\n", + todo_wine ok(blackbox.right - blackbox.left == glyph_metrics.gmBlackBoxX + 2, "Character %c: got %d, expected %d.\n", c, blackbox.right - blackbox.left, glyph_metrics.gmBlackBoxX + 2); - ok(blackbox.bottom - blackbox.top == glyph_metrics.gmBlackBoxY + 2, "Character %c: got %d, expected %d.\n", + todo_wine ok(blackbox.bottom - blackbox.top == glyph_metrics.gmBlackBoxY + 2, "Character %c: got %d, expected %d.\n", c, blackbox.bottom - blackbox.top, glyph_metrics.gmBlackBoxY + 2); ok(cellinc.x == glyph_metrics.gmptGlyphOrigin.x - 1, "Character %c: got %d, expected %d.\n", c, cellinc.x, glyph_metrics.gmptGlyphOrigin.x - 1); @@ -611,8 +608,8 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) { texture = (IDirect3DTexture9 *)0xdeadbeef; hr = ID3DXFont_GetGlyphData(font, glyph, &texture, &blackbox, &cellinc); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(!texture, "Got unexpected texture %p.\n", texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(!texture, "Got unexpected texture %p.\n", texture); } check_release((IUnknown *)font, 0); @@ -631,23 +628,21 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ok(count != GDI_ERROR, "Test %u: got unexpected count %u.\n", i, count); hr = ID3DXFont_GetGlyphData(font, glyph, &texture, NULL, NULL); - todo_wine ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", i, hr); - if(SUCCEEDED(hr)) { - DWORD levels; - D3DSURFACE_DESC desc; - - levels = IDirect3DTexture9_GetLevelCount(texture); - ok(levels == tests[i].expected_levels, "Test %u: got unexpected levels %u.\n", i, levels); - hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(desc.Format == D3DFMT_A8R8G8B8, "Test %u: got unexpected format %#x.\n", i, desc.Format); - ok(desc.Usage == 0, "Test %u: got unexpected usage %#x.\n", i, desc.Usage); - ok(desc.Width == tests[i].expected_size, "Test %u: got unexpected width %u.\n", i, desc.Width); - ok(desc.Height == tests[i].expected_size, "Test %u: got unexpected height %u.\n", i, desc.Height); - ok(desc.Pool == D3DPOOL_MANAGED, "Test %u: got unexpected pool %u.\n", i, desc.Pool); - - IDirect3DTexture9_Release(texture); - } + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", i, hr); + + levels = IDirect3DTexture9_GetLevelCount(texture); + todo_wine_if(tests[i].expected_levels < 9) + ok(levels == tests[i].expected_levels, "Test %u: got unexpected levels %u.\n", i, levels); + + hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &surf_desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(surf_desc.Format == D3DFMT_A8R8G8B8, "Test %u: got unexpected format %#x.\n", i, surf_desc.Format); + ok(surf_desc.Usage == 0, "Test %u: got unexpected usage %#x.\n", i, surf_desc.Usage); + ok(surf_desc.Width == tests[i].expected_size, "Test %u: got unexpected width %u.\n", i, surf_desc.Width); + ok(surf_desc.Height == tests[i].expected_size, "Test %u: got unexpected height %u.\n", i, surf_desc.Height); + ok(surf_desc.Pool == D3DPOOL_MANAGED, "Test %u: got unexpected pool %u.\n", i, surf_desc.Pool); + + IDirect3DTexture9_Release(texture); /* ID3DXFontImpl_DrawText */ D3DXCreateSprite(device, &sprite);

1 0

Lauri Kenttä : oledb32: Resize dialog fields to accomodate translations.
by Alexandre Julliard 27 Feb '20

27 Feb '20

Module: wine Branch: master Commit: aeb454541a2101047de0ecbb9bdb9d06c6a252a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aeb454541a2101047de0ecbb… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Feb 27 13:36:12 2020 +0200 oledb32: Resize dialog fields to accomodate translations. Needed for German (7), Finnish (11), French (12), Lithuanian (39). Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/version.rc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/oledb32/version.rc b/dlls/oledb32/version.rc index 080e444eb7..247709dec2 100644 --- a/dlls/oledb32/version.rc +++ b/dlls/oledb32/version.rc @@ -68,17 +68,17 @@ BEGIN LTEXT "Specify the following to connect to ODBC data:",-1,7,7,213,8 LTEXT "1. Specify the source of data:",IDC_LBL_SOURCE,14,18,206,8 CONTROL "Use &data source name",IDC_RDO_SRC_NAME,"Button",BS_AUTORADIOBUTTON | WS_GROUP,29,29,192,10 - COMBOBOX IDC_CBO_NAMES,36,40,150,128,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Refresh",IDC_BTN_REFRESH,189,39,31,14 + COMBOBOX IDC_CBO_NAMES,36,40,120,128,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Refresh",IDC_BTN_REFRESH,159,39,61,14 CONTROL "Use c&onnection string",IDC_BTN_CONNECTION,"Button",BS_AUTORADIOBUTTON,29,57,192,10 LTEXT "&Connection string:",IDC_LBL_CONNECTION,36,68,182,8 - EDITTEXT IDC_EDT_CONNECTION,36,78,148,12,ES_AUTOHSCROLL - PUSHBUTTON "B&uild...",IDC_BTN_BUILD,189,77,31,14 + EDITTEXT IDC_EDT_CONNECTION,36,78,118,12,ES_AUTOHSCROLL + PUSHBUTTON "B&uild...",IDC_BTN_BUILD,159,77,61,14 LTEXT "2. Enter information to log on to the server",IDC_LBL_LOGIN,14,98,206,8 - LTEXT "User &name:",-1,29,110,38,8 - EDITTEXT IDC_EDT_NAME,67,108,153,12,ES_AUTOHSCROLL - LTEXT "&Password:",-1,29,126,34,8 - EDITTEXT IDC_EDT_PASSWORD,67,124,153,12,ES_PASSWORD | ES_AUTOHSCROLL + LTEXT "User &name:",-1,29,110,58,8 + EDITTEXT IDC_EDT_NAME,87,108,133,12,ES_AUTOHSCROLL + LTEXT "&Password:",-1,29,126,58,8 + EDITTEXT IDC_EDT_PASSWORD,87,124,133,12,ES_PASSWORD | ES_AUTOHSCROLL CONTROL "&Blank password",IDC_CHK_BLANK,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,29,140,69,10 CONTROL "Allow &saving password",IDC_CHK_SAVE_PASS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,103,140,103,10 LTEXT "3. Enter the &initial catalog to use:",IDC_LBL_INITIAL,14,159,206,8 @@ -111,5 +111,5 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_LST_PROPERTIES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,33,213,155 LTEXT "These are the initialization properties for this type of data. To edit a value, select a property, then choose Edit Value below.",-1,7,7,213,23 - PUSHBUTTON "&Edit Value...",IDC_BTN_EDIT_ALL,7,194,60,14 + PUSHBUTTON "&Edit Value...",IDC_BTN_EDIT_ALL,7,194,100,14 END

1 0

Sven Baars : d3dx9: Implement ID3DXFont_PreloadCharacters.
by Alexandre Julliard 27 Feb '20

27 Feb '20

Module: wine Branch: master Commit: 21fc1f37e76eaced9228eaf62a45489a2bf8ac11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21fc1f37e76eaced9228eaf6… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Thu Feb 27 13:01:41 2020 +0100 d3dx9: Implement ID3DXFont_PreloadCharacters. Based on a patch by Tony Wasserka. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/font.c | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index af743310d1..9196295637 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -220,8 +220,50 @@ static HRESULT WINAPI ID3DXFontImpl_GetGlyphData(ID3DXFont *iface, UINT glyph, static HRESULT WINAPI ID3DXFontImpl_PreloadCharacters(ID3DXFont *iface, UINT first, UINT last) { - FIXME("iface %p, first %u, last %u stub!\n", iface, first, last); - return S_OK; + struct d3dx_font *font = impl_from_ID3DXFont(iface); + unsigned int i, count, start, end; + WORD *indices; + WCHAR *chars; + + TRACE("iface %p, first %u, last %u.\n", iface, first, last); + + if (last < first) + return D3D_OK; + + count = last - first + 1; + indices = heap_alloc(count * sizeof(*indices)); + if (!indices) + return E_OUTOFMEMORY; + + chars = heap_alloc(count * sizeof(*chars)); + if (!chars) + { + heap_free(indices); + return E_OUTOFMEMORY; + } + + for (i = 0; i < count; ++i) + chars[i] = first + i; + + GetGlyphIndicesW(font->hdc, chars, count, indices, 0); + + start = end = indices[0]; + for (i = 1; i < count; ++i) + { + if (indices[i] == end + 1) + { + end = indices[i]; + continue; + } + ID3DXFont_PreloadGlyphs(iface, start, end); + start = end = indices[i]; + } + ID3DXFont_PreloadGlyphs(iface, start, end); + + heap_free(chars); + heap_free(indices); + + return D3D_OK; } static uint32_t morton_decode(uint32_t x)

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 27 Feb '20

27 Feb '20

Module: wine Branch: master Commit: f37c55d77d2313d3657db65ca0ae18ef497cf27c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f37c55d77d2313d3657db65c… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Feb 27 13:36:13 2020 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 84 +++++++++++++++++++--------------------------------------------- 1 file changed, 25 insertions(+), 59 deletions(-) diff --git a/po/fi.po b/po/fi.po index 601b55d65b..88a58e574b 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6835,10 +6835,8 @@ msgid "Sink has not been finalized.\n" msgstr "Ulostuloa ei ole viimeistelty.\n" #: mferror.mc:732 -#, fuzzy -#| msgid "Sink was already stopped.\n" msgid "Clock was stopped\n" -msgstr "Ulostulo oli jo pysäytetty.\n" +msgstr "Kello oli pysäytetty\n" #: mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -7217,10 +7215,8 @@ msgid "Clock state was already set.\n" msgstr "Kellon tila oli jo asetettu.\n" #: mferror.mc:725 -#, fuzzy -#| msgid "Clock is not available.\n" msgid "Clock is not simple\n" -msgstr "Kello ei saatavilla.\n" +msgstr "Kello ei ole yksinkertainen\n" #: mpr.rc:35 wininet.rc:37 msgid "Enter Network Password" @@ -8380,68 +8376,52 @@ msgid "Advanced" msgstr "Kehittynyt" #: version.rc:94 -#, fuzzy -#| msgid "Network share" msgid "Network settings" -msgstr "Verkkojako" +msgstr "Verkkoasetukset" #: version.rc:95 -#, fuzzy -#| msgid "Bad impersonation level.\n" msgid "&Impersonation level:" -msgstr "Tekeytymistaso ei kelpaa.\n" +msgstr "&Tekeytymistaso:" #: version.rc:97 msgid "P&rotection level:" -msgstr "" +msgstr "&Suojaustaso:" #: version.rc:100 -#, fuzzy -#| msgid "Connected" msgid "Connect:" -msgstr "Yhdistetty" +msgstr "Yhdistä:" #: version.rc:102 -#, fuzzy -#| msgid "seconds" msgid "seconds." -msgstr "sekuntia" +msgstr "sekuntia." #: version.rc:103 -#, fuzzy -#| msgid "Success" msgid "A&ccess:" -msgstr "Onnistui" +msgstr "&Käyttöoikeus:" #: version.rc:109 -#, fuzzy -#| msgid "&All" msgid "All" -msgstr "&Kaikki" +msgstr "Kaikki" #: version.rc:113 msgid "" "These are the initialization properties for this type of data. To edit a " "value, select a property, then choose Edit Value below." msgstr "" +"Nämä ovat tietotyypin alustusominaisuudet. Muokataksesi arvoa valitse ensin " +"ominaisuus ja paina sitten Muokkaa arvoa -painiketta." #: version.rc:114 -#, fuzzy -#| msgid "&Edit..." msgid "&Edit Value..." -msgstr "&Muokkaa..." +msgstr "&Muokkaa arvoa..." #: version.rc:49 -#, fuzzy -#| msgid "Data Link Properties" msgid "Data Link Error" -msgstr "Datayhteyden ominaisuudet" +msgstr "Datayhteysvirhe" #: version.rc:50 -#, fuzzy -#| msgid "Please select a file." msgid "Please select a provider." -msgstr "Valitse tiedosto." +msgstr "Valitse tarjoaja." #: version.rc:36 msgid "Data Link Properties" @@ -8452,38 +8432,32 @@ msgid "OLE DB Provider(s)" msgstr "OLE DB -tarjoaja(t)" #: version.rc:41 -#, fuzzy -#| msgid "Ready" msgid "Read" -msgstr "Valmis" +msgstr "Luku" #: version.rc:42 -#, fuzzy -#| msgid "Readme:" msgid "ReadWrite" -msgstr "Ohjeet:" +msgstr "Luku ja kirjoitus" #: version.rc:43 msgid "Share Deny None" -msgstr "" +msgstr "Salli samaan aikaan käyttö" #: version.rc:44 msgid "Share Deny Read" -msgstr "" +msgstr "Estä samaan aikaan lukeminen" #: version.rc:45 msgid "Share Deny Write" -msgstr "" +msgstr "Estä samaan aikaan kirjoittaminen" #: version.rc:46 msgid "Share Exclusive" -msgstr "" +msgstr "Estä kaikki samaan aikaan käyttö" #: version.rc:47 -#, fuzzy -#| msgid "I/O Writes" msgid "Write" -msgstr "I/O – kirjoituksia" +msgstr "Kirjoitus" #: oledlg.rc:55 msgid "Insert Object" @@ -9679,16 +9653,12 @@ msgid "Cape Verde Daylight Time" msgstr "Kap Verden kesäaika" #: tzres.rc:116 -#, fuzzy -#| msgid "Hawaiian Standard Time" msgid "Haiti Standard Time" -msgstr "Havaijin normaaliaika" +msgstr "Haitin normaaliaika" #: tzres.rc:117 -#, fuzzy -#| msgid "Hawaiian Daylight Time" msgid "Haiti Daylight Time" -msgstr "Havaijin kesäaika" +msgstr "Haitin kesäaika" #: tzres.rc:76 msgid "Central European Standard Time" @@ -10295,16 +10265,12 @@ msgid "New Zealand Daylight Time" msgstr "Uuden-Seelannin kesäaika" #: tzres.rc:34 -#, fuzzy -#| msgid "Argentina Standard Time" msgid "Aleutian Standard Time" -msgstr "Argentiinan normaaliaika" +msgstr "Aleuttien normaaliaika" #: tzres.rc:35 -#, fuzzy -#| msgid "Argentina Daylight Time" msgid "Aleutian Daylight Time" -msgstr "Argentiinan kesäaika" +msgstr "Aleuttien kesäaika" #: tzres.rc:72 msgid "Central Brazilian Standard Time"

1 0

Jacek Caban : winebuild: Check more target components for platform string.
by Alexandre Julliard 27 Feb '20

27 Feb '20

Module: wine Branch: master Commit: d24503fecf4d831fdd8d78bd5ddb850957b7402c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d24503fecf4d831fdd8d78bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 27 13:37:51 2020 +0100 winebuild: Check more target components for platform string. Fixes parsing llvm style mingw target *-pc-windows-gnu. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/main.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index ca8f8af03a..e30ecdd4b5 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -197,7 +197,7 @@ static void set_subsystem( const char *subsystem, DLLSPEC *spec ) static void set_target( const char *target ) { unsigned int i; - char *p, *platform, *spec = xstrdup( target ); + char *p, *spec = xstrdup( target ); /* target specification is in the form CPU-MANUFACTURER-OS or CPU-MANUFACTURER-KERNEL-OS */ @@ -213,13 +213,11 @@ static void set_target( const char *target ) cpu = get_cpu_from_name( spec ); if (cpu == -1) fatal_error( "Unrecognized CPU '%s'\n", spec ); target_cpu = cpu; - platform = p; - if ((p = strrchr( p, '-' ))) platform = p + 1; } else if (!strcmp( spec, "mingw32" )) { target_cpu = CPU_x86; - platform = spec; + p = spec; } else fatal_error( "Invalid target specification '%s'\n", target ); @@ -227,13 +225,18 @@ static void set_target( const char *target ) /* get the OS part */ target_platform = PLATFORM_UNSPECIFIED; /* default value */ - for (i = 0; i < ARRAY_SIZE(platform_names); i++) + for (;;) { - if (!strncmp( platform_names[i].name, platform, strlen(platform_names[i].name) )) + for (i = 0; i < ARRAY_SIZE(platform_names); i++) { - target_platform = platform_names[i].platform; - break; + if (!strncmp( platform_names[i].name, p, strlen(platform_names[i].name) )) + { + target_platform = platform_names[i].platform; + break; + } } + if (target_platform != PLATFORM_UNSPECIFIED || !(p = strchr( p, '-' ))) break; + p++; } free( spec );

1 0

Jacek Caban : winegcc: Check more target components for platform string.
by Alexandre Julliard 27 Feb '20

27 Feb '20

Module: wine Branch: master Commit: cf20f54dd9399b2860366140b4bb561839362504 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf20f54dd9399b2860366140… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 27 13:38:12 2020 +0100 winegcc: Check more target components for platform string. Fixes parsing llvm style mingw target *-pc-windows-gnu. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index c3eafdfc21..e53e32e22d 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1395,7 +1395,7 @@ static int is_linker_arg(const char* arg) static void parse_target_option( struct options *opts, const char *target ) { - char *p, *platform, *spec = xstrdup( target ); + char *p, *spec = xstrdup( target ); unsigned int i; /* target specification is in the form CPU-MANUFACTURER-OS or CPU-MANUFACTURER-KERNEL-OS */ @@ -1415,13 +1415,11 @@ static void parse_target_option( struct options *opts, const char *target ) } if (i == ARRAY_SIZE(cpu_names)) error( "Unrecognized CPU '%s'\n", spec ); - platform = p; - if ((p = strrchr( p, '-' ))) platform = p + 1; } else if (!strcmp( spec, "mingw32" )) { opts->target_cpu = CPU_x86; - platform = spec; + p = spec; } else error( "Invalid target specification '%s'\n", target ); @@ -1429,13 +1427,18 @@ static void parse_target_option( struct options *opts, const char *target ) /* get the OS part */ opts->target_platform = PLATFORM_UNSPECIFIED; /* default value */ - for (i = 0; i < ARRAY_SIZE(platform_names); i++) + for (;;) { - if (!strncmp( platform_names[i].name, platform, strlen(platform_names[i].name) )) + for (i = 0; i < ARRAY_SIZE(platform_names); i++) { - opts->target_platform = platform_names[i].platform; - break; + if (!strncmp( platform_names[i].name, p, strlen(platform_names[i].name) )) + { + opts->target_platform = platform_names[i].platform; + break; + } } + if (opts->target_platform != PLATFORM_UNSPECIFIED || !(p = strchr( p, '-' ))) break; + p++; } free( spec );

1 0

Zebediah Figura : ddraw: Set the primary stateblock when executing draw calls.
by Alexandre Julliard 27 Feb '20

27 Feb '20

Module: wine Branch: master Commit: ec21a01c2693d37e2c0152e9f6bbc1ed4bddf391 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec21a01c2693d37e2c0152e9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 26 16:39:24 2020 -0600 ddraw: Set the primary stateblock when executing draw calls. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 48 +++++++++++++++++++++++----------------------- dlls/ddraw/executebuffer.c | 23 +++++++++++----------- dlls/ddraw/vertexbuffer.c | 29 ++++++++++++++-------------- 3 files changed, 49 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ec21a01c2693d37e2c01…

1 0

Zebediah Figura : ddraw: Retrieve textures from the primary stateblock.
by Alexandre Julliard 27 Feb '20

27 Feb '20

Module: wine Branch: master Commit: 7b3419375d827dcabe9b66ac86b46c28839a41b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b3419375d827dcabe9b66ac… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 26 16:39:25 2020 -0600 ddraw: Retrieve textures from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 4ecd83d006..088092830c 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -68,6 +68,7 @@ struct FvfToDecl | WINED3D_LEGACY_CUBEMAP_FILTERING) #define DDRAW_MAX_ACTIVE_LIGHTS 32 +#define DDRAW_MAX_TEXTURES 8 enum ddraw_device_state { diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e18c2c7853..575050acd2 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2462,7 +2462,7 @@ static HRESULT WINAPI d3d_device3_GetRenderState(IDirect3DDevice3 *iface, *value = 0; wined3d_mutex_lock(); - if ((tex = wined3d_device_get_texture(device->wined3d_device, 0))) + if ((tex = wined3d_stateblock_get_state(device->state)->textures[0])) { /* The parent of the texture is the IDirectDrawSurface7 * interface of the ddraw surface. */ @@ -2699,7 +2699,7 @@ static void fixup_texture_alpha_op(struct d3d_device *device) if (!(device->legacyTextureBlending && device->texture_map_blend == D3DTBLEND_MODULATE)) return; - if ((tex = wined3d_device_get_texture(device->wined3d_device, 0))) + if ((tex = wined3d_stateblock_get_state(device->state)->textures[0])) { struct wined3d_resource_desc desc; @@ -4759,8 +4759,15 @@ static HRESULT d3d_device7_GetTexture(IDirect3DDevice7 *iface, if (!texture) return DDERR_INVALIDPARAMS; + if (stage >= DDRAW_MAX_TEXTURES) + { + WARN("Invalid stage %u.\n", stage); + *texture = NULL; + return D3D_OK; + } + wined3d_mutex_lock(); - if (!(wined3d_texture = wined3d_device_get_texture(device->wined3d_device, stage))) + if (!(wined3d_texture = wined3d_stateblock_get_state(device->state)->textures[stage])) { *texture = NULL; wined3d_mutex_unlock();

1 0

Zebediah Figura : ddraw: Stop setting the device state when setting textures.
by Alexandre Julliard 27 Feb '20

27 Feb '20

Module: wine Branch: master Commit: a3931b40e7f89cf6c421fdde8f70df1b4a5b89ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3931b40e7f89cf6c421fdde… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 26 16:39:26 2020 -0600 ddraw: Stop setting the device state when setting textures. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 575050acd2..f189d32d95 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2758,7 +2758,6 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, if (value == 0) { wined3d_stateblock_set_texture(device->state, 0, NULL); - wined3d_device_set_texture(device->wined3d_device, 0, NULL); hr = D3D_OK; break; } @@ -4849,8 +4848,6 @@ static HRESULT d3d_device7_SetTexture(IDirect3DDevice7 *iface, wined3d_mutex_lock(); wined3d_stateblock_set_texture(device->update_state, stage, wined3d_texture); - if (!device->recording) - wined3d_device_set_texture(device->wined3d_device, stage, wined3d_texture); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : ddraw: Retrieve sampler states from the primary stateblock.
by Alexandre Julliard 27 Feb '20

27 Feb '20

Module: wine Branch: master Commit: 4eb5312c4ec951944e2edcd75213297e7101efae URL: https://source.winehq.org/git/wine.git/?a=commit;h=4eb5312c4ec951944e2edcd7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 26 16:39:27 2020 -0600 ddraw: Retrieve sampler states from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index f189d32d95..ec9997c6cb 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2317,9 +2317,8 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, { case D3DRENDERSTATE_TEXTUREMAG: { - enum wined3d_texture_filter_type tex_mag; + enum wined3d_texture_filter_type tex_mag = device_state->sampler_states[0][WINED3D_SAMP_MAG_FILTER]; - tex_mag = wined3d_device_get_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_MAG_FILTER); switch (tex_mag) { case WINED3D_TEXF_POINT: @@ -2340,8 +2339,8 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, enum wined3d_texture_filter_type tex_min; enum wined3d_texture_filter_type tex_mip; - tex_min = wined3d_device_get_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_MIN_FILTER); - tex_mip = wined3d_device_get_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_MIP_FILTER); + tex_min = device_state->sampler_states[0][WINED3D_SAMP_MIN_FILTER]; + tex_mip = device_state->sampler_states[0][WINED3D_SAMP_MIP_FILTER]; switch (tex_min) { case WINED3D_TEXF_POINT: @@ -2390,10 +2389,10 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, case D3DRENDERSTATE_TEXTUREADDRESS: case D3DRENDERSTATE_TEXTUREADDRESSU: - *value = wined3d_device_get_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_ADDRESS_U); + *value = device_state->sampler_states[0][WINED3D_SAMP_ADDRESS_U]; break; case D3DRENDERSTATE_TEXTUREADDRESSV: - *value = wined3d_device_get_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_ADDRESS_V); + *value = device_state->sampler_states[0][WINED3D_SAMP_ADDRESS_V]; break; case D3DRENDERSTATE_BORDERCOLOR: @@ -4951,6 +4950,7 @@ static HRESULT d3d_device7_GetTextureStageState(IDirect3DDevice7 *iface, DWORD stage, D3DTEXTURESTAGESTATETYPE state, DWORD *value) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + const struct wined3d_stateblock_state *device_state; const struct tss_lookup *l; TRACE("iface %p, stage %u, state %#x, value %p.\n", @@ -4965,13 +4965,22 @@ static HRESULT d3d_device7_GetTextureStageState(IDirect3DDevice7 *iface, return DD_OK; } + if (stage >= DDRAW_MAX_TEXTURES) + { + WARN("Invalid stage %u.\n", stage); + *value = 0; + return D3D_OK; + } + l = &tss_lookup[state]; wined3d_mutex_lock(); + device_state = wined3d_stateblock_get_state(device->state); + if (l->sampler_state) { - *value = wined3d_device_get_sampler_state(device->wined3d_device, stage, l->u.sampler_state); + *value = device_state->sampler_states[stage][l->u.sampler_state]; switch (state) { @@ -5031,7 +5040,7 @@ static HRESULT d3d_device7_GetTextureStageState(IDirect3DDevice7 *iface, } else { - *value = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, l->u.texture_state); + *value = device_state->texture_states[stage][l->u.texture_state]; } wined3d_mutex_unlock();

1 0