wine-commits March 2024

wine-commits@winehq.org

1 participants
775 discussions

Marcus Meissner : ntdll/tests: Fix size passed to GetModuleFileNameW.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: 084c8cc9c033532e86b37756957f3c6eda635cf9 URL: https://gitlab.winehq.org/wine/wine/-/commit/084c8cc9c033532e86b37756957f3c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Mar 12 14:20:27 2024 +0100 ntdll/tests: Fix size passed to GetModuleFileNameW. --- dlls/ntdll/tests/exception.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index e4922aac616..57d1b7f492b 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -10304,7 +10304,7 @@ static void test_backtrace(void) if (count && !buffer[count - 1]) count--; /* win11 32-bit */ RtlPcToFileHeader( buffer[count - 1], &module ); - GetModuleFileNameW( module, name, sizeof(name) ); + GetModuleFileNameW( module, name, ARRAY_SIZE(name) ); if ((p = wcsrchr( name, '\\' ))) p++; else p = name; ok( !wcsicmp( p, L"ntdll.dll" ), "wrong module %p %s for frame %u %p\n",

1 0

Dmitry Timoshkov : d2d1: Make some strings const.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: 354ddcb382f7dffe515fa72a961b5910839b60dc URL: https://gitlab.winehq.org/wine/wine/-/commit/354ddcb382f7dffe515fa72a961b59… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 29 11:01:24 2024 +0300 d2d1: Make some strings const. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/effect.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 755b2821df4..8dc006c1293 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -211,7 +211,7 @@ static HRESULT STDMETHODCALLTYPE builtin_factory_stub(IUnknown **effect_impl) return S_OK; } -static const WCHAR * const _2d_affine_transform_description = +static const WCHAR _2d_affine_transform_description[] = L"<?xml version='1.0'?> \ <Effect> \ <Property name='DisplayName' type='string' value='2D Affine Transform'/> \ @@ -223,7 +223,7 @@ L"<?xml version='1.0'?> \ </Inputs> \ </Effect>"; -static const WCHAR * const _3d_perspective_transform_description = +static const WCHAR _3d_perspective_transform_description[] = L"<?xml version='1.0'?> \ <Effect> \ <Property name='DisplayName' type='string' value='3D Perspective Transform'/> \ @@ -235,7 +235,7 @@ L"<?xml version='1.0'?> </Inputs> \ </Effect>"; -static const WCHAR * const composite_description = +static const WCHAR composite_description[] = L"<?xml version='1.0'?> \ <Effect> \ <Property name='DisplayName' type='string' value='Composite'/> \ @@ -248,7 +248,7 @@ L"<?xml version='1.0'?> \ </Inputs> \ </Effect>"; -static const WCHAR * const crop_description = +static const WCHAR crop_description[] = L"<?xml version='1.0'?> \ <Effect> \ <Property name='DisplayName' type='string' value='Crop'/> \ @@ -260,7 +260,7 @@ L"<?xml version='1.0'?> \ </Inputs> \ </Effect>"; -static const WCHAR * const shadow_description = +static const WCHAR shadow_description[] = L"<?xml version='1.0'?> \ <Effect> \ <Property name='DisplayName' type='string' value='Shadow'/> \ @@ -272,7 +272,7 @@ L"<?xml version='1.0'?> \ </Inputs> \ </Effect>"; -static const WCHAR * const grayscale_description = +static const WCHAR grayscale_description[] = L"<?xml version='1.0'?> \ <Effect> \ <Property name='DisplayName' type='string' value='Grayscale'/> \

1 0

Brendan McGrath : comdlg32: Don't treat cmb1 as the printer list unless in PRINT_SETUP.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: bbdc50c5320dc1c51c080e24bf7ec712c7b847c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/bbdc50c5320dc1c51c080e24bf7ec7… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Tue Jan 30 06:37:13 2024 +1100 comdlg32: Don't treat cmb1 as the printer list unless in PRINT_SETUP. This changes WMCommandW to match WMCommandA. --- dlls/comdlg32/printdlg.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index d300b46a5b6..aed486a9b09 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -1988,7 +1988,10 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam, } break; - case cmb1: /* Printer Combobox in PRINT SETUP */ + case cmb1: /* Printer Combobox in PRINT SETUP, quality combobox in PRINT16 */ + if (PrinterComboID != LOWORD(wParam)) { + break; + } /* FALLTHROUGH */ case cmb4: /* Printer combobox */ if (HIWORD(wParam)==CBN_SELCHANGE) {

1 0

Brendan McGrath : comdlg32: Use ANSI functions in ANSI WMCommandA.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: 39bd338a626accc8c1302b3bf04c4da8700d6dd4 URL: https://gitlab.winehq.org/wine/wine/-/commit/39bd338a626accc8c1302b3bf04c4d… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Tue Jan 30 06:34:47 2024 +1100 comdlg32: Use ANSI functions in ANSI WMCommandA. --- dlls/comdlg32/printdlg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index e90a9e00efb..d300b46a5b6 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -1840,8 +1840,8 @@ static LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam, case cmb4: /* Printer combobox */ if (HIWORD(wParam)==CBN_SELCHANGE) { char *PrinterName; - INT index = SendDlgItemMessageW(hDlg, LOWORD(wParam), CB_GETCURSEL, 0, 0); - INT length = SendDlgItemMessageW(hDlg, LOWORD(wParam), CB_GETLBTEXTLEN, index, 0); + INT index = SendDlgItemMessageA(hDlg, LOWORD(wParam), CB_GETCURSEL, 0, 0); + INT length = SendDlgItemMessageA(hDlg, LOWORD(wParam), CB_GETLBTEXTLEN, index, 0); PrinterName = malloc(length + 1); SendDlgItemMessageA(hDlg, LOWORD(wParam), CB_GETLBTEXT, index, (LPARAM)PrinterName); PRINTDLG_ChangePrinterA(hDlg, PrinterName, PrintStructures);

1 0

Brendan McGrath : comdlg32: Populate printer name on the print dialogs.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: 91207991f2c64ed9f5cc564926c5b0e528712e44 URL: https://gitlab.winehq.org/wine/wine/-/commit/91207991f2c64ed9f5cc564926c5b0… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Tue Jan 23 13:24:01 2024 +1100 comdlg32: Populate printer name on the print dialogs. This will display the name of the selected printer on the Print dialog and the default printer on the Print Setup dialog --- dlls/comdlg32/printdlg.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index b777a83825f..e90a9e00efb 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -978,10 +978,11 @@ static BOOL PRINTDLG_SetUpPaperComboBoxW(HWND hDlg, /*********************************************************************** * PRINTDLG_UpdatePrinterInfoTexts [internal] */ -static void PRINTDLG_UpdatePrinterInfoTextsA(HWND hDlg, const PRINTER_INFO_2A *pi) +static void PRINTDLG_UpdatePrinterInfoTextsA(HWND hDlg, DWORD flags, const PRINTER_INFO_2A *pi) { char StatusMsg[256]; char ResourceString[256]; + char printer_name[256]; int i; /* Status Message */ @@ -1004,6 +1005,17 @@ static void PRINTDLG_UpdatePrinterInfoTextsA(HWND hDlg, const PRINTER_INFO_2A *p SetDlgItemTextA(hDlg, stc12, StatusMsg); /* set all other printer info texts */ + if (flags & PD_PRINTSETUP) + { + DWORD dwBufLen = ARRAY_SIZE(printer_name); + GetDefaultPrinterA(printer_name, &dwBufLen); + } + else + { + /* FIXME: Windows decorates the printer name with text like 'System Printer' or 'on <port>'. */ + lstrcpynA(printer_name, pi->pPrinterName, ARRAY_SIZE(printer_name)); + } + SetDlgItemTextA(hDlg, stc1, printer_name); SetDlgItemTextA(hDlg, stc11, pi->pDriverName); if (pi->pLocation != NULL && pi->pLocation[0] != '\0') @@ -1014,11 +1026,12 @@ static void PRINTDLG_UpdatePrinterInfoTextsA(HWND hDlg, const PRINTER_INFO_2A *p return; } -static void PRINTDLG_UpdatePrinterInfoTextsW(HWND hDlg, const PRINTER_INFO_2W *pi) +static void PRINTDLG_UpdatePrinterInfoTextsW(HWND hDlg, DWORD flags, const PRINTER_INFO_2W *pi) { WCHAR StatusMsg[256]; WCHAR ResourceString[256]; - int i; + WCHAR printer_name[256]; + int i; /* Status Message */ StatusMsg[0]='\0'; @@ -1040,6 +1053,17 @@ static void PRINTDLG_UpdatePrinterInfoTextsW(HWND hDlg, const PRINTER_INFO_2W *p SetDlgItemTextW(hDlg, stc12, StatusMsg); /* set all other printer info texts */ + if (flags & PD_PRINTSETUP) + { + DWORD dwBufLen = ARRAY_SIZE(printer_name); + GetDefaultPrinterW(printer_name, &dwBufLen); + } + else + { + /* FIXME: Windows decorates the printer name with text like 'System Printer' or 'on <port>'. */ + lstrcpynW(printer_name, pi->pPrinterName, ARRAY_SIZE(printer_name)); + } + SetDlgItemTextW(hDlg, stc1, printer_name); SetDlgItemTextW(hDlg, stc11, pi->pDriverName); if (pi->pLocation != NULL && pi->pLocation[0] != '\0') SetDlgItemTextW(hDlg, stc14, pi->pLocation); @@ -1081,7 +1105,7 @@ static BOOL PRINTDLG_ChangePrinterA(HWND hDlg, char *name, PRINT_PTRA *PrintStru } ClosePrinter(hprn); - PRINTDLG_UpdatePrinterInfoTextsA(hDlg, PrintStructures->lpPrinterInfo); + PRINTDLG_UpdatePrinterInfoTextsA(hDlg, lppd->Flags, PrintStructures->lpPrinterInfo); free(PrintStructures->lpDevMode); PrintStructures->lpDevMode = NULL; @@ -1288,7 +1312,7 @@ static BOOL PRINTDLG_ChangePrinterW(HWND hDlg, WCHAR *name, } ClosePrinter(hprn); - PRINTDLG_UpdatePrinterInfoTextsW(hDlg, PrintStructures->lpPrinterInfo); + PRINTDLG_UpdatePrinterInfoTextsW(hDlg, lppd->Flags, PrintStructures->lpPrinterInfo); free(PrintStructures->lpDevMode); PrintStructures->lpDevMode = NULL;

1 0

Brendan McGrath : comdlg32: Add resolutions to PRINTDLG_ChangePrinterW.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: 8b7d1a65d0201271cea40d1a6474eb40df834e22 URL: https://gitlab.winehq.org/wine/wine/-/commit/8b7d1a65d0201271cea40d1a6474eb… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Tue Jan 23 13:15:42 2024 +1100 comdlg32: Add resolutions to PRINTDLG_ChangePrinterW. This was done in PRINTDLG_ChangePrinterA, but missing from PRINTDLG_ChangePrinterW --- dlls/comdlg32/printdlg.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 2a2b7e9d1b2..b777a83825f 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -1386,6 +1386,61 @@ static BOOL PRINTDLG_ChangePrinterW(HWND hDlg, WCHAR *name, if (lppd->Flags & PD_HIDEPRINTTOFILE) ShowWindow(GetDlgItem(hDlg, chx1), SW_HIDE); + /* Fill print quality combo, PrintDlg16 */ + if (GetDlgItem(hDlg, cmb1)) + { + DWORD num_resolutions = DeviceCapabilitiesW(PrintStructures->lpPrinterInfo->pPrinterName, + PrintStructures->lpPrinterInfo->pPortName, + DC_ENUMRESOLUTIONS, NULL, lpdm); + + if (num_resolutions != -1) + { + HWND quality = GetDlgItem(hDlg, cmb1); + LONG* resolutions; + WCHAR buf[255]; + DWORD i; + int dpiX, dpiY; + HDC printer = CreateDCW(PrintStructures->lpPrinterInfo->pDriverName, + PrintStructures->lpPrinterInfo->pPrinterName, + 0, lpdm); + + resolutions = malloc(num_resolutions * sizeof(LONG) * 2); + DeviceCapabilitiesW(PrintStructures->lpPrinterInfo->pPrinterName, + PrintStructures->lpPrinterInfo->pPortName, + DC_ENUMRESOLUTIONS, (LPWSTR)resolutions, lpdm); + + dpiX = GetDeviceCaps(printer, LOGPIXELSX); + dpiY = GetDeviceCaps(printer, LOGPIXELSY); + DeleteDC(printer); + + SendMessageW(quality, CB_RESETCONTENT, 0, 0); + for (i = 0; i < (num_resolutions * 2); i += 2) + { + BOOL is_default = FALSE; + LRESULT index; + + if (resolutions[i] == resolutions[i+1]) + { + if (dpiX == resolutions[i]) + is_default = TRUE; + swprintf(buf, sizeof(buf), L"%ld dpi", resolutions[i]); + } else + { + if (dpiX == resolutions[i] && dpiY == resolutions[i+1]) + is_default = TRUE; + swprintf(buf, sizeof(buf), L"%ld dpi x %ld dpi", resolutions[i], resolutions[i+1]); + } + + index = SendMessageW(quality, CB_ADDSTRING, 0, (LPARAM)buf); + + if (is_default) + SendMessageW(quality, CB_SETCURSEL, index, 0); + + SendMessageW(quality, CB_SETITEMDATA, index, MAKELONG(resolutions[i], resolutions[i+1])); + } + free(resolutions); + } + } } else { /* PD_PRINTSETUP */ BOOL bPortrait = (lpdm->dmOrientation == DMORIENT_PORTRAIT);

1 0

Brendan McGrath : comdlg32: Use values from DeviceCapabilities in combobox.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: 4ec559743d254e3547c0cabdcb1014854404e108 URL: https://gitlab.winehq.org/wine/wine/-/commit/4ec559743d254e3547c0cabdcb1014… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Tue Jan 30 06:05:23 2024 +1100 comdlg32: Use values from DeviceCapabilities in combobox. dpiX,dpiY are the default printer values from the GetDeviceCaps calls. This causes the item data to be the same for every option in the combobox. The item data should reflect the selected values. --- dlls/comdlg32/printdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 700119bc9ff..2a2b7e9d1b2 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -1229,7 +1229,7 @@ static BOOL PRINTDLG_ChangePrinterA(HWND hDlg, char *name, PRINT_PTRA *PrintStru if(IsDefault) SendMessageA(hQuality, CB_SETCURSEL, Index, 0); - SendMessageA(hQuality, CB_SETITEMDATA, Index, MAKELONG(dpiX,dpiY)); + SendMessageA(hQuality, CB_SETITEMDATA, Index, MAKELONG(Resolutions[i], Resolutions[i+1])); } free(Resolutions); }

1 0

Gabriel Ivăncescu : shell32: Construct the proper path target for UnixFolder.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: a9b3fdd3aebe0ef2f7f7905864e7c4fe01f5c4fd URL: https://gitlab.winehq.org/wine/wine/-/commit/a9b3fdd3aebe0ef2f7f7905864e7c4… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 4 21:52:06 2024 +0200 shell32: Construct the proper path target for UnixFolder. Worse than just no unix integration is that it can actually crash if you parse e.g. "/". Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shell32/shfldr_fs.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 808b20c9cae..928cadfc77c 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1797,7 +1797,7 @@ static const IDropTargetVtbl dtvt = { ISFDropTarget_Drop }; -static HRESULT create_fs( IUnknown *outer_unk, REFIID riid, void **ppv, const CLSID *clsid) +static HRESULT create_fs( IUnknown *outer_unk, REFIID riid, void **ppv, const CLSID *clsid, const WCHAR *path_target) { IGenericSFImpl *sf; HRESULT hr; @@ -1820,6 +1820,16 @@ static HRESULT create_fs( IUnknown *outer_unk, REFIID riid, void **ppv, const CL sf->ISFHelper_iface.lpVtbl = &shvt; sf->pclsid = clsid; sf->outer_unk = outer_unk ? outer_unk : &sf->IUnknown_inner; + if (path_target) + { + SIZE_T size = (wcslen(path_target) + 1) * sizeof(WCHAR); + if (!(sf->sPathTarget = SHAlloc(size))) + { + LocalFree(sf); + return E_OUTOFMEMORY; + } + memcpy(sf->sPathTarget, path_target, size); + } hr = IUnknown_QueryInterface(&sf->IUnknown_inner, riid, ppv); IUnknown_Release(&sf->IUnknown_inner); @@ -1830,25 +1840,25 @@ static HRESULT create_fs( IUnknown *outer_unk, REFIID riid, void **ppv, const CL HRESULT WINAPI IFSFolder_Constructor(IUnknown *outer_unk, REFIID riid, void **ppv) { - return create_fs( outer_unk, riid, ppv, &CLSID_ShellFSFolder ); + return create_fs( outer_unk, riid, ppv, &CLSID_ShellFSFolder, NULL ); } HRESULT WINAPI UnixFolder_Constructor(IUnknown *outer_unk, REFIID riid, void **ppv) { - return create_fs( outer_unk, riid, ppv, &CLSID_UnixFolder ); + return create_fs( outer_unk, riid, ppv, &CLSID_UnixFolder, L"\\\\?\\unix\\" ); } HRESULT WINAPI UnixDosFolder_Constructor(IUnknown *outer_unk, REFIID riid, void **ppv) { - return create_fs( outer_unk, riid, ppv, &CLSID_UnixDosFolder ); + return create_fs( outer_unk, riid, ppv, &CLSID_UnixDosFolder, NULL ); } HRESULT WINAPI FolderShortcut_Constructor(IUnknown *outer_unk, REFIID riid, void **ppv) { - return create_fs( outer_unk, riid, ppv, &CLSID_FolderShortcut ); + return create_fs( outer_unk, riid, ppv, &CLSID_FolderShortcut, NULL ); } HRESULT WINAPI MyDocuments_Constructor(IUnknown *outer_unk, REFIID riid, void **ppv) { - return create_fs( outer_unk, riid, ppv, &CLSID_MyDocuments ); + return create_fs( outer_unk, riid, ppv, &CLSID_MyDocuments, NULL ); }

1 0

Nikolay Sivov : d3d10/tests: Add a small effect compilation test.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: 40afa8d937e034bf4183a9b6773c5ce449e12ec9 URL: https://gitlab.winehq.org/wine/wine/-/commit/40afa8d937e034bf4183a9b6773c5c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 10 11:37:59 2024 +0100 d3d10/tests: Add a small effect compilation test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/tests/effect.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index a9f4c1e47e5..0935541ced0 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -9875,6 +9875,36 @@ static void test_effect_fx_4_1_blend_state(void) ok(!refcount, "Device has %lu references left.\n", refcount); } +static void test_effect_compiler(void) +{ + static char empty_effect[] = "technique10 {};"; + D3D10_EFFECT_DESC desc; + ID3D10Device *device; + ID3D10Effect *effect; + ID3D10Blob *blob; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = D3D10CompileEffectFromMemory(empty_effect, sizeof(empty_effect), NULL, NULL, NULL, 0, 0, + &blob, NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = create_effect(ID3D10Blob_GetBufferPointer(blob), 0, device, NULL, &effect); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = ID3D10Effect_GetDesc(effect, &desc); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(desc.Techniques == 1, "Unexpected technique count %u.\n", desc.Techniques); + ID3D10Effect_Release(effect); + + ID3D10Device_Release(device); + ID3D10Blob_Release(blob); +} + START_TEST(effect) { test_effect_constant_buffer_type(); @@ -9903,4 +9933,5 @@ START_TEST(effect) test_effect_value_expression(); test_effect_fx_4_1(); test_effect_fx_4_1_blend_state(); + test_effect_compiler(); }

1 0

Nikolay Sivov : d3dcompiler: Wrap fx_4_x output in a dxbc container.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: a44681e19be3d4c20cb6c98e1a12e7982b94acce URL: https://gitlab.winehq.org/wine/wine/-/commit/a44681e19be3d4c20cb6c98e1a12e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 10 11:20:51 2024 +0100 d3dcompiler: Wrap fx_4_x output in a dxbc container. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dcompiler_43/compiler.c | 14 ++++++++++++++ dlls/d3dcompiler_43/d3dcompiler_private.h | 1 + 2 files changed, 15 insertions(+) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index c1940e8d888..e5c9981ded5 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -601,6 +601,20 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen return S_OK; } + /* Unlike other effect profiles fx_4_x is using DXBC container. */ + if (!strcmp(profile, "fx_4_0") || !strcmp(profile, "fx_4_1")) + { + struct vkd3d_shader_dxbc_section_desc section = { .tag = TAG_FX10, .data = byte_code }; + struct vkd3d_shader_code dxbc; + + ret = vkd3d_shader_serialize_dxbc(1, &section, &dxbc, NULL); + vkd3d_shader_free_shader_code(&byte_code); + if (ret) + return hresult_from_vkd3d_result(ret); + + byte_code = dxbc; + } + if (SUCCEEDED(hr = D3DCreateBlob(byte_code.size, shader_blob))) memcpy(ID3D10Blob_GetBufferPointer(*shader_blob), byte_code.code, byte_code.size); diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 33c82c000c5..a1759da661e 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -523,6 +523,7 @@ void SlDeleteShader(struct bwriter_shader *shader); ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) #define TAG_Aon9 MAKE_TAG('A', 'o', 'n', '9') #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') +#define TAG_FX10 MAKE_TAG('F', 'X', '1', '0') #define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') #define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') #define TAG_OSG5 MAKE_TAG('O', 'S', 'G', '5')

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2024