September 2013 - Wine-Commits

Stefan Dösinger : wined3d: Pass the context to the internal texture_preload function.
by Alexandre Julliard Sept. 16, 2013

Sept. 16, 2013

Module: wine Branch: master Commit: fe44be5fde5e275cb96d8b2346d87a9d5729a2ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe44be5fde5e275cb96d8b234… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 16 12:43:16 2013 +0200 wined3d: Pass the context to the internal texture_preload function. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 20 +++++++++++++------- dlls/wined3d/drawprim.c | 6 ------ dlls/wined3d/surface.c | 14 ++++++-------- dlls/wined3d/texture.c | 34 ++++++++++++---------------------- dlls/wined3d/wined3d_private.h | 8 ++++---- 6 files changed, 36 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe44be5fde5e275cb96d8…

1 0

Stefan Dösinger : wined3d: Store the instance count in the context structure.
by Alexandre Julliard Sept. 16, 2013

Sept. 16, 2013

Module: wine Branch: master Commit: bbfca4863c73616768f2f88195f2b6af3005fc95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbfca4863c73616768f2f8819… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 16 12:43:20 2013 +0200 wined3d: Store the instance count in the context structure. --- dlls/wined3d/drawprim.c | 4 ++-- dlls/wined3d/state.c | 12 +++++------- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 81d2aba..3c9a780 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -676,8 +676,8 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co } stream_info = &context->stream_info; - if (device->instance_count) - instance_count = device->instance_count; + if (context->instance_count) + instance_count = context->instance_count; if (indexed) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 59c03a2..8ffd3e2 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4060,13 +4060,12 @@ static void unload_numbered_arrays(struct wined3d_context *context) static void load_numbered_arrays(struct wined3d_context *context, const struct wined3d_stream_info *stream_info, const struct wined3d_state *state) { - struct wined3d_device *device = context->swapchain->device; const struct wined3d_gl_info *gl_info = context->gl_info; GLuint curVBO = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0U : 0; int i; /* Default to no instancing */ - device->instance_count = 0; + context->instance_count = 0; for (i = 0; i < MAX_ATTRIBS; i++) { @@ -4085,8 +4084,8 @@ static void load_numbered_arrays(struct wined3d_context *context, if (stream->flags & WINED3DSTREAMSOURCE_INSTANCEDATA) { - if (!device->instance_count) - device->instance_count = state->streams[0].frequency ? state->streams[0].frequency : 1; + if (!context->instance_count) + context->instance_count = state->streams[0].frequency ? state->streams[0].frequency : 1; if (!gl_info->supported[ARB_INSTANCED_ARRAYS]) { @@ -4232,10 +4231,9 @@ static void load_numbered_arrays(struct wined3d_context *context, checkGLcall("Loading numbered arrays"); } -static void load_vertex_data(const struct wined3d_context *context, +static void load_vertex_data(struct wined3d_context *context, const struct wined3d_stream_info *si, const struct wined3d_state *state) { - struct wined3d_device *device = context->swapchain->device; const struct wined3d_gl_info *gl_info = context->gl_info; GLuint curVBO = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0U : 0; const struct wined3d_stream_info_element *e; @@ -4243,7 +4241,7 @@ static void load_vertex_data(const struct wined3d_context *context, TRACE("Using fast vertex array code\n"); /* This is fixed function pipeline only, and the fixed function pipeline doesn't do instancing */ - device->instance_count = 0; + context->instance_count = 0; /* Blend Data ---------------------------------------------- */ if ((si->use_map & (1 << WINED3D_FFP_BLENDWEIGHT)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9b1ba42..4928f92 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1098,6 +1098,8 @@ struct wined3d_context DWORD active_texture; DWORD texture_type[MAX_COMBINED_SAMPLERS]; + UINT instance_count; + /* The actual opengl context */ UINT level; HGLRC restore_ctx; @@ -1885,8 +1887,6 @@ struct wined3d_device APPLYSTATEFUNC *multistate_funcs[STATE_HIGHEST + 1]; const struct blit_shader *blitter; - UINT instance_count; - BYTE vertexBlendUsed : 1; /* To avoid needless setting of the blend matrices */ BYTE bCursorVisible : 1; BYTE d3d_initialized : 1;

1 0

Alexandre Julliard : Wine release 1.7.2
by Alexandre Julliard Sept. 13, 2013

Sept. 13, 2013

Module: website Branch: master Commit: e3343e35cc99f65457f7e2f12c9148b7e76e0c3b URL: http://source.winehq.org/git/website.git/?a=commit;h=e3343e35cc99f65457f7e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 13 20:19:33 2013 +0200 Wine release 1.7.2 --- news/en/2013091301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2013091301.xml b/news/en/2013091301.xml new file mode 100644 index 0000000..2c33738 --- /dev/null +++ b/news/en/2013091301.xml @@ -0,0 +1,17 @@ +<news> +<date>September 13, 2013</date> +<title>Wine 1.7.2 Released</title> +<body> + The Wine development release 1.7.2 is now available. + <a href="{$root}/announce/1.7.2">What's new</a> in this release: +<ul> + <li>Right-to-left text layout improvements.</li> + <li>NTLM and Negotiate authentication for RPC over HTTP.</li> + <li>More glyphs in the built-in Wingdings font.</li> + <li>Better system tray support in the Mac driver.</li> + <li>Activation context improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.2.tar.bz2">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-1.7.2 : Alexandre Julliard : Release 1.7.2
by Alexandre Julliard Sept. 13, 2013

Sept. 13, 2013

Module: wine Branch: refs/tags/wine-1.7.2 Tag: 27fb1363c3b464de8c1766de874ddbeeec7598c4 URL: http://source.winehq.org/git/wine.git/?a=tag;h=27fb1363c3b464de8c1766de874d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 13 20:11:57 2013 +0200 Release 1.7.2

1 0

Alexandre Julliard : Release 1.7.2.
by Alexandre Julliard Sept. 13, 2013

Sept. 13, 2013

Module: wine Branch: master Commit: 24fa9a2cdeabd5f28371b15e9a6aace48c07b984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24fa9a2cdeabd5f28371b15e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 13 20:11:57 2013 +0200 Release 1.7.2. --- ANNOUNCE | 890 +++++++++++++++++++++++++++---------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 401 insertions(+), 511 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24fa9a2cdeabd5f28371b…

1 0

Huw Davies : fonts: Add some box-type glyphs to wingdings.
by Alexandre Julliard Sept. 13, 2013

Sept. 13, 2013

Module: wine Branch: master Commit: 73e0efac9d3dffbea748d19b6618a1eac47ac566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73e0efac9d3dffbea748d19b6… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 13 11:20:53 2013 +0100 fonts: Add some box-type glyphs to wingdings. --- fonts/wingding.sfd | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++- fonts/wingding.ttf | Bin 6052 -> 6296 bytes 2 files changed, 85 insertions(+), 1 deletions(-) diff --git a/fonts/wingding.sfd b/fonts/wingding.sfd index 7ba549f..ed3400e 100644 --- a/fonts/wingding.sfd +++ b/fonts/wingding.sfd @@ -51,7 +51,7 @@ AntiAlias: 1 FitToEm: 1 WinInfo: 0 33 12 TeXData: 1 0 0 708670 354335 236222 1342177 -2147484 236222 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 256 26 +BeginChars: 256 30 StartChar: f020 Encoding: 0 61472 0 @@ -602,5 +602,89 @@ SplineSet 735.665 1141 735.665 1141 1497 1560 c 1,0,1 EndSplineSet EndChar + +StartChar: boxshadowdwn +Encoding: 113 952 26 +Width: 1825 +Flags: W +LayerCount: 2 +Fore +SplineSet +300 300 m 1,0,-1 + 1300 300 l 1,1,-1 + 1300 1300 l 1,2,-1 + 300 1300 l 1,3,-1 + 300 300 l 1,0,-1 +400 0 m 1,4,-1 + 200 200 l 1,5,-1 + 200 1400 l 1,6,-1 + 1400 1400 l 1,7,-1 + 1600 1200 l 1,8,-1 + 1600 0 l 1,9,-1 + 400 0 l 1,4,-1 +EndSplineSet +EndChar + +StartChar: boxshadowup +Encoding: 114 961 27 +Width: 1825 +Flags: W +LayerCount: 2 +Fore +SplineSet +1300 100 m 1,0,-1 + 1300 1100 l 1,1,-1 + 300 1100 l 1,2,-1 + 300 100 l 1,3,-1 + 1300 100 l 1,0,-1 +1600 200 m 1,4,-1 + 1400 0 l 1,5,-1 + 200 0 l 1,6,-1 + 200 1200 l 1,7,-1 + 400 1400 l 1,8,-1 + 1600 1400 l 1,9,-1 + 1600 200 l 1,4,-1 +EndSplineSet +EndChar + +StartChar: box3 +Encoding: 111 959 28 +Width: 1825 +Flags: W +LayerCount: 2 +Fore +SplineSet +372 200 m 1,0,-1 + 1452 200 l 1,1,-1 + 1452 1280 l 1,2,-1 + 372 1280 l 1,3,-1 + 372 200 l 1,0,-1 +172 0 m 1,4,-1 + 172 1480 l 1,5,-1 + 1652 1480 l 1,6,-1 + 1652 0 l 1,7,-1 + 172 0 l 1,4,-1 +EndSplineSet +EndChar + +StartChar: box4 +Encoding: 112 960 29 +Width: 1825 +Flags: W +LayerCount: 2 +Fore +SplineSet +472 300 m 1,0,-1 + 1352 300 l 1,1,-1 + 1352 1180 l 1,2,-1 + 472 1180 l 1,3,-1 + 472 300 l 1,0,-1 +172 0 m 1,4,-1 + 172 1480 l 1,5,-1 + 1652 1480 l 1,6,-1 + 1652 0 l 1,7,-1 + 172 0 l 1,4,-1 +EndSplineSet +EndChar EndChars EndSplineFont diff --git a/fonts/wingding.ttf b/fonts/wingding.ttf index f5419ce..f867b97 100644 Binary files a/fonts/wingding.ttf and b/fonts/wingding.ttf differ

1 0

Dmitry Timoshkov : shlwapi: Merge two case statements.
by Alexandre Julliard Sept. 13, 2013

Sept. 13, 2013

Module: wine Branch: master Commit: b07f431878e1050e691fb01efc271a71ebb58740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b07f431878e1050e691fb01ef… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 13 13:51:56 2013 +0900 shlwapi: Merge two case statements. --- dlls/shlwapi/istream.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c index e08c071..c7242d1 100644 --- a/dlls/shlwapi/istream.c +++ b/dlls/shlwapi/istream.c @@ -437,6 +437,7 @@ HRESULT WINAPI SHCreateStreamOnFileEx(LPCWSTR lpszPath, DWORD dwMode, switch (STGM_SHARE_MODE(dwMode)) { case 0: + case STGM_SHARE_DENY_NONE: dwShare = FILE_SHARE_READ|FILE_SHARE_WRITE; break; case STGM_SHARE_DENY_READ: @@ -448,9 +449,6 @@ HRESULT WINAPI SHCreateStreamOnFileEx(LPCWSTR lpszPath, DWORD dwMode, case STGM_SHARE_EXCLUSIVE: dwShare = 0; break; - case STGM_SHARE_DENY_NONE: - dwShare = FILE_SHARE_READ|FILE_SHARE_WRITE; - break; default: return E_INVALIDARG; }

1 0

Francois Gouget : msi: Make some dialog_xxx() functions static.
by Alexandre Julliard Sept. 13, 2013

Sept. 13, 2013

Module: wine Branch: master Commit: 7c146b8aa0ffb29e4514521ef650f2eddd93800a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c146b8aa0ffb29e4514521ef… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 13 10:48:46 2013 +0200 msi: Make some dialog_xxx() functions static. --- dlls/msi/dialog.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 5a7cbe7..92374d4 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2989,7 +2989,7 @@ static void msi_dialog_update_directory_list( msi_dialog *dialog, msi_control *c FindClose( file ); } -UINT msi_dialog_directorylist_up( msi_dialog *dialog ) +static UINT msi_dialog_directorylist_up( msi_dialog *dialog ) { msi_control *control; LPWSTR prop, path, ptr; @@ -3492,7 +3492,7 @@ static UINT msi_dialog_fill_controls( msi_dialog *dialog ) return r; } -UINT msi_dialog_reset( msi_dialog *dialog ) +static UINT msi_dialog_reset( msi_dialog *dialog ) { /* FIXME: should restore the original values of any properties we changed */ return msi_dialog_evaluate_control_conditions( dialog ); @@ -3926,7 +3926,7 @@ static msi_dialog *dialog_create( MSIPACKAGE *package, const WCHAR *name, msi_di return dialog; } -void msi_dialog_end_dialog( msi_dialog *dialog ) +static void msi_dialog_end_dialog( msi_dialog *dialog ) { TRACE("%p\n", dialog); dialog->finished = 1;

1 0

Francois Gouget : sane.ds: SANE_SaneSetDefaults() is only used if SONAME_LIBSANE is defined.
by Alexandre Julliard Sept. 13, 2013

Sept. 13, 2013

Module: wine Branch: master Commit: 0a177833efaff87def4542fdbfa57a6b20d094d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a177833efaff87def4542fdb… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 13 10:48:16 2013 +0200 sane.ds: SANE_SaneSetDefaults() is only used if SONAME_LIBSANE is defined. --- dlls/sane.ds/capability.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index ee7435d..7bb64b3 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -1221,6 +1221,7 @@ TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) return twCC; } +#ifdef SONAME_LIBSANE TW_UINT16 SANE_SaneSetDefaults (void) { TW_CAPABILITY cap; @@ -1248,3 +1249,4 @@ TW_UINT16 SANE_SaneSetDefaults (void) return TWCC_SUCCESS; } +#endif

1 0

Dmitry Timoshkov : kernel32/tests: Add a file access test.
by Alexandre Julliard Sept. 13, 2013

Sept. 13, 2013

Module: wine Branch: master Commit: 6a6b4c5000fb3f800291af8f62d4f83eddb7efe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a6b4c5000fb3f800291af8f6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 13 18:35:01 2013 +0900 kernel32/tests: Add a file access test. --- dlls/kernel32/tests/file.c | 82 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 82 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index b0de968..d7a8776 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3806,6 +3806,87 @@ static void test_SetFileValidData(void) DeleteFile(filename); } +static void test_file_access(void) +{ + static const struct + { + int access, create_error, write_error, read_error; + } td[] = + { + { GENERIC_READ | GENERIC_WRITE, 0, 0, 0 }, + { GENERIC_WRITE, 0, 0, ERROR_ACCESS_DENIED }, + { GENERIC_READ, 0, ERROR_ACCESS_DENIED, 0 }, + { FILE_READ_DATA | FILE_WRITE_DATA, 0, 0, 0 }, + { FILE_WRITE_DATA, 0, 0, ERROR_ACCESS_DENIED }, + { FILE_READ_DATA, 0, ERROR_ACCESS_DENIED, 0 }, + { 0, 0, ERROR_ACCESS_DENIED, ERROR_ACCESS_DENIED }, + }; + char path[MAX_PATH], fname[MAX_PATH]; + unsigned char buf[16]; + HANDLE hfile; + DWORD i, ret, bytes; + + GetTempPath(MAX_PATH, path); + GetTempFileName(path, "foo", 0, fname); + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + SetLastError(0xdeadbeef); + hfile = CreateFile(fname, td[i].access, 0, NULL, CREATE_ALWAYS, + FILE_FLAG_DELETE_ON_CLOSE, 0); + if (td[i].create_error) + { + ok(hfile == INVALID_HANDLE_VALUE, "%d: CreateFile should fail\n", i); + ok(td[i].create_error == GetLastError(), "%d: expected %d, got %d\n", i, td[i].create_error, GetLastError()); + continue; + } + else + ok(hfile != INVALID_HANDLE_VALUE, "%d: CreateFile error %d\n", i, GetLastError()); + + SetLastError(0xdeadbeef); + bytes = 0xdeadbeef; + ret = WriteFile(hfile, "\x5e\xa7", 2, &bytes, NULL); + if (td[i].write_error) + { + ok(!ret, "%d: WriteFile should fail\n", i); + ok(td[i].write_error == GetLastError(), "%d: expected %d, got %d\n", i, td[i].write_error, GetLastError()); + ok(bytes == 0, "%d: expected 0, got %u\n", i, bytes); + } + else + { + ok(ret, "%d: WriteFile error %d\n", i, GetLastError()); + ok(bytes == 2, "%d: expected 2, got %u\n", i, bytes); + } + + SetLastError(0xdeadbeef); + ret = SetFilePointer(hfile, 0, NULL, FILE_BEGIN); + ok(ret != INVALID_SET_FILE_POINTER, "SetFilePointer error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + bytes = 0xdeadbeef; + ret = ReadFile(hfile, buf, sizeof(buf), &bytes, NULL); + if (td[i].read_error) + { + ok(!ret, "%d: ReadFile should fail\n", i); + ok(td[i].read_error == GetLastError(), "%d: expected %d, got %d\n", i, td[i].read_error, GetLastError()); + ok(bytes == 0, "%d: expected 0, got %u\n", i, bytes); + } + else + { + ok(ret, "%d: ReadFile error %d\n", i, GetLastError()); + if (td[i].write_error) + ok(bytes == 0, "%d: expected 0, got %u\n", i, bytes); + else + { + ok(bytes == 2, "%d: expected 2, got %u\n", i, bytes); + ok(buf[0] == 0x5e && buf[1] == 0xa7, "%d: expected 5ea7, got %02x%02x\n", i, buf[0], buf[1]); + } + } + + CloseHandle(hfile); + } +} + START_TEST(file) { InitFunctionPointers(); @@ -3849,4 +3930,5 @@ START_TEST(file) test_GetFileInformationByHandleEx(); test_OpenFileById(); test_SetFileValidData(); + test_file_access(); }

1 0