August 2023 - Wine-commits - list.winehq.org

Dmitry Sokolov : cmd: Fixed var substring in 'enableDelayedExpansion' mode.
by Alexandre Julliard 25 Aug '23

25 Aug '23

Module: wine Branch: master Commit: 7e4715149a96c19233117944b1dcf5db5126c6f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/7e4715149a96c19233117944b1dcf5… Author: Dmitry Sokolov <mr.dmitry.sokolov(a)gmail.com> Date: Thu Aug 24 23:42:43 2023 +0300 cmd: Fixed var substring in 'enableDelayedExpansion' mode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55402 --- programs/cmd/tests/test_builtins.cmd | 11 +++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 5 +++++ programs/cmd/wcmdmain.c | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 0cb05041fa9..28b935ad521 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1275,6 +1275,17 @@ set x=C:\Program Files (x86) if ""=="" set y=%x%\dummy echo %y% +echo --- Testing if + var subst in delayed expansion mode +setlocal enableDelayedExpansion +for %%i in (abc 10.0 11.0) do ( + set result=%%i + echo [DEBUG] checking {!result!} + if "!result:~0,3!"=="10." ( + echo SDKVER=!result! + ) +) +endlocal + echo ------------ Testing for ------------ echo --- plain FOR for %%i in (A B C) do echo %%i diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 16f9d647b8a..57e72a77387 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -927,6 +927,11 @@ x(a)space@ A ------------ Testing if/set ------------ C:\Program Files (x86)\dummy +--- Testing if + var subst in delayed expansion mode +[DEBUG] checking {abc} +[DEBUG] checking {10.0} +SDKVER=10.0 +[DEBUG] checking {11.0} ------------ Testing for ------------ --- plain FOR A diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 528e4a83800..d00c6e07566 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -596,7 +596,7 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR startchar) /* If there's complex substitution, just need %var% for now to get the expanded data to play with */ if (colonpos) { - *colonpos = startchar; + *colonpos = '%'; savedchar = *(colonpos+1); *(colonpos+1) = 0x00; }

1 0

Piotr Caban : localspl: Store fallback print processor in AddPrinterDriver.
by Alexandre Julliard 24 Aug '23

24 Aug '23

Module: wine Branch: master Commit: 3a477206977016ccd62e8b12ae7cd6c5d1cbb2cd URL: https://gitlab.winehq.org/wine/wine/-/commit/3a477206977016ccd62e8b12ae7cd6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 24 16:02:13 2023 +0200 localspl: Store fallback print processor in AddPrinterDriver. --- dlls/localspl/provider.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index be4b81091eb..a0776b11fe9 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -2019,6 +2019,12 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo else RegSetValueExW(hdrv, L"Previous Names", 0, REG_MULTI_SZ, (const BYTE*)L"", sizeof(L"")); + if (di.pszPrintProcessor) + RegSetValueExW(hdrv, L"Print Processor", 0, REG_SZ, (BYTE*)di.pszPrintProcessor, + (wcslen(di.pszPrintProcessor) + 1) * sizeof(WCHAR)); + else + RegSetValueExW(hdrv, L"Print Processor", 0, REG_SZ, (const BYTE*)L"winprint", sizeof(L"winprint")); + if (level > 5) TRACE("level %lu for Driver %s is incomplete\n", level, debugstr_w(di.pName)); RegCloseKey(hdrv);

1 0

Piotr Caban : localspl: Try fallback print processor if datatype is not supported.
by Alexandre Julliard 24 Aug '23

24 Aug '23

Module: wine Branch: master Commit: be5ca1be7c5a9f222d1a718152a3d21a07f194c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/be5ca1be7c5a9f222d1a718152a3d2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 24 17:12:16 2023 +0200 localspl: Try fallback print processor if datatype is not supported. --- dlls/localspl/provider.c | 74 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 57 insertions(+), 17 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index a0776b11fe9..f35931b9bef 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -277,6 +277,7 @@ typedef struct { handle_header_t header; printer_info_t *info; WCHAR *name; + WCHAR *print_proc; WCHAR *datatype; DEVMODEW *devmode; job_info_t *doc; @@ -1833,6 +1834,8 @@ static HANDLE printer_alloc_handle(const WCHAR *name, const WCHAR *basename, PRINTER_DEFAULTSW *def) { printer_t *printer; + HKEY hroot, hkey; + LSTATUS status; printer = calloc(1, sizeof(*printer)); if (!printer) @@ -1860,6 +1863,20 @@ static HANDLE printer_alloc_handle(const WCHAR *name, const WCHAR *basename, if (def && def->pDevMode) printer->devmode = dup_devmode(def->pDevMode); + hroot = open_driver_reg(env_arch.envname); + if (hroot) + { + status = RegOpenKeyW(hroot, name, &hkey); + RegCloseKey(hroot); + if (status == ERROR_SUCCESS) + { + printer->print_proc = reg_query_value(hkey, L"Print Processor"); + RegCloseKey(hkey); + } + } + if (!printer->print_proc) + printer->print_proc = wcsdup(L"winprint"); + return (HANDLE)printer; } @@ -3411,7 +3428,7 @@ static DWORD WINAPI fpStartDocPrinter(HANDLE hprinter, DWORD level, BYTE *doc_in { printer_t *printer = (printer_t *)hprinter; DOC_INFO_1W *info = (DOC_INFO_1W *)doc_info; - BOOL datatype_valid; + BOOL datatype_valid = FALSE; WCHAR *datatype; printproc_t *pp; @@ -3470,13 +3487,23 @@ static DWORD WINAPI fpStartDocPrinter(HANDLE hprinter, DWORD level, BYTE *doc_in if (!pp) { WARN("failed to load %s print processor\n", debugstr_w(printer->info->print_proc)); - pp = print_proc_load(L"winprint"); } - if (!pp) - return 0; + else + { + datatype_valid = print_proc_check_datatype(pp, datatype); + print_proc_unload(pp); + } + + if (!datatype_valid) + { + pp = print_proc_load(printer->print_proc); + if (!pp) + return 0; + + datatype_valid = print_proc_check_datatype(pp, datatype); + print_proc_unload(pp); + } - datatype_valid = print_proc_check_datatype(pp, datatype); - print_proc_unload(pp); if (!datatype_valid) { TRACE("%s datatype not supported by %s\n", debugstr_w(datatype), @@ -3728,11 +3755,11 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) { printer_t *printer = (printer_t *)hprinter; WCHAR output[1024], name[1024], *datatype; + BOOL datatype_valid = FALSE, ret = TRUE; PRINTPROCESSOROPENDATA pp_data; const WCHAR *port_name, *port; job_info_t *job; printproc_t *pp; - BOOL ret = TRUE; HANDLE hpp; HKEY hkey; @@ -3775,15 +3802,6 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) RegCloseKey(hkey); } - pp = print_proc_load(printer->info->print_proc); - if (!pp) - { - WARN("failed to load %s print processor\n", debugstr_w(printer->info->print_proc)); - pp = print_proc_load(L"winprint"); - } - if (!pp) - return FALSE; - if (job->datatype) datatype = job->datatype; else if (printer->datatype) @@ -3791,7 +3809,28 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) else datatype = printer->info->datatype; - if (!print_proc_check_datatype(pp, datatype)) + pp = print_proc_load(printer->info->print_proc); + if (!pp) + { + WARN("failed to load %s print processor\n", debugstr_w(printer->info->print_proc)); + } + else + { + datatype_valid = print_proc_check_datatype(pp, datatype); + if (!datatype_valid) + print_proc_unload(pp); + } + + if (!datatype_valid) + { + pp = print_proc_load(printer->print_proc); + if (!pp) + return FALSE; + + datatype_valid = print_proc_check_datatype(pp, datatype); + } + + if (!datatype_valid) { WARN("%s datatype not supported by %s\n", debugstr_w(datatype), debugstr_w(printer->info->print_proc)); @@ -3981,6 +4020,7 @@ static BOOL WINAPI fpClosePrinter(HANDLE hprinter) release_printer_info(printer->info); free(printer->name); + free(printer->print_proc); free(printer->datatype); free(printer->devmode); free(printer);

1 0

Piotr Caban : winprint: Implement TEXT print processor.
by Alexandre Julliard 24 Aug '23

24 Aug '23

Module: wine Branch: master Commit: 67ca3e71a34f433969c2b9ee098d4bd26c96eb7c URL: https://gitlab.winehq.org/wine/wine/-/commit/67ca3e71a34f433969c2b9ee098d4b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 24 17:45:25 2023 +0200 winprint: Implement TEXT print processor. --- dlls/winprint/printproc.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/winprint/printproc.c b/dlls/winprint/printproc.c index 3c2fb3ad3c8..8627eabd475 100644 --- a/dlls/winprint/printproc.c +++ b/dlls/winprint/printproc.c @@ -25,7 +25,6 @@ * NT EMF 1.006 * NT EMF 1.007 * NT EMF 1.008 - * TEXT * XPS2GDI * * Implement print processor features like e.g. printing multiple copies. */ @@ -66,6 +65,7 @@ BOOL WINAPI EnumPrintProcessorDatatypesW(WCHAR *server, WCHAR *name, DWORD level BYTE *datatypes, DWORD size, DWORD *needed, DWORD *no) { static const WCHAR raw[] = L"RAW"; + static const WCHAR text[] = L"TEXT"; DATATYPES_INFO_1W *info = (DATATYPES_INFO_1W *)datatypes; @@ -79,7 +79,7 @@ BOOL WINAPI EnumPrintProcessorDatatypesW(WCHAR *server, WCHAR *name, DWORD level } *no = 0; - *needed = sizeof(*info) + sizeof(raw); + *needed = 2 * sizeof(*info) + sizeof(raw) + sizeof(text); if (level != 1 || (size && !datatypes)) { @@ -93,9 +93,11 @@ BOOL WINAPI EnumPrintProcessorDatatypesW(WCHAR *server, WCHAR *name, DWORD level return FALSE; } - *no = 1; - info->pName = (WCHAR*)(info + 1); - memcpy(info + 1, raw, sizeof(raw)); + *no = 2; + info[0].pName = (WCHAR*)(info + 2); + info[1].pName = info[0].pName + sizeof(raw) / sizeof(WCHAR); + memcpy(info[0].pName, raw, sizeof(raw)); + memcpy(info[1].pName, text, sizeof(text)); return TRUE; } @@ -111,7 +113,7 @@ HANDLE WINAPI OpenPrintProcessor(WCHAR *port, PRINTPROCESSOROPENDATA *open_data) SetLastError(ERROR_INVALID_PARAMETER); return NULL; } - if (wcscmp(open_data->pDatatype, L"RAW")) + if (wcscmp(open_data->pDatatype, L"RAW") && wcscmp(open_data->pDatatype, L"TEXT")) { SetLastError(ERROR_INVALID_DATATYPE); return NULL;

1 0

Alex Henrie : mmdevapi: Use CRT allocation functions.
by Alexandre Julliard 24 Aug '23

24 Aug '23

Module: wine Branch: master Commit: bd10252332491bc39100f230540b14d59f02255d URL: https://gitlab.winehq.org/wine/wine/-/commit/bd10252332491bc39100f230540b14… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 23 23:37:07 2023 -0600 mmdevapi: Use CRT allocation functions. --- dlls/mmdevapi/audiosessionmanager.c | 4 ++-- dlls/mmdevapi/audiovolume.c | 4 ++-- dlls/mmdevapi/client.c | 6 +++--- dlls/mmdevapi/devenum.c | 40 ++++++++++++++++++------------------- dlls/mmdevapi/main.c | 4 ++-- dlls/mmdevapi/session.c | 14 ++++--------- dlls/mmdevapi/spatialaudio.c | 33 +++++++++++++++--------------- 7 files changed, 49 insertions(+), 56 deletions(-)

1 0

Zebediah Figura : wined3d: Move struct wined3d_texture_gl to wined3d_gl.h.
by Alexandre Julliard 24 Aug '23

24 Aug '23

Module: wine Branch: master Commit: 951d0e94c4de18158170152fd223a938adda6b00 URL: https://gitlab.winehq.org/wine/wine/-/commit/951d0e94c4de18158170152fd223a9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 16:22:54 2023 -0600 wined3d: Move struct wined3d_texture_gl to wined3d_gl.h. --- dlls/wined3d/wined3d_gl.h | 102 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 104 +---------------------------------------- 2 files changed, 103 insertions(+), 103 deletions(-)

1 0

Zebediah Figura : wined3d: Move struct fbo_entry to wined3d_gl.h.
by Alexandre Julliard 24 Aug '23

24 Aug '23

Module: wine Branch: master Commit: 8618b09eef403c5c99169237f47f68dade553e55 URL: https://gitlab.winehq.org/wine/wine/-/commit/8618b09eef403c5c99169237f47f68… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 16:26:55 2023 -0600 wined3d: Move struct fbo_entry to wined3d_gl.h. --- dlls/wined3d/wined3d_gl.h | 24 ++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 24 ------------------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 4654be41bec..b21a38c2e95 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -574,6 +574,30 @@ struct wined3d_command_fence_gl #define MAX_GL_FRAGMENT_SAMPLERS 32 +struct wined3d_fbo_resource +{ + GLuint object; + GLenum target; + GLuint level, layer; +}; + +#define WINED3D_FBO_ENTRY_FLAG_ATTACHED 0x1 +#define WINED3D_FBO_ENTRY_FLAG_DEPTH 0x2 +#define WINED3D_FBO_ENTRY_FLAG_STENCIL 0x4 + +struct fbo_entry +{ + struct list entry; + uint32_t flags; + uint32_t rt_mask; + GLuint id; + struct wined3d_fbo_entry_key + { + uint32_t rb_namespace; + struct wined3d_fbo_resource objects[WINED3D_MAX_RENDER_TARGETS + 1]; + } key; +}; + struct wined3d_context_gl { struct wined3d_context c; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f643de4561e..e167df6db17 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3517,30 +3517,6 @@ HRESULT wined3d_texture_no3d_init(struct wined3d_texture *texture_no3d, struct w #include "wined3d_gl.h" -struct wined3d_fbo_resource -{ - GLuint object; - GLenum target; - GLuint level, layer; -}; - -#define WINED3D_FBO_ENTRY_FLAG_ATTACHED 0x1 -#define WINED3D_FBO_ENTRY_FLAG_DEPTH 0x2 -#define WINED3D_FBO_ENTRY_FLAG_STENCIL 0x4 - -struct fbo_entry -{ - struct list entry; - uint32_t flags; - uint32_t rt_mask; - GLuint id; - struct wined3d_fbo_entry_key - { - DWORD rb_namespace; - struct wined3d_fbo_resource objects[WINED3D_MAX_RENDER_TARGETS + 1]; - } key; -}; - struct wined3d_sampler { struct wine_rb_entry entry;

1 0

Zebediah Figura : wined3d: Move struct wined3d_sampler_gl to wined3d_gl.h.
by Alexandre Julliard 24 Aug '23

24 Aug '23

Module: wine Branch: master Commit: 3308c44b23889d45dd570c22f0500a724c8cf86a URL: https://gitlab.winehq.org/wine/wine/-/commit/3308c44b23889d45dd570c22f0500a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 16:27:19 2023 -0600 wined3d: Move struct wined3d_sampler_gl to wined3d_gl.h. --- dlls/wined3d/wined3d_gl.h | 17 +++++++++++++++++ dlls/wined3d/wined3d_private.h | 20 +------------------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index b21a38c2e95..50222b34360 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1016,4 +1016,21 @@ void wined3d_texture_gl_prepare_texture(struct wined3d_texture_gl *texture_gl, void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *texture_gl, struct wined3d_context_gl *context_gl, unsigned int level, const struct wined3d_rendertarget_info *rt); +struct wined3d_sampler_gl +{ + struct wined3d_sampler s; + + GLuint name; +}; + +static inline struct wined3d_sampler_gl *wined3d_sampler_gl(struct wined3d_sampler *sampler) +{ + return CONTAINING_RECORD(sampler, struct wined3d_sampler_gl, s); +} + +void wined3d_sampler_gl_bind(struct wined3d_sampler_gl *sampler_gl, unsigned int unit, + struct wined3d_texture_gl *texture_gl, const struct wined3d_context_gl *context_gl); +void wined3d_sampler_gl_init(struct wined3d_sampler_gl *sampler_gl, struct wined3d_device *device, + const struct wined3d_sampler_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops); + #endif /* __WINE_WINED3D_GL */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e167df6db17..f353377a836 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3515,8 +3515,6 @@ HRESULT wined3d_texture_no3d_init(struct wined3d_texture *texture_no3d, struct w const struct wined3d_resource_desc *desc, unsigned int layer_count, unsigned int level_count, uint32_t flags, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -#include "wined3d_gl.h" - struct wined3d_sampler { struct wine_rb_entry entry; @@ -3527,23 +3525,7 @@ struct wined3d_sampler struct wined3d_sampler_desc desc; }; -struct wined3d_sampler_gl -{ - struct wined3d_sampler s; - - GLuint name; -}; - -static inline struct wined3d_sampler_gl *wined3d_sampler_gl(struct wined3d_sampler *sampler) -{ - return CONTAINING_RECORD(sampler, struct wined3d_sampler_gl, s); -} - -void wined3d_sampler_gl_bind(struct wined3d_sampler_gl *sampler_gl, unsigned int unit, - struct wined3d_texture_gl *texture_gl, const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; -void wined3d_sampler_gl_init(struct wined3d_sampler_gl *sampler_gl, - struct wined3d_device *device, const struct wined3d_sampler_desc *desc, - void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +#include "wined3d_gl.h" struct wined3d_vertex_declaration_element {

1 0

Zebediah Figura : wined3d: Move struct wined3d_buffer_gl to wined3d_gl.h.
by Alexandre Julliard 24 Aug '23

24 Aug '23

Module: wine Branch: master Commit: b492199b627fb0e9dff654c079d4983c494273c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/b492199b627fb0e9dff654c079d498… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 16:28:02 2023 -0600 wined3d: Move struct wined3d_buffer_gl to wined3d_gl.h. --- dlls/wined3d/wined3d_gl.h | 19 +++++++++++++++++++ dlls/wined3d/wined3d_private.h | 21 +-------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 50222b34360..8221c2362e9 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1033,4 +1033,23 @@ void wined3d_sampler_gl_bind(struct wined3d_sampler_gl *sampler_gl, unsigned int void wined3d_sampler_gl_init(struct wined3d_sampler_gl *sampler_gl, struct wined3d_device *device, const struct wined3d_sampler_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops); +struct wined3d_buffer_gl +{ + struct wined3d_buffer b; +}; + +static inline struct wined3d_buffer_gl *wined3d_buffer_gl(struct wined3d_buffer *buffer) +{ + return CONTAINING_RECORD(buffer, struct wined3d_buffer_gl, b); +} + +static inline const struct wined3d_buffer_gl *wined3d_buffer_gl_const(const struct wined3d_buffer *buffer) +{ + return CONTAINING_RECORD(buffer, struct wined3d_buffer_gl, b); +} + +HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined3d_device *device, + const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, + void *parent, const struct wined3d_parent_ops *parent_ops); + #endif /* __WINE_WINED3D_GL */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f353377a836..b4b94510d2b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3525,8 +3525,6 @@ struct wined3d_sampler struct wined3d_sampler_desc desc; }; -#include "wined3d_gl.h" - struct wined3d_vertex_declaration_element { const struct wined3d_format *format; @@ -3953,24 +3951,7 @@ HRESULT wined3d_buffer_no3d_init(struct wined3d_buffer *buffer_no3d, struct wine const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -struct wined3d_buffer_gl -{ - struct wined3d_buffer b; -}; - -static inline struct wined3d_buffer_gl *wined3d_buffer_gl(struct wined3d_buffer *buffer) -{ - return CONTAINING_RECORD(buffer, struct wined3d_buffer_gl, b); -} - -static inline const struct wined3d_buffer_gl *wined3d_buffer_gl_const(const struct wined3d_buffer *buffer) -{ - return CONTAINING_RECORD(buffer, struct wined3d_buffer_gl, b); -} - -HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined3d_device *device, - const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, - void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +#include "wined3d_gl.h" struct wined3d_rendertarget_view {

1 0

Zebediah Figura : wined3d: Move struct wined3d_rendertarget_view_gl to wined3d_gl.h.
by Alexandre Julliard 24 Aug '23

24 Aug '23

Module: wine Branch: master Commit: ec7465864c70b858411add1ec06d1c13b0c268be URL: https://gitlab.winehq.org/wine/wine/-/commit/ec7465864c70b858411add1ec06d1c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 16:28:39 2023 -0600 wined3d: Move struct wined3d_rendertarget_view_gl to wined3d_gl.h. --- dlls/wined3d/wined3d_gl.h | 16 ++++++++++++++++ dlls/wined3d/wined3d_private.h | 18 +----------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 8221c2362e9..c6cfd3606e4 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1052,4 +1052,20 @@ HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops); +struct wined3d_rendertarget_view_gl +{ + struct wined3d_rendertarget_view v; + struct wined3d_gl_view gl_view; +}; + +static inline struct wined3d_rendertarget_view_gl *wined3d_rendertarget_view_gl( + struct wined3d_rendertarget_view *view) +{ + return CONTAINING_RECORD(view, struct wined3d_rendertarget_view_gl, v); +} + +HRESULT wined3d_rendertarget_view_gl_init(struct wined3d_rendertarget_view_gl *view_gl, + const struct wined3d_view_desc *desc, struct wined3d_resource *resource, + void *parent, const struct wined3d_parent_ops *parent_ops); + #endif /* __WINE_WINED3D_GL */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b4b94510d2b..699dbe585d6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3951,8 +3951,6 @@ HRESULT wined3d_buffer_no3d_init(struct wined3d_buffer *buffer_no3d, struct wine const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -#include "wined3d_gl.h" - struct wined3d_rendertarget_view { LONG refcount; @@ -3993,21 +3991,7 @@ HRESULT wined3d_rendertarget_view_no3d_init(struct wined3d_rendertarget_view *vi const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -struct wined3d_rendertarget_view_gl -{ - struct wined3d_rendertarget_view v; - struct wined3d_gl_view gl_view; -}; - -static inline struct wined3d_rendertarget_view_gl *wined3d_rendertarget_view_gl( - struct wined3d_rendertarget_view *view) -{ - return CONTAINING_RECORD(view, struct wined3d_rendertarget_view_gl, v); -} - -HRESULT wined3d_rendertarget_view_gl_init(struct wined3d_rendertarget_view_gl *view_gl, - const struct wined3d_view_desc *desc, struct wined3d_resource *resource, - void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +#include "wined3d_gl.h" struct wined3d_shader_resource_view {

1 0