June 2019 - Wine-devel - list.winehq.org

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to context_load_vertex_data().
by Henri Verbeet 18 Jun '19

18 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b1dfa0dc260..52f1524ca8c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5092,7 +5092,7 @@ void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context checkGLcall("loadTexCoords"); } -/* This should match any arrays loaded in context_load_vertex_data(). */ +/* This should match any arrays loaded in wined3d_context_gl_load_vertex_data(). */ static void wined3d_context_gl_unload_vertex_data(struct wined3d_context_gl *context_gl) { const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; @@ -5108,20 +5108,19 @@ static void wined3d_context_gl_unload_vertex_data(struct wined3d_context_gl *con context_gl->c.namedArraysLoaded = FALSE; } -static void context_load_vertex_data(struct wined3d_context *context, +static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *context_gl, const struct wined3d_stream_info *si, const struct wined3d_state *state) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const struct wined3d_stream_info_element *e; const struct wined3d_format_gl *format_gl; GLuint current_bo; - TRACE("context %p, si %p, state %p.\n", context, si, state); + TRACE("context_gl %p, si %p, state %p.\n", context_gl, si, state); /* This is used for the fixed-function pipeline only, and the * fixed-function pipeline doesn't do instancing. */ - context->instance_count = 0; + context_gl->c.instance_count = 0; current_bo = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0u : 0; /* Blend data */ @@ -5556,7 +5555,7 @@ void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context TRACE("Loading named arrays.\n"); context_unload_numbered_arrays(&context_gl->c); - context_load_vertex_data(&context_gl->c, &context_gl->c.stream_info, state); + wined3d_context_gl_load_vertex_data(context_gl, &context_gl->c.stream_info, state); context_gl->c.namedArraysLoaded = TRUE; } -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to context_unload_vertex_data().
by Henri Verbeet 18 Jun '19

18 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a024e2844a9..b1dfa0dc260 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5093,12 +5093,11 @@ void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context } /* This should match any arrays loaded in context_load_vertex_data(). */ -static void context_unload_vertex_data(struct wined3d_context *context) +static void wined3d_context_gl_unload_vertex_data(struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; - if (!context->namedArraysLoaded) + if (!context_gl->c.namedArraysLoaded) return; gl_info->gl_ops.gl.p_glDisableClientState(GL_VERTEX_ARRAY); gl_info->gl_ops.gl.p_glDisableClientState(GL_NORMAL_ARRAY); @@ -5106,7 +5105,7 @@ static void context_unload_vertex_data(struct wined3d_context *context) if (gl_info->supported[EXT_SECONDARY_COLOR]) gl_info->gl_ops.gl.p_glDisableClientState(GL_SECONDARY_COLOR_ARRAY_EXT); wined3d_context_gl_unload_tex_coords(context_gl); - context->namedArraysLoaded = FALSE; + context_gl->c.namedArraysLoaded = FALSE; } static void context_load_vertex_data(struct wined3d_context *context, @@ -5547,7 +5546,7 @@ void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context if (context_gl->c.use_immediate_mode_draw) return; - context_unload_vertex_data(&context_gl->c); + wined3d_context_gl_unload_vertex_data(context_gl); if (context_gl->c.d3d_info->ffp_generic_attributes || use_vs(state)) { TRACE("Loading numbered arrays.\n"); @@ -5635,7 +5634,7 @@ void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_te GL_EXTCALL(glGenBuffers(1, &context_gl->blit_vbo)); GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, context_gl->blit_vbo)); - context_unload_vertex_data(context); + wined3d_context_gl_unload_vertex_data(context_gl); context_unload_numbered_arrays(context); GL_EXTCALL(glBufferData(GL_ARRAY_BUFFER, sizeof(quad), quad, GL_STREAM_DRAW)); -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to draw_indirect().
by Henri Verbeet 18 Jun '19

18 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6a7aafc9625..a024e2844a9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4709,10 +4709,10 @@ static void draw_primitive_immediate_mode(struct wined3d_context_gl *context_gl, checkGLcall("draw immediate mode"); } -static void draw_indirect(struct wined3d_context *context, const struct wined3d_state *state, +static void wined3d_context_gl_draw_indirect(struct wined3d_context_gl *context_gl, const struct wined3d_state *state, const struct wined3d_indirect_draw_parameters *parameters, unsigned int idx_size) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_buffer *buffer = parameters->buffer; const void *offset; @@ -4977,7 +4977,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (parameters->indirect) { if (!context->use_immediate_mode_draw && !emulation) - draw_indirect(context, state, &parameters->u.indirect, idx_size); + wined3d_context_gl_draw_indirect(context_gl, state, &parameters->u.indirect, idx_size); else FIXME("Indirect draws with immediate mode/emulation are not supported.\n"); } -- 2.11.0

1 0

Re: WineHQ AppDB and NoCD-Patches
by Tim Schumacher 18 Jun '19

18 Jun '19

On 18.06.19 22:54, Rosanne DiMesio wrote: > On Tue, 18 Jun 2019 21:21:01 +0200 > Tim Schumacher <timschumi(a)gmx.de> wrote: > >> >> The main point is that even on Windows (well, at least on Vista or newer) you'd >> need a NoCD patch to run the game, else I wouldn't have asked this question in >> the first place. >> > I understand that. The issue for the AppDB is that NoCD patches are illegal in many jurisdictions. > >> >> I wasn't planning to do any of those things. I was just planning to say something like >> "Game doesn't start if it has the StarForce copy protection", which would imply that the >> Steam version works (and any other version if they manage to remove the protection _somehow_). >> > I'd prefer you not do that. Test reports are submitted for specific versions, so for the Steam version, you shouldn't have to mention StarForce at all. For the CD version, assuming there was never a legal version without copy protection (if there was, it should be a separate version anyway), then your test report should be based on what you actually tested. I guess the question for you is whether you want to publicly admit to having tested something that may be illegal where you live. > As already mentioned in the E-Mail to Robert, I have come to the conclusion that I should probably keep everything as-is, except for appending "CD/DVD" to the releases that shipped on CD (to avoid future confusion between Steam v1.1 and the v1.1 from CD). I'm also going to keep their ratings on "Garbage" due to the copy protection. Thank you both for your input on this issue. Tim

1 0

Re: WineHQ AppDB and NoCD-Patches
by Tim Schumacher 18 Jun '19

18 Jun '19

On 18.06.19 22:11, Bob Wya wrote: > On Tue, 18 Jun 2019 at 20:21, Tim Schumacher <timschumi(a)gmx.de> wrote: > >> Alright then. I was just confused because they seem to be exactly the same version >> (except for the copy protection of course), down to the version number. >> Based on the responses I have been getting, I'm going to keep the versions >> and ratings as-is, renaming the "1.x.0.0" versions to "1.x.0.0 CD/DVD" >> to avoid future confusion. >> >> Tim >> >> > > Now you're truly making work, where none exists. > > WineHQ AppDB applications often require wildcard versions of the form 1.x > - when an application has frequent major/minor version updates. > > If an application has 2 versions. There is absolutely no reason to merge these. > What purpose does this serve? > > Your time would be better served knocking up some simple 'How to' guides, > that are specific to the DVD/CD and Steam versions. > > All the best, > Robert > I specifically said "version_s_" and "rename", since I don't plan to merge anything. I could have said the following as well, which would have been longer and harder to understand: I'm going to rename "v1.0.0.0" and "v1.1.0.0" to "v1.0.0.0 CD/DVD" and "v1.1.0.0 CD/DVD" respectively to avoid further confusion. I have also come to the conclusion that it's the best solution if I don't do anything except for appending "CD/DVD" to the versions that shipped on CD (to avoid future confusion) and keeping those CD versions on "Garbage" due to the copy protection. Tim

1 0

WineHQ AppDB and NoCD-Patches
by Tim Schumacher 18 Jun '19

18 Jun '19

I am writing here because I have a question concerning AppDB reports and the usage of NoCD-Patches for games. The background to this is that a game called GT Legends relies on a fragile copy protection driver called "StarForce", which hasn't worked properly on everything later than Windows XP (wine doesn't support it either, but the game is in an unplayable state right now anyways, apart from the copy protection issue). Due to this, most of the people that only have the CD version rely on a NoCD-Patch to remove that protection driver. Now the question is, if I update an app's page in the DB ([1]), is it ok if I list something like the following (assuming the game works properly at some point, excluding the copy protection): What works: - Installation - Starting the game (except if the copy protection is active) - ... - ... On another topic, the game can be obtained on two ways, a Steam version and a version that is available on CD/DVD. Now the CD version is at game version v1.0.0.0 by default and there is a official patch to v1.1.0.0, which is the same version number that the Steam version uses. However, apart from the missing copy protection driver in the Steam version, it isn't really known if and what changed between v1.1.0.0 CD and v1.1.0.0 Steam. Would it still be fine to merge "Steam" and "v1.1.0.0" in the AppDB (which is why I chose the wording "if the copy protection is active"), which are currently listed seperately? This would obviously only work if it is OK to mention that the copy protection mustn't be enabled for the game to start (i.e. what I suggested in the first part of the E-Mail), else v1.1.0.0 would have to be listed seperately as "Garbage". Thanks for taking the time reading through this and thanks in advance for your input on this. Tim [1] https://appdb.winehq.org/objectManager.php?sClass=application&iId=3906

2 2

[PATCH] mscoree: Update Wine Mono to 4.9.0.
by Vincent Povirk 18 Jun '19

18 Jun '19

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index ed9ae3a4d2e..08d9f85fac3 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -65,8 +65,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.8.3" -#define MONO_SHA "d6fa1f019bfa3c572438e4a2473ce25af1e937ed4cdcbe46554164ce25db0a76" +#define MONO_VERSION "4.9.0" +#define MONO_SHA "8e2ec7ce6f10faa24e7b1b4bcab99a946dfe975c21327c8420c7abc74ee1c713" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 8311db7684e..7420b4bea3f 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "4.8.3" +#define WINE_MONO_VERSION "4.9.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; -- 2.17.1

1 0

Re: WineHQ AppDB and NoCD-Patches
by Tim Schumacher 18 Jun '19

18 Jun '19

On 18.06.19 19:11, Bob Wya wrote: > On Tue, 18 Jun 2019 at 15:17, Tim Schumacher <timschumi(a)gmx.de> wrote: > ... >> >> On another topic, the game can be obtained on two ways, a Steam version >> and a version that is available on CD/DVD. Now the CD version is at >> game version v1.0.0.0 by default and there is a official patch to v1.1.0.0, >> which is the same version number that the Steam version uses. >> >> However, apart from the missing copy protection driver in the >> Steam version, it isn't really known if and what changed between >> v1.1.0.0 CD and v1.1.0.0 Steam. Would it still be fine to merge >> "Steam" and "v1.1.0.0" in the AppDB (which is why I chose the wording >> "if the copy protection is active"), which are currently listed >> seperately? This would obviously only work if it is OK to mention >> that the copy protection mustn't be enabled for the game to start >> (i.e. what I suggested in the first part of the E-Mail), >> else v1.1.0.0 would have to be listed seperately as "Garbage". >> >> Thanks for taking the time reading through this and thanks in >> advance for your input on this. >> >> Tim >> >> [1] https://appdb.winehq.org/objectManager.php?sClass=application&iId=3906 >> >> > > This makes no sense what-so-ever, and would be inconsistent with the majority > of games listed on the AppDB. This is exactly why I asked, since I am fairly new to all of this compared to most of the people here. > > Games, distributed on different media, should always be kept as > separate versions. > Especially since you've highlighted the fact that the Steam version of > GT Legends > uses Steam's builtin DRM vs. copy protection present in the CD/DVD version > 1.1.0.0 release. > > The current versioning split for GT Legends looks spot-on to me. I was previously wondering if I should split it further apart or if I should merge both versions (since "v1.1.0.0" is kind of ambiguous). Based on your input, I will probably rename the current "1.1.0.0" version to "1.1.0.0 CD/DVD". > > The use a NoCD patch, can be mentioned in the "Extra Comments" section > and the games playability, with the patch, > The overall rating still has to be based on vanilla Wine/Wine Staging. > This is, after all, what is going to govern the end-user's experience... The question was never about modifying wine, but rather about modifying the game (which needs to be done on Windows as well, since the copy protection is faulty there too). > > All the best, > Robert > Thanks again for your input Tim

1 0

On helping new developers
by Zebediah Figura 18 Jun '19

18 Jun '19

Hello all, It's a well-known fact that our wiki sucks and is out of date. I've been making at least some effort to try to improve that. Not much, but... In particular I've just done some lengthy expansion to the "debugging hints" page: https://wiki.winehq.org/Debugging_Hints As a new Wine developer I remember being frustrated by how difficult it is to debug things. To a certain degree I still am, sometimes. While being good at debugging applications in Wine really is a matter of experience more than anything else, I do think there are some things that can be taught, at least as a starting point. To that end I've tried to sort of document my process of debugging, and as many specific tips as I can think of, at that page. This mail, then, is a call to help that. There are plenty of people around who are far more experienced than me, so I'd really appreciate any further tips that they can add to the page. Similarly, any blatant misinformation that I've put in there would be best corrected immediately. ἔρρωσθε, Zeb

7 6

[PATCH v3 1/4] wine.inf: Add the GUID_DEVCLASS_SYSTEM class key.
by Zebediah Figura 18 Jun '19

18 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 844f7c66d46..c3d3b770b5c 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -461,6 +461,8 @@ HKLM,System\CurrentControlSet\Control\Class\{4d36e967-e325-11ce-bfc1-08002be1031 HKLM,System\CurrentControlSet\Control\Class\{4d36e967-e325-11ce-bfc1-08002be10318},"Class",,"DiskDrive" HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},,,"Ports (COM & LPT)" HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},"Class",,"Ports" +HKLM,System\CurrentControlSet\Control\Class\{4d36e97d-e325-11ce-bfc1-08002be10318},,,"System devices" +HKLM,System\CurrentControlSet\Control\Class\{4d36e97d-e325-11ce-bfc1-08002be10318},"Class",,"System" HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092f},,,"Imaging devices" HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092f},"Class",,"Image" HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57da},,,"Human Interface Devices" -- 2.20.1

4 9