February 2017 - Wine-Commits

Matteo Bruni : wined3d: Trace maximum vertex attributes count.
by Alexandre Julliard Feb. 2, 2017

Feb. 2, 2017

Module: wine Branch: master Commit: cd9ab8663d535d7399c94afec337ba25e8de150a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd9ab8663d535d7399c94afec… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 2 01:04:06 2017 +0100 wined3d: Trace maximum vertex attributes count. Signed-off-by: Matteo Bruni <mbruni(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 | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2b2e314..d8e518ebd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3463,6 +3463,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) } TRACE("Max vertex samplers: %u.\n", gl_info->limits.vertex_samplers); TRACE("Max combined samplers: %u.\n", gl_info->limits.combined_samplers); + TRACE("Max vertex attributes: %u.\n", gl_info->limits.vertex_attribs); } if (gl_info->supported[ARB_VERTEX_BLEND]) {

1 0

Nikolay Sivov : oledb32: Allow single quotation marks around property values.
by Alexandre Julliard Feb. 2, 2017

Feb. 2, 2017

Module: wine Branch: master Commit: 0cb665ca8a55226248deaec75c0fb562013fd604 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb665ca8a55226248deaec75… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 2 02:03:20 2017 +0300 oledb32: Allow single quotation marks around property values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/datainit.c | 9 +++++---- dlls/oledb32/tests/database.c | 3 +++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 7401c88..7ed4099 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -401,18 +401,19 @@ static HRESULT parse_init_string(const WCHAR *initstring, struct dbprops *props) while (start && (eq = strchrW(start, '='))) { static const WCHAR providerW[] = {'P','r','o','v','i','d','e','r',0}; + WCHAR *delim, quote; BSTR value, name; - WCHAR *delim; name = SysAllocStringLen(start, eq - start); /* skip equal sign to get value */ eq++; - if (*eq == '"') + quote = (*eq == '"' || *eq == '\'') ? *eq : 0; + if (quote) { /* for quoted value string, skip opening mark, look for terminating one */ eq++; - delim = strchrW(eq, '"'); + delim = strchrW(eq, quote); } else delim = strchrW(eq, ';'); @@ -422,7 +423,7 @@ static HRESULT parse_init_string(const WCHAR *initstring, struct dbprops *props) /* skip semicolon if present */ if (delim) { - if (*delim == '"') + if (*delim == quote) delim++; if (*delim == ';') delim++; diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 8d07cd3..7f71f8b 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -295,6 +295,8 @@ static void test_database(void) static WCHAR extended_prop[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';', 'E','x','t','e','n','d','e','d',' ','P','r','o','p','e','r','t','i','e','s','=','\"','D','R','I','V','E','R','=','A', ' ','W','i','n','e',' ','O','D','B','C',' ','d','r','i','v','e','r',';','U','I','D','=','w','i','n','e',';','\"',';',0}; + static WCHAR extended_prop2[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','\'','d','u','m','m','y','\'',';', + 'c','u','s','t','o','m','p','r','o','p','=','\'','1','2','3','.','4','\'',';',0}; IDataInitialize *datainit = NULL; HRESULT hr; @@ -312,6 +314,7 @@ static void test_database(void) test_GetDataSource(initstring_lower); test_GetDataSource2(customprop); test_GetDataSource2(extended_prop); + test_GetDataSource2(extended_prop2); } static void free_dispparams(DISPPARAMS *params)

1 0

Zebediah Figura : secur32/tests: Skip sign/ seal tests if authentication fails.
by Alexandre Julliard Feb. 2, 2017

Feb. 2, 2017

Module: wine Branch: master Commit: 38ca35166be379f1846436a392da68603dc8c81d URL: http://source.winehq.org/git/wine.git/?a=commit;h=38ca35166be379f1846436a39… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 25 22:01:51 2017 -0600 secur32/tests: Skip sign/seal tests if authentication fails. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/ntlm.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 3b661c1..d90b725 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -971,6 +971,10 @@ static void testSignSeal(void) { client_stat = runClient(&client, first, SECURITY_NETWORK_DREP); + ok(client_stat == SEC_E_OK || client_stat == SEC_I_CONTINUE_NEEDED, + "Running the client returned %s, more tests will fail.\n", + getSecError(client_stat)); + communicate(&client, &server); server_stat = runFakeServer(&server, first, SECURITY_NETWORK_DREP); @@ -980,6 +984,12 @@ static void testSignSeal(void) first = FALSE; } + if(client_stat != SEC_E_OK) + { + skip("Authentication failed, skipping test.\n"); + goto end; + } + /******************************************** * Now start with the actual testing * ********************************************/

1 0

Matteo Bruni : wined3d: Don't query FFP lights count on core profile.
by Alexandre Julliard Feb. 2, 2017

Feb. 2, 2017

Module: wine Branch: master Commit: 0717d00cce6be38c0875c2cef03f7302368f04e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0717d00cce6be38c0875c2cef… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 2 01:04:03 2017 +0100 wined3d: Don't query FFP lights count on core profile. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 7 ++++--- dlls/wined3d/directx.c | 10 +++++++--- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index acf4307..1c69cdd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1730,10 +1730,11 @@ HRESULT CDECL wined3d_device_set_light_enable(struct wined3d_device *device, UIN } else { + unsigned int light_count = device->adapter->d3d_info.limits.active_light_count; unsigned int i; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - /* Find a free GL light. */ - for (i = 0; i < gl_info->limits.lights; ++i) + + /* Find a free light. */ + for (i = 0; i < light_count; ++i) { if (!device->update_state->lights[i]) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6405776..b175d3a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3361,9 +3361,12 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.user_clip_distances = min(MAX_CLIP_DISTANCES, gl_max); TRACE("Clip plane support - max planes %d.\n", gl_max); - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_LIGHTS, &gl_max); - gl_info->limits.lights = gl_max; - TRACE("Light support - max lights %d.\n", gl_max); + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + { + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_LIGHTS, &gl_max); + gl_info->limits.lights = gl_max; + TRACE("Light support - max lights %d.\n", gl_max); + } gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_SIZE, &gl_max); gl_info->limits.texture_size = gl_max; @@ -4003,6 +4006,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD adapter->d3d_info.xyzrhw = vertex_caps.xyzrhw; adapter->d3d_info.ffp_generic_attributes = vertex_caps.ffp_generic_attributes; adapter->d3d_info.limits.ffp_vertex_blend_matrices = vertex_caps.max_vertex_blend_matrices; + adapter->d3d_info.limits.active_light_count = vertex_caps.max_active_lights; adapter->d3d_info.emulated_flatshading = vertex_caps.emulated_flatshading; adapter->fragment_pipe->get_caps(gl_info, &fragment_caps); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bf8f612..43d80d2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2219,6 +2219,7 @@ struct wined3d_d3d_limits UINT ffp_textures; UINT ffp_blend_stages; UINT ffp_vertex_blend_matrices; + unsigned int active_light_count; }; typedef void (WINE_GLAPI *wined3d_ffp_attrib_func)(const void *data);

1 0

Austin English : winusb: Add stub dll.
by Alexandre Julliard Feb. 2, 2017

Feb. 2, 2017

Module: wine Branch: master Commit: c6adf8af6e3015e7a2cb40aa952c75ad6c2f2388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6adf8af6e3015e7a2cb40aa9… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 1 12:52:57 2017 -0600 winusb: Add stub dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/winusb/Makefile.in | 1 + dlls/winusb/winusb.spec | 22 ++++++++++++++++++++++ 4 files changed, 26 insertions(+) diff --git a/configure b/configure index 68a79c0..56904e9 100755 --- a/configure +++ b/configure @@ -1474,6 +1474,7 @@ enable_winspool_drv enable_winsta enable_wintab32 enable_wintrust +enable_winusb enable_wlanapi enable_wldap32 enable_wmasf @@ -18429,6 +18430,7 @@ wine_fn_config_dll wintab32 enable_wintab32 implib wine_fn_config_test dlls/wintab32/tests wintab32_test wine_fn_config_dll wintrust enable_wintrust implib wine_fn_config_test dlls/wintrust/tests wintrust_test +wine_fn_config_dll winusb enable_winusb wine_fn_config_dll wlanapi enable_wlanapi implib wine_fn_config_test dlls/wlanapi/tests wlanapi_test wine_fn_config_dll wldap32 enable_wldap32 clean,implib diff --git a/configure.ac b/configure.ac index 6e4cd8b..c6d63b2 100644 --- a/configure.ac +++ b/configure.ac @@ -3488,6 +3488,7 @@ WINE_CONFIG_DLL(wintab32,,[implib]) WINE_CONFIG_TEST(dlls/wintab32/tests) WINE_CONFIG_DLL(wintrust,,[implib]) WINE_CONFIG_TEST(dlls/wintrust/tests) +WINE_CONFIG_DLL(winusb) WINE_CONFIG_DLL(wlanapi,,[implib]) WINE_CONFIG_TEST(dlls/wlanapi/tests) WINE_CONFIG_DLL(wldap32,,[clean,implib]) diff --git a/dlls/winusb/Makefile.in b/dlls/winusb/Makefile.in new file mode 100644 index 0000000..c8cab4d --- /dev/null +++ b/dlls/winusb/Makefile.in @@ -0,0 +1 @@ +MODULE = winusb.dll diff --git a/dlls/winusb/winusb.spec b/dlls/winusb/winusb.spec new file mode 100644 index 0000000..09371e9 --- /dev/null +++ b/dlls/winusb/winusb.spec @@ -0,0 +1,22 @@ +@ stub WinUsb_AbortPipe +@ stub WinUsb_ControlTransfer +@ stub WinUsb_FlushPipe +@ stub WinUsb_Free +@ stub WinUsb_GetAssociatedInterface +@ stub WinUsb_GetCurrentAlternateSetting +@ stub WinUsb_GetDescriptor +@ stub WinUsb_GetOverlappedResult +@ stub WinUsb_GetPipePolicy +@ stub WinUsb_GetPowerPolicy +@ stub WinUsb_Initialize +@ stub WinUsb_ParseConfigurationDescriptor +@ stub WinUsb_ParseDescriptors +@ stub WinUsb_QueryDeviceInformation +@ stub WinUsb_QueryInterfaceSettings +@ stub WinUsb_QueryPipe +@ stub WinUsb_ReadPipe +@ stub WinUsb_ResetPipe +@ stub WinUsb_SetCurrentAlternateSetting +@ stub WinUsb_SetPipePolicy +@ stub WinUsb_SetPowerPolicy +@ stub WinUsb_WritePipe

1 0

Huw Davies : user32/tests: Restore the mouse cursor to its original position.
by Alexandre Julliard Feb. 2, 2017

Feb. 2, 2017

Module: wine Branch: master Commit: cdf3872f59d7fc237eb932a3425cb4267e93de4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf3872f59d7fc237eb932a34… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 2 12:00:37 2017 +0000 user32/tests: Restore the mouse cursor to its original position. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 6684089..94e98af 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1927,9 +1927,11 @@ static void test_Input_mouse(void) struct thread_data thread_data; HANDLE thread; DWORD thread_id; - POINT pt; + POINT pt, pt_org; MSG msg; + GetCursorPos(&pt_org); + button_win = CreateWindowA("button", "button", WS_VISIBLE | WS_POPUP, 100, 100, 100, 100, 0, NULL, NULL, NULL); ok(button_win != 0, "CreateWindow failed\n"); @@ -2129,6 +2131,7 @@ static void test_Input_mouse(void) ok(got_button_up, "expected WM_LBUTTONUP message\n"); DestroyWindow(hwnd); ok(ReleaseCapture(), "ReleaseCapture failed\n"); + SetCursorPos(pt_org.x, pt_org.y); CloseHandle(thread_data.start_event); CloseHandle(thread_data.end_event);

1 0

Matteo Bruni : wined3d: Use the correct GLenum for point size limit on core profile.
by Alexandre Julliard Feb. 2, 2017

Feb. 2, 2017

Module: wine Branch: master Commit: fb92b782f64d4623c63d793964dcdcb6f46e289f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb92b782f64d4623c63d79396… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 2 01:04:04 2017 +0100 wined3d: Use the correct GLenum for point size limit on core profile. Signed-off-by: Matteo Bruni <mbruni(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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b175d3a..2b2e314 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3372,7 +3372,8 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.texture_size = gl_max; TRACE("Maximum texture size support - max texture size %d.\n", gl_max); - gl_info->gl_ops.gl.p_glGetFloatv(GL_ALIASED_POINT_SIZE_RANGE, gl_floatv); + gl_info->gl_ops.gl.p_glGetFloatv(gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] + ? GL_ALIASED_POINT_SIZE_RANGE : GL_POINT_SIZE_RANGE, gl_floatv); gl_info->limits.pointsize_min = gl_floatv[0]; gl_info->limits.pointsize_max = gl_floatv[1]; TRACE("Maximum point size support - max point size %f.\n", gl_floatv[1]);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Feb. 2, 2017

Feb. 2, 2017

Module: wine Branch: master Commit: 5bcc295b36140d97eb725969807d8f41bb65fe23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bcc295b36140d97eb7259698… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Feb 2 08:05:22 2017 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 50 ++++++++++++++++---------------------------------- 1 file changed, 16 insertions(+), 34 deletions(-) diff --git a/po/lt.po b/po/lt.po index 350143a..88eee86 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-01-27 22:03+0300\n" +"PO-Revision-Date: 2017-02-02 08:02+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -11904,52 +11904,44 @@ msgid "(unknown %d)" msgstr "(nežinomas %d)" #: regedit.rc:212 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to modify the selected registry value." -msgstr "regedit: Nepavyko atverti registro rakto „%1“.\n" +msgstr "Nepavyko modifikuoti pasirinktos registro reikšmės." #: regedit.rc:213 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry key." -msgstr "regedit: Nepavyko atverti registro rakto „%1“.\n" +msgstr "Nepavyko sukurti naujo registro rakto." #: regedit.rc:214 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry value." -msgstr "regedit: Nepavyko atverti registro rakto „%1“.\n" +msgstr "Nepavyko sukurti naujos registro reikšmės." #: regedit.rc:215 msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" +"Nepavyko pervadinti rakto „%1“.\n" +"Nurodytas rakto vardas jau egzistuoja." #: regedit.rc:216 msgid "" "Unable to rename the value '%1'.\n" "The specified value name already exists." msgstr "" +"Nepavyko pervadinti reikšmės „%1“.\n" +"Nurodytas reikšmės vardas jau egzistuoja." #: regedit.rc:217 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to delete the selected registry key." -msgstr "regedit: Nepavyko atverti registro rakto „%1“.\n" +msgstr "Nepavyko pašalinti pasirinkto registro rakto." #: regedit.rc:218 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry key." -msgstr "regedit: Nepavyko atverti registro rakto „%1“.\n" +msgstr "Nepavyko pervadinti pasirinkto registro rakto." #: regedit.rc:219 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry value." -msgstr "regedit: Nepavyko atverti registro rakto „%1“.\n" +msgstr "Nepavyko pervadinti pasirinktos registro reikšmės." #: regedit.rc:371 msgid "" @@ -12180,32 +12172,24 @@ msgid "Displays program information, version number and copyright" msgstr "Parodo informaciją apie programą, versijos numerį ir autoriaus teises" #: regedit.rc:181 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry value '%1'." -msgstr "regedit: Nepavyko atverti registro rakto „%1“.\n" +msgstr "Nepavyko užklausti registro reikšmės „%1“." #: regedit.rc:182 -#, fuzzy -#| msgid "Can't edit keys of this type (%u)" msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "Šio tipo raktų redaguoti negalima (%u)" +msgstr "Nepavyko redaguoti šio tipo registro raktų (%1!u!)." #: regedit.rc:183 -#, fuzzy -#| msgid "Value is too big (%u)" msgid "The value is too big (%1!u!)." -msgstr "Reikšmė per didelė (%u)" +msgstr "Reikšmė per didelė (%1!u!)." #: regedit.rc:184 msgid "Confirm Value Delete" msgstr "Reikšmės šalinimo patvirtinimas" #: regedit.rc:189 -#, fuzzy -#| msgid "Search string '%s' not found" msgid "Search complete. The string '%1' was not found." -msgstr "Ieškoma eilutė „%s“ nerasta" +msgstr "Paieška baigta. Eilutė „%1“ nerasta." #: regedit.rc:186 msgid "Are you sure you want to delete these values?" @@ -12220,10 +12204,8 @@ msgid "New Value #%d" msgstr "Nauja reikšmė #%d" #: regedit.rc:180 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry key '%1'." -msgstr "regedit: Nepavyko atverti registro rakto „%1“.\n" +msgstr "Nepavyko užklausti registro rakto „%1“." #: regedit.rc:152 msgid "Adds a new multi-string value"

1 0

Austin English : ntdll: Add a stub for NtLoadKey2.
by Alexandre Julliard Feb. 1, 2017

Feb. 1, 2017

Module: wine Branch: master Commit: 6d89be5496ba581d88ddba076ccaed157fd0b426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d89be5496ba581d88ddba076… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jan 27 01:54:18 2017 -0600 ntdll: Add a stub for NtLoadKey2. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/reg.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 2ee614f..4cbc3b0 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -198,7 +198,7 @@ # @ stub NtIsSystemResumeAutomatic @ stdcall NtListenPort(ptr ptr) @ stdcall NtLoadDriver(ptr) -# @ stub NtLoadKey2 +@ stdcall NtLoadKey2(ptr ptr long) @ stdcall NtLoadKey(ptr ptr) @ stdcall NtLockFile(long long ptr ptr ptr ptr ptr ptr long long) # @ stub NtLockProductActivationKeys @@ -1123,7 +1123,7 @@ # @ stub ZwIsSystemResumeAutomatic @ stdcall -private ZwListenPort(ptr ptr) NtListenPort @ stdcall -private ZwLoadDriver(ptr) NtLoadDriver -# @ stub ZwLoadKey2 +@ stdcall ZwLoadKey2(ptr ptr long) NtLoadKey2 @ stdcall -private ZwLoadKey(ptr ptr) NtLoadKey @ stdcall -private ZwLockFile(long long ptr ptr ptr ptr ptr ptr long long) NtLockFile # @ stub ZwLockProductActivationKeys diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index e151e91..2dd75be 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -682,6 +682,16 @@ NTSTATUS WINAPI NtLoadKey( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *fil } /****************************************************************************** + * NtLoadKey2 [NTDLL.@] + * ZwLoadKey2 [NTDLL.@] + */ +NTSTATUS WINAPI NtLoadKey2(OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *file, ULONG flags) +{ + FIXME("(%p,%p,0x%08x) semi-stub: ignoring flags\n", attr, file, flags); + return NtLoadKey(attr, file); +} + +/****************************************************************************** * NtNotifyChangeMultipleKeys [NTDLL.@] * ZwNotifyChangeMultipleKeys [NTDLL.@] */

1 0

Mike Swanson : loader/wine.man.in: Document the WINEPATH environment variable.
by Alexandre Julliard Feb. 1, 2017

Feb. 1, 2017

Module: wine Branch: master Commit: 3c640470714b76a8094035cf9cd520d19c2e3932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c640470714b76a8094035cf9… Author: Mike Swanson <mikeonthecomputer(a)gmail.com> Date: Thu Jan 26 10:08:48 2017 -0800 loader/wine.man.in: Document the WINEPATH environment variable. Signed-off-by: Mike Swanson <mikeonthecomputer(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.man.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/loader/wine.man.in b/loader/wine.man.in index 1439b3c..5482896 100644 --- a/loader/wine.man.in +++ b/loader/wine.man.in @@ -201,6 +201,20 @@ the builtin load fails; load shell32 always as builtin and comctl32 always as native; oleaut32 will be disabled. .RE .TP +.B WINEPATH +Specifies additional path(s) to be prepended to the default Windows +.B PATH +environment variable. This is a list of Windows-style directories +separated by ";". +.RS +.PP +For a permanent alternative, edit (create if needed) the +.B PATH +value under the +.B HKEY_CURRENT_USER\\\\Environment +registry key. +.RE +.TP .B WINEARCH Specifies the Windows architecture to support. It can be set either to .B win32

1 0