wine-commits May 2017

wine-commits@winehq.org

2 participants
640 discussions

Józef Kucia : wined3d: Introduce query operation to destroy queries.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: be20ddc38b3f9e101460f5f8f04015b148d3e13d URL: http://source.winehq.org/git/wine.git/?a=commit;h=be20ddc38b3f9e101460f5f8f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 26 10:48:03 2017 +0200 wined3d: Introduce query operation to destroy queries. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 12 +++--- dlls/wined3d/query.c | 92 +++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 55 insertions(+), 51 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index ab2fea3..5740d65 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -187,7 +187,8 @@ static void buffer_destroy_buffer_object(struct wined3d_buffer *buffer, struct w if (buffer->query) { - wined3d_event_query_destroy(buffer->query); + struct wined3d_query *query = &buffer->query->query; + query->query_ops->query_destroy(query); buffer->query = NULL; } buffer->flags &= ~WINED3D_BUFFER_APPLESYNC; @@ -827,7 +828,7 @@ static void buffer_sync_apple(struct wined3d_buffer *This, DWORD flags, const st return; } - if(!This->query) + if (!This->query) { TRACE("Creating event query for buffer %p\n", This); @@ -850,7 +851,7 @@ static void buffer_sync_apple(struct wined3d_buffer *This, DWORD flags, const st } TRACE("Synchronizing buffer %p\n", This); ret = wined3d_event_query_finish(This->query, This->resource.device); - switch(ret) + switch (ret) { case WINED3D_EVENT_QUERY_NOT_STARTED: case WINED3D_EVENT_QUERY_OK: @@ -867,9 +868,10 @@ static void buffer_sync_apple(struct wined3d_buffer *This, DWORD flags, const st } drop_query: - if(This->query) + if (This->query) { - wined3d_event_query_destroy(This->query); + struct wined3d_query *query = &This->query->query; + query->query_ops->query_destroy(query); This->query = NULL; } diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 28db6be..5587113 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -66,12 +66,6 @@ BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) return gl_info->supported[ARB_SYNC] || gl_info->supported[NV_FENCE] || gl_info->supported[APPLE_FENCE]; } -void wined3d_event_query_destroy(struct wined3d_event_query *query) -{ - if (query->context) context_free_event_query(query); - HeapFree(GetProcessHeap(), 0, query); -} - static enum wined3d_event_query_result wined3d_event_query_test(const struct wined3d_event_query *query, const struct wined3d_device *device, DWORD flags) { @@ -274,45 +268,7 @@ static void wined3d_query_destroy_object(void *object) * deleting the query will obviously leak it, but that's still better * than potentially deleting a different query with the same id in this * context, and (still) leaking the actual query. */ - if (query->type == WINED3D_QUERY_TYPE_EVENT) - { - wined3d_event_query_destroy(wined3d_event_query_from_query(query)); - } - else if (query->type == WINED3D_QUERY_TYPE_OCCLUSION) - { - struct wined3d_occlusion_query *oq = wined3d_occlusion_query_from_query(query); - - if (oq->context) - context_free_occlusion_query(oq); - HeapFree(GetProcessHeap(), 0, oq); - } - else if (query->type == WINED3D_QUERY_TYPE_TIMESTAMP) - { - struct wined3d_timestamp_query *tq = wined3d_timestamp_query_from_query(query); - - if (tq->context) - context_free_timestamp_query(tq); - HeapFree(GetProcessHeap(), 0, tq); - } - else if (query->type == WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT - || query->type == WINED3D_QUERY_TYPE_TIMESTAMP_FREQ) - { - HeapFree(GetProcessHeap(), 0, query); - } - else if (query->type == WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0 - || query->type == WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM1 - || query->type == WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM2 - || query->type == WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3) - { - struct wined3d_so_statistics_query *pq = wined3d_so_statistics_query_from_query(query); - if (pq->context) - context_free_so_statistics_query(pq); - HeapFree(GetProcessHeap(), 0, pq); - } - else - { - ERR("Query %p has invalid type %#x.\n", query, query->type); - } + query->query_ops->query_destroy(query); } ULONG CDECL wined3d_query_decref(struct wined3d_query *query) @@ -773,10 +729,20 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D return poll; } +static void wined3d_event_query_ops_destroy(struct wined3d_query *query) +{ + struct wined3d_event_query *event_query = wined3d_event_query_from_query(query); + + if (event_query->context) + context_free_event_query(event_query); + HeapFree(GetProcessHeap(), 0, event_query); +} + static const struct wined3d_query_ops event_query_ops = { wined3d_event_query_ops_poll, wined3d_event_query_ops_issue, + wined3d_event_query_ops_destroy, }; static HRESULT wined3d_event_query_create(struct wined3d_device *device, @@ -807,10 +773,20 @@ static HRESULT wined3d_event_query_create(struct wined3d_device *device, return WINED3D_OK; } +static void wined3d_occlusion_query_ops_destroy(struct wined3d_query *query) +{ + struct wined3d_occlusion_query *oq = wined3d_occlusion_query_from_query(query); + + if (oq->context) + context_free_occlusion_query(oq); + HeapFree(GetProcessHeap(), 0, oq); +} + static const struct wined3d_query_ops occlusion_query_ops = { wined3d_occlusion_query_ops_poll, wined3d_occlusion_query_ops_issue, + wined3d_occlusion_query_ops_destroy, }; static HRESULT wined3d_occlusion_query_create(struct wined3d_device *device, @@ -841,10 +817,20 @@ static HRESULT wined3d_occlusion_query_create(struct wined3d_device *device, return WINED3D_OK; } +static void wined3d_timestamp_query_ops_destroy(struct wined3d_query *query) +{ + struct wined3d_timestamp_query *tq = wined3d_timestamp_query_from_query(query); + + if (tq->context) + context_free_timestamp_query(tq); + HeapFree(GetProcessHeap(), 0, tq); +} + static const struct wined3d_query_ops timestamp_query_ops = { wined3d_timestamp_query_ops_poll, wined3d_timestamp_query_ops_issue, + wined3d_timestamp_query_ops_destroy, }; static HRESULT wined3d_timestamp_query_create(struct wined3d_device *device, @@ -875,10 +861,16 @@ static HRESULT wined3d_timestamp_query_create(struct wined3d_device *device, return WINED3D_OK; } +static void wined3d_timestamp_disjoint_query_ops_destroy(struct wined3d_query *query) +{ + HeapFree(GetProcessHeap(), 0, query); +} + static const struct wined3d_query_ops timestamp_disjoint_query_ops = { wined3d_timestamp_disjoint_query_ops_poll, wined3d_timestamp_disjoint_query_ops_issue, + wined3d_timestamp_disjoint_query_ops_destroy, }; static HRESULT wined3d_timestamp_disjoint_query_create(struct wined3d_device *device, @@ -921,10 +913,20 @@ static HRESULT wined3d_timestamp_disjoint_query_create(struct wined3d_device *de return WINED3D_OK; } +static void wined3d_so_statistics_query_ops_destroy(struct wined3d_query *query) +{ + struct wined3d_so_statistics_query *pq = wined3d_so_statistics_query_from_query(query); + + if (pq->context) + context_free_so_statistics_query(pq); + HeapFree(GetProcessHeap(), 0, pq); +} + static const struct wined3d_query_ops so_statistics_query_ops = { wined3d_so_statistics_query_ops_poll, wined3d_so_statistics_query_ops_issue, + wined3d_so_statistics_query_ops_destroy, }; static HRESULT wined3d_so_statistics_query_create(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6139c67..1810985 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1621,6 +1621,7 @@ struct wined3d_query_ops { BOOL (*query_poll)(struct wined3d_query *query, DWORD flags); BOOL (*query_issue)(struct wined3d_query *query, DWORD flags); + void (*query_destroy)(struct wined3d_query *query); }; struct wined3d_query @@ -1665,7 +1666,6 @@ enum wined3d_event_query_result WINED3D_EVENT_QUERY_ERROR }; -void wined3d_event_query_destroy(struct wined3d_event_query *query) DECLSPEC_HIDDEN; enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_event_query *query, const struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_event_query_issue(struct wined3d_event_query *query, const struct wined3d_device *device) DECLSPEC_HIDDEN;

1 0

Józef Kucia : wined3d: Require just specific OpenGL extensions and SM4 support for SM5.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 0a923d523360935d318d30b5ec9a02bb53c5e702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a923d523360935d318d30b5e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 26 10:48:02 2017 +0200 wined3d: Require just specific OpenGL extensions and SM4 support for SM5. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 -- dlls/wined3d/glsl_shader.c | 38 ++++++++++++++++++++++---------------- dlls/wined3d/wined3d_gl.h | 1 - 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7273d6c..6b5ef8a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4012,8 +4012,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, gl_info->supported[WINED3D_GL_VERSION_2_0] = TRUE; if (gl_version >= MAKEDWORD_VERSION(3, 2)) gl_info->supported[WINED3D_GL_VERSION_3_2] = TRUE; - if (gl_version >= MAKEDWORD_VERSION(4, 3)) - gl_info->supported[WINED3D_GL_VERSION_4_3] = TRUE; /* All the points are actually point sprites in core contexts, the APIs from * ARB_point_sprite are not supported anymore. */ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 73ab7a6..6a405ba 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10511,15 +10511,15 @@ static void shader_glsl_init_context_state(struct wined3d_context *context) checkGLcall("GL_PROGRAM_POINT_SIZE"); } -static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct shader_caps *caps) +static unsigned int shader_glsl_get_shader_model(const struct wined3d_gl_info *gl_info) { - unsigned int shader_model; + BOOL shader_model_4 = gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) + && gl_info->supported[WINED3D_GL_VERSION_3_2] + && gl_info->supported[ARB_SAMPLER_OBJECTS] + && gl_info->supported[ARB_SHADER_BIT_ENCODING] + && gl_info->supported[ARB_TEXTURE_SWIZZLE]; - /* FIXME: Check for the specific extensions required for SM5 support - * (ARB_compute_shader, ARB_tessellation_shader, ARB_gpu_shader5, ...) as - * soon as we introduce them, adjusting the GL / GLSL version checks - * accordingly. */ - if (gl_info->glsl_version >= MAKEDWORD_VERSION(4, 30) && gl_info->supported[WINED3D_GL_VERSION_4_3] + if (shader_model_4 && gl_info->supported[ARB_COMPUTE_SHADER] && gl_info->supported[ARB_DERIVATIVE_CONTROL] && gl_info->supported[ARB_GPU_SHADER5] @@ -10530,17 +10530,23 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s && gl_info->supported[ARB_TESSELLATION_SHADER] && gl_info->supported[ARB_TEXTURE_GATHER] && gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) - shader_model = 5; - else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) && gl_info->supported[WINED3D_GL_VERSION_3_2] - && gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->supported[ARB_SAMPLER_OBJECTS] - && gl_info->supported[ARB_TEXTURE_SWIZZLE]) - shader_model = 4; + return 5; + + if (shader_model_4) + return 4; + /* Support for texldd and texldl instructions in pixel shaders is required * for SM3. */ - else if (shader_glsl_has_core_grad(gl_info) || gl_info->supported[ARB_SHADER_TEXTURE_LOD]) - shader_model = 3; - else - shader_model = 2; + if (shader_glsl_has_core_grad(gl_info) || gl_info->supported[ARB_SHADER_TEXTURE_LOD]) + return 3; + + return 2; +} + +static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct shader_caps *caps) +{ + unsigned int shader_model = shader_glsl_get_shader_model(gl_info); + TRACE("Shader model %u.\n", shader_model); caps->vs_version = min(wined3d_settings.max_sm_vs, shader_model); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 34599fd..3806869 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -206,7 +206,6 @@ enum wined3d_gl_extension WINED3D_GL_PRIMITIVE_QUERY, WINED3D_GL_VERSION_2_0, WINED3D_GL_VERSION_3_2, - WINED3D_GL_VERSION_4_3, WINED3D_GLSL_130, WINED3D_GL_EXT_COUNT,

1 0

Rosanne DiMesio : Allow Extra Comments text to wrap
by Jeremy Newman 30 May '17

30 May '17

Module: appdb Branch: master Commit: 1a4adc1cc21ffb878bf5b9b8d92833bdc591e669 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=1a4adc1cc21ffb878bf5b9b8… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Tue May 30 13:56:58 2017 -0500 Allow Extra Comments text to wrap Wraps text in the Extra Comments field to the window so users don't have to scroll horizontally. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/testData.php b/include/testData.php index 8ba45c1..07918bb 100644 --- a/include/testData.php +++ b/include/testData.php @@ -524,7 +524,7 @@ class testData{ return "What works\n{$this->shWhatWorks}\n". "What does not\n{$this->shWhatDoesnt}\n". "What was not tested\n{$this->shWhatNotTested}\n". - "Additional Comments\n<pre>{$this->sComments}</pre>\n"; + "Additional Comments\n<pre style='white-space: pre-wrap;'>{$this->sComments}</pre>\n"; } function CreateTestTable()

1 0

Rosanne DiMesio : Allow admins to view comments in unmaintained entries
by Jeremy Newman 30 May '17

30 May '17

Module: appdb Branch: master Commit: 1868edfb61cda174f9c3a364ab1071d8ebf6a081 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=1868edfb61cda174f9c3a364… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Tue May 30 12:00:50 2017 -0500 Allow admins to view comments in unmaintained entries Needed for comment cleanup in unmaintained entries. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/version.php b/include/version.php index 45459fd..2c09be7 100644 --- a/include/version.php +++ b/include/version.php @@ -1164,7 +1164,7 @@ EOT; // Comments Section echo "<h2 id=\"viewComments\" class=\"whq-app-title\">Comments</h2>\n"; - if(sizeof($aMaintainers)>0) + if((sizeof($aMaintainers)>0) || ($_SESSION['current']->hasPriv("admin"))) { if($this->iVersionId) Comment::view_app_comments($this->iVersionId);

1 0

Rosanne DiMesio : admin.php: add functions to delete orphan versions and comments
by Jeremy Newman 30 May '17

30 May '17

Module: appdb Branch: master Commit: 37f72a60b0231e0478aba1f4574f9dcc326959b6 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=37f72a60b0231e0478aba1f4… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Tue May 30 10:20:12 2017 -0500 admin.php: add functions to delete orphan versions and comments The cron cleanup script identifies orphan versions but does not delete them, and admins have had no way to delete them. Bug 26958 stayed open for 6 years because admins had no way to delete orphan comments. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- admin.php | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/admin.php b/admin.php index 90d1fc8..f38924d 100644 --- a/admin.php +++ b/admin.php @@ -203,11 +203,30 @@ function fixNoteLinks() } +function deleteOrphanComments() +{ + $sQuery = "DELETE FROM appComments WHERE NOT EXISTS( SELECT appVersion.versionId FROM appVersion"; + $sQuery.= " WHERE appVersion.versionId = appComments.versionId )"; + $hResult = query_parameters($sQuery); + + echo "Deleted ".query_affected_rows()." orphan comments. "; +} + +function deleteOrphanVersions() +{ + $sQuery = "DELETE FROM appVersion WHERE appId = 0 and state != 'deleted'"; + $hResult = query_parameters($sQuery); + + echo "Deleted ".query_affected_rows()." orphan versions. "; +} + function showChoices() { echo '<a href="admin.php?sAction=fixNoteLinks">Fix/Show note links</a> '; echo '<a href="admin.php?sAction=updateAppMaintainerStates">Update application maintainer states</a> '; echo '<a href="admin.php?sAction=updateVersionMaintainerStates">Update version maintainer states</a> '; + echo '<a href="admin.php?sAction=deleteOrphanComments">Delete Orphan Comments</a> '; + echo '<a href="admin.php?sAction=deleteOrphanVersions">Delete Orphan Versions</a> '; } switch(getInput('sAction', $aClean)) @@ -223,7 +242,15 @@ switch(getInput('sAction', $aClean)) case 'fixNoteLinks': fixNoteLinks(); break; - + + case 'deleteOrphanComments': + deleteOrphanComments(); + break; + + case 'deleteOrphanVersions': + deleteOrphanVersions(); + break; + default: showChoices(); break;

1 0

Alexandre Julliard : Wine release 2.9
by Alexandre Julliard 26 May '17

26 May '17

Module: website Branch: master Commit: bd3a62fc62b9ab583938e8b6525b74bcf2c72f4a URL: http://source.winehq.org/git/website.git/?a=commit;h=bd3a62fc62b9ab583938e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 09:40:35 2017 +0200 Wine release 2.9 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017052601.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2017052601.xml b/news/en/2017052601.xml new file mode 100644 index 0000000..9374dca --- /dev/null +++ b/news/en/2017052601.xml @@ -0,0 +1,16 @@ +<news> +<date>May 26, 2017</date> +<title>Wine 2.9 Released</title> +<body> + The Wine development release 2.9 is now available. + <a href="{$root}/announce/2.9">What's new</a> in this release: +<ul> + <li>Support for tesselation shaders in Direct3D.</li> + <li>Binary mode support in WebServices.</li> + <li>Clipboard changes detected through Xfixes.</li> + <li>User interface improvements in RegEdit.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.9.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-2.9 : Alexandre Julliard : Release 2.9
by Alexandre Julliard 26 May '17

26 May '17

Module: wine Branch: refs/tags/wine-2.9 Tag: a4a4385d9f47dc2d71060a54439434be4ed2e67e URL: http://source.winehq.org/git/wine.git/?a=tag;h=a4a4385d9f47dc2d71060a544394… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 09:38:04 2017 +0200 Release 2.9

1 0

Alexandre Julliard : Release 2.9.
by Alexandre Julliard 26 May '17

26 May '17

Module: wine Branch: master Commit: 7d2ce5cbe7c84dd193e982d4cfe882265867f998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d2ce5cbe7c84dd193e982d4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 09:38:04 2017 +0200 Release 2.9. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 713 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 393 insertions(+), 341 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d2ce5cbe7c84dd193e98…

1 0

Hugh McMaster : regedit/tests: Add tests for importing Windows 3.1 registry data.
by Alexandre Julliard 26 May '17

26 May '17

Module: wine Branch: master Commit: 51743827c97929933f1b1062265059a728de5636 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51743827c97929933f1b10622… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri May 26 05:32:25 2017 +0000 regedit/tests: Add tests for importing Windows 3.1 registry data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 50 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 0bb10b7..d145f0b 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -759,6 +759,55 @@ static void test_invalid_import(void) ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr); } +static void test_invalid_import_31(void) +{ + HKEY hkey; + LONG lr; + + lr = RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_READ, NULL, &hkey, NULL); + ok(lr == ERROR_SUCCESS, "RegCreateKeyExA failed: %d\n", lr); + + /* Test character validity at the start of the line */ + exec_import_str("REGEDIT\r\n" + " HKEY_CLASSES_ROOT\\" KEY_BASE " = Value1a\r\n"); + todo_wine verify_reg_nonexist(hkey, ""); + + exec_import_str("REGEDIT\r\n" + " HKEY_CLASSES_ROOT\\" KEY_BASE " = Value1b\r\n"); + todo_wine verify_reg_nonexist(hkey, ""); + + exec_import_str("REGEDIT\r\n" + "\tHKEY_CLASSES_ROOT\\" KEY_BASE " = Value1c\r\n"); + todo_wine verify_reg_nonexist(hkey, ""); + + exec_import_str("REGEDIT\r\n" + ";HKEY_CLASSES_ROOT\\" KEY_BASE " = Value2a\r\n"); + todo_wine verify_reg_nonexist(hkey, ""); + + exec_import_str("REGEDIT\r\n" + "#HKEY_CLASSES_ROOT\\" KEY_BASE " = Value2b\r\n"); + todo_wine verify_reg_nonexist(hkey, ""); + + /* Test case sensitivity */ + exec_import_str("REGEDIT\r\n" + "hkey_classes_root\\" KEY_BASE " = Value3a\r\n"); + todo_wine verify_reg_nonexist(hkey, ""); + + exec_import_str("REGEDIT\r\n" + "hKEY_CLASSES_ROOT\\" KEY_BASE " = Value3b\r\n"); + todo_wine verify_reg_nonexist(hkey, ""); + + exec_import_str("REGEDIT\r\n" + "Hkey_Classes_Root\\" KEY_BASE " = Value3c\r\n"); + todo_wine verify_reg_nonexist(hkey, ""); + + RegCloseKey(hkey); + + lr = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); + ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr); +} + static void test_comments(void) { LONG lr; @@ -1077,6 +1126,7 @@ START_TEST(regedit) test_basic_import(); test_basic_import_31(); test_invalid_import(); + test_invalid_import_31(); test_comments(); test_import_with_whitespace(); }

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 26 May '17

26 May '17

Module: wine Branch: master Commit: 3fef1e1cf6bceec8b93c9f3879a08adea88354fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fef1e1cf6bceec8b93c9f387… Author: Kim Malmo <berencamlost(a)msn.com> Date: Fri May 26 01:00:14 2017 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 1e77cbc..bcf1254 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -11758,11 +11758,8 @@ msgid "&About Registry Editor" msgstr "&Om Registerredigering" #: regedit.rc:91 regedit.rc:98 regedit.rc:229 -#, fuzzy -#| msgctxt "object state" -#| msgid "expanded" msgid "Expand" -msgstr "utvidet" +msgstr "Utvid" #: regedit.rc:136 msgid "Modify Binary Data..." @@ -12245,11 +12242,8 @@ msgid "" msgstr "Vil du virkelig slette registernøkkel \"%1\" og alle dens undernøkler?" #: regedit.rc:230 -#, fuzzy -#| msgctxt "object state" -#| msgid "collapsed" msgid "Collapse" -msgstr "kollapset" +msgstr "Kollaps" #: regsvr32.rc:32 msgid ""

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
64
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 May 2017