wine-commits December 2013

wine-commits@winehq.org

3 participants
462 discussions

Frédéric Delanoy : winedump: Make segdir[] static .
by Alexandre Julliard 26 Dec '13

26 Dec '13

Module: wine Branch: master Commit: dcb25e59cbaa8c9075d5846f7b3fef0e9fed1cb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcb25e59cbaa8c9075d5846f7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 24 10:24:26 2013 +0100 winedump: Make segdir[] static. --- tools/winedump/tlb.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index 73e384d..9bc487f 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -55,8 +55,6 @@ typedef struct seg_t { int length; } seg_t; -extern seg_t segdir[]; - static int offset=0; static int indent; static int typeinfo_cnt; @@ -703,7 +701,7 @@ static int dump_msft_typeinfo(int n) return -1; } -seg_t segdir[] = { +static seg_t segdir[] = { {"TypeInfoTab", dump_msft_typeinfobases, -1, -1}, {"ImpInfo", dump_msft_impinfos, -1, -1}, {"ImpFiles", dump_msft_impfiles, -1, -1},

1 0

Frédéric Delanoy : localui/tests: Constify some character strings.
by Alexandre Julliard 26 Dec '13

26 Dec '13

Module: wine Branch: master Commit: 4962b2f8bed8f62f9aa83ff2111790c6f4a3f9fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4962b2f8bed8f62f9aa83ff21… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 24 09:25:39 2013 +0100 localui/tests: Constify some character strings. --- dlls/localui/tests/localui.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/localui/tests/localui.c b/dlls/localui/tests/localui.c index e32a376..b0b51e3 100644 --- a/dlls/localui/tests/localui.c +++ b/dlls/localui/tests/localui.c @@ -44,12 +44,12 @@ static BOOL (WINAPI *pAddPortUI)(PCWSTR, HWND, PCWSTR, PWSTR *); static BOOL (WINAPI *pConfigurePortUI)(PCWSTR, HWND, PCWSTR); static BOOL (WINAPI *pDeletePortUI)(PCWSTR, HWND, PCWSTR); -static WCHAR does_not_existW[] = {'d','o','e','s','_','n','o','t','_','e','x','i','s','t',0}; -static WCHAR emptyW[] = {0}; -static CHAR fmt_comA[] = {'C','O','M','%','u',':',0}; -static CHAR fmt_lptA[] = {'L','P','T','%','u',':',0}; -static WCHAR localportW[] = {'L','o','c','a','l',' ','P','o','r','t',0}; -static WCHAR portname_fileW[] = {'F','I','L','E',':',0}; +static const WCHAR does_not_existW[] = {'d','o','e','s','_','n','o','t','_','e','x','i','s','t',0}; +static const WCHAR emptyW[] = {0}; +static const CHAR fmt_comA[] = {'C','O','M','%','u',':',0}; +static const CHAR fmt_lptA[] = {'L','P','T','%','u',':',0}; +static const WCHAR localportW[] = {'L','o','c','a','l',' ','P','o','r','t',0}; +static const WCHAR portname_fileW[] = {'F','I','L','E',':',0}; static LPBYTE pi_buffer; static DWORD pi_numports; @@ -64,7 +64,7 @@ static LPWSTR com_absent; /* ########################### */ -static PORT_INFO_2W * find_portinfo2(LPWSTR pPort) +static PORT_INFO_2W * find_portinfo2(LPCWSTR pPort) { PORT_INFO_2W * pi; DWORD res;

1 0

Frédéric Delanoy : localspl/tests: Constify some character strings.
by Alexandre Julliard 26 Dec '13

26 Dec '13

Module: wine Branch: master Commit: 181004bf921ef3b8dcb0294635afab857fba1c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=181004bf921ef3b8dcb029463… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 24 09:25:38 2013 +0100 localspl/tests: Constify some character strings. --- dlls/localspl/tests/localmon.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 4e913c0..8655aa0 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -67,16 +67,16 @@ static const WCHAR cmd_AddPortW[] = {'A','d','d','P','o','r','t',0}; static const WCHAR cmd_ConfigureLPTPortCommandOKW[] = {'C','o','n','f','i','g','u','r','e', 'L','P','T','P','o','r','t', 'C','o','m','m','a','n','d','O','K',0}; -static WCHAR cmd_DeletePortW[] = {'D','e','l','e','t','e','P','o','r','t',0}; -static WCHAR cmd_GetTransmissionRetryTimeoutW[] = {'G','e','t', +static const WCHAR cmd_DeletePortW[] = {'D','e','l','e','t','e','P','o','r','t',0}; +static const WCHAR cmd_GetTransmissionRetryTimeoutW[] = {'G','e','t', 'T','r','a','n','s','m','i','s','s','i','o','n', 'R','e','t','r','y','T','i','m','e','o','u','t',0}; -static WCHAR cmd_MonitorUIW[] = {'M','o','n','i','t','o','r','U','I',0}; -static WCHAR cmd_MonitorUI_lcaseW[] = {'m','o','n','i','t','o','r','u','i',0}; -static WCHAR cmd_PortIsValidW[] = {'P','o','r','t','I','s','V','a','l','i','d',0}; +static const WCHAR cmd_MonitorUIW[] = {'M','o','n','i','t','o','r','U','I',0}; +static const WCHAR cmd_MonitorUI_lcaseW[] = {'m','o','n','i','t','o','r','u','i',0}; +static const WCHAR cmd_PortIsValidW[] = {'P','o','r','t','I','s','V','a','l','i','d',0}; static WCHAR does_not_existW[] = {'d','o','e','s','_','n','o','t','_','e','x','i','s','t',0}; -static CHAR emptyA[] = ""; +static const CHAR emptyA[] = ""; static WCHAR emptyW[] = {0}; static WCHAR LocalPortW[] = {'L','o','c','a','l',' ','P','o','r','t',0}; static WCHAR Monitors_LocalPortW[] = { @@ -87,32 +87,32 @@ static WCHAR Monitors_LocalPortW[] = { 'M','o','n','i','t','o','r','s','\\', 'L','o','c','a','l',' ','P','o','r','t',0}; -static CHAR num_0A[] = "0"; +static const CHAR num_0A[] = "0"; static WCHAR num_0W[] = {'0',0}; -static CHAR num_1A[] = "1"; +static const CHAR num_1A[] = "1"; static WCHAR num_1W[] = {'1',0}; -static CHAR num_999999A[] = "999999"; +static const CHAR num_999999A[] = "999999"; static WCHAR num_999999W[] = {'9','9','9','9','9','9',0}; -static CHAR num_1000000A[] = "1000000"; +static const CHAR num_1000000A[] = "1000000"; static WCHAR num_1000000W[] = {'1','0','0','0','0','0','0',0}; -static WCHAR portname_comW[] = {'C','O','M',0}; +static const WCHAR portname_comW[] = {'C','O','M',0}; static WCHAR portname_com1W[] = {'C','O','M','1',':',0}; static WCHAR portname_com2W[] = {'C','O','M','2',':',0}; static WCHAR portname_fileW[] = {'F','I','L','E',':',0}; -static WCHAR portname_lptW[] = {'L','P','T',0}; +static const WCHAR portname_lptW[] = {'L','P','T',0}; static WCHAR portname_lpt1W[] = {'L','P','T','1',':',0}; static WCHAR portname_lpt2W[] = {'L','P','T','2',':',0}; static WCHAR server_does_not_existW[] = {'\\','\\','d','o','e','s','_','n','o','t','_','e','x','i','s','t',0}; -static CHAR TransmissionRetryTimeoutA[] = {'T','r','a','n','s','m','i','s','s','i','o','n', +static const CHAR TransmissionRetryTimeoutA[] = {'T','r','a','n','s','m','i','s','s','i','o','n', 'R','e','t','r','y','T','i','m','e','o','u','t',0}; -static CHAR WinNT_CV_WindowsA[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'W','i','n','d','o','w','s',0}; +static const CHAR WinNT_CV_WindowsA[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'W','i','n','d','o','w','s',0}; static WCHAR wineW[] = {'W','i','n','e',0}; static WCHAR tempdirW[MAX_PATH];

1 0

Frédéric Delanoy : kernel32/tests: Constify some character strings.
by Alexandre Julliard 26 Dec '13

26 Dec '13

Module: wine Branch: master Commit: 5f6b0d0027b109c1af6a7a5efb2597eb39ef26f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f6b0d0027b109c1af6a7a5ef… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 24 09:25:37 2013 +0100 kernel32/tests: Constify some character strings. --- dlls/kernel32/tests/profile.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 9b83e85..c6e0b61 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -92,12 +92,12 @@ static void test_profile_int(void) static void test_profile_string(void) { - static WCHAR emptyW[] = { 0 }; - static WCHAR keyW[] = { 'k','e','y',0 }; - static WCHAR sW[] = { 's',0 }; - static WCHAR TESTFILE2W[] = {'.','\\','t','e','s','t','w','i','n','e','2','.','i','n','i',0}; - static WCHAR valsectionW[] = {'v','a','l','_','e','_','s','e','c','t','i','o','n',0 }; - static WCHAR valnokeyW[] = {'v','a','l','_','n','o','_','k','e','y',0}; + static const WCHAR emptyW[] = { 0 }; + static const WCHAR keyW[] = { 'k','e','y',0 }; + static const WCHAR sW[] = { 's',0 }; + static const WCHAR TESTFILE2W[] = {'.','\\','t','e','s','t','w','i','n','e','2','.','i','n','i',0}; + static const WCHAR valsectionW[] = {'v','a','l','_','e','_','s','e','c','t','i','o','n',0 }; + static const WCHAR valnokeyW[] = {'v','a','l','_','n','o','_','k','e','y',0}; HANDLE h; int ret; DWORD count; @@ -441,9 +441,9 @@ static void test_profile_existing(void) static void test_profile_delete_on_close(void) { - static CHAR testfile[] = ".\\testwine5.ini"; HANDLE h; DWORD size, res; + static const CHAR testfile[] = ".\\testwine5.ini"; static const char contents[] = "[" SECTION "]\n" KEY "=123\n"; h = CreateFileA(testfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, @@ -464,7 +464,7 @@ static void test_profile_delete_on_close(void) static void test_profile_refresh(void) { - static CHAR testfile[] = ".\\winetest4.ini"; + static const CHAR testfile[] = ".\\winetest4.ini"; HANDLE h; DWORD size, res; static const char contents1[] = "[" SECTION "]\n" KEY "=123\n";

1 0

Frédéric Delanoy : infosoft/tests: Constify a character string.
by Alexandre Julliard 26 Dec '13

26 Dec '13

Module: wine Branch: master Commit: ab159ead212de3f657fe7f9b437129d54b31e5f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab159ead212de3f657fe7f9b4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 24 09:25:36 2013 +0100 infosoft/tests: Constify a character string. --- dlls/infosoft/tests/infosoft.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/infosoft/tests/infosoft.c b/dlls/infosoft/tests/infosoft.c index efebedc..1e2792f 100644 --- a/dlls/infosoft/tests/infosoft.c +++ b/dlls/infosoft/tests/infosoft.c @@ -32,7 +32,7 @@ DEFINE_GUID(CLSID_wb_neutral, 0x369647e0,0x17b0,0x11ce,0x99,0x50,0x00,0xaa,0x00,0x4b,0xbb,0x1f); DEFINE_GUID(_IID_IWordBreaker, 0xD53552C8,0x77E3,0x101A,0xB5,0x52,0x08,0x00,0x2B,0x33,0xB0,0xE6); -static WCHAR teststring[] = { +static const WCHAR teststring[] = { 's','q','u','a','r','e',' ', 'c','i','r','c','l','e',' ', 't','r','i','a','n','g','l','e',' ',

1 0

Frédéric Delanoy : inetcomm/tests: Constify some character strings.
by Alexandre Julliard 26 Dec '13

26 Dec '13

Module: wine Branch: master Commit: ff304fb5c75a7bc5f17dcdd1acb2203872923810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff304fb5c75a7bc5f17dcdd1a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 24 09:25:35 2013 +0100 inetcomm/tests: Constify some character strings. --- dlls/inetcomm/tests/mimeole.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 389e267..7e98563 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -32,7 +32,7 @@ #include "wine/test.h" -static char msg1[] = +static const char msg1[] = "MIME-Version: 1.0\r\n" "Content-Type: multipart/mixed;\r\n" " boundary=\"------------1.5.0.6\";\r\n" @@ -224,7 +224,7 @@ static void test_CreateMessage(void) char text[] = "text"; HBODY *body_list; PROPVARIANT prop; - static char att_pritype[] = "att:pri-content-type"; + static const char att_pritype[] = "att:pri-content-type"; hr = MimeOleCreateMessage(NULL, &msg); ok(hr == S_OK, "ret %08x\n", hr);

1 0

Frédéric Delanoy : imagehlp/tests: Constify some character strings.
by Alexandre Julliard 26 Dec '13

26 Dec '13

Module: wine Branch: master Commit: 3ad692d483d3e18b85caa54e4b2d44e746e2e22d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad692d483d3e18b85caa54e4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 24 09:25:34 2013 +0100 imagehlp/tests: Constify some character strings. --- dlls/imagehlp/tests/integrity.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/imagehlp/tests/integrity.c b/dlls/imagehlp/tests/integrity.c index 025e20f..eb1eb58 100644 --- a/dlls/imagehlp/tests/integrity.c +++ b/dlls/imagehlp/tests/integrity.c @@ -36,7 +36,7 @@ static BOOL (WINAPI *pImageGetCertificateData)(HANDLE, DWORD, LPWIN_CERTIFICATE, static BOOL (WINAPI *pImageGetCertificateHeader)(HANDLE, DWORD, LPWIN_CERTIFICATE); static BOOL (WINAPI *pImageRemoveCertificate)(HANDLE, DWORD); -static char test_cert_data[] = +static const char test_cert_data[] = {0x30,0x82,0x02,0xE1,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x02 ,0xA0,0x82,0x02,0xD2,0x30,0x82,0x02,0xCE,0x02,0x01,0x01,0x31,0x00,0x30,0x0B ,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x01,0xA0,0x82,0x02,0xB4 @@ -88,7 +88,7 @@ static char test_cert_data[] = ,0x46,0xCA,0xEB,0xEA,0x67,0x89,0x49,0x7C,0x43,0xA2,0x52,0xD9,0x41,0xCC,0x65 ,0xED,0x2D,0xA1,0x00,0x31,0x00}; -static char test_cert_data_2[] = {0xDE,0xAD,0xBE,0xEF,0x01,0x02,0x03}; +static const char test_cert_data_2[] = {0xDE,0xAD,0xBE,0xEF,0x01,0x02,0x03}; static BOOL copy_dll_file(void) { @@ -135,7 +135,7 @@ static DWORD get_file_size(void) return filesize; } -static void test_add_certificate(char *cert_data, int len) +static void test_add_certificate(const char *cert_data, int len) { HANDLE hFile; LPWIN_CERTIFICATE cert; @@ -173,7 +173,7 @@ static void test_add_certificate(char *cert_data, int len) CloseHandle(hFile); } -static void test_get_certificate(char *cert_data, int index) +static void test_get_certificate(const char *cert_data, int index) { HANDLE hFile; LPWIN_CERTIFICATE cert;

1 0

Nikolay Sivov : include: Added ID2D1SimplifiedGeometrySink definition.
by Alexandre Julliard 26 Dec '13

26 Dec '13

Module: wine Branch: master Commit: 136549dd58bba4f869690034b4d92042578db49b URL: http://source.winehq.org/git/wine.git/?a=commit;h=136549dd58bba4f869690034b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 23 16:30:05 2013 +0400 include: Added ID2D1SimplifiedGeometrySink definition. --- include/Makefile.in | 2 + include/d2d1.idl | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ include/d2dbasetypes.h | 23 +++++++++++++++ 3 files changed, 99 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index a6d149d..460c3c2 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -23,6 +23,7 @@ PUBLIC_IDL_H_SRCS = \ cordebug.idl \ ctfutb.idl \ ctxtcall.idl \ + d2d1.idl \ d3d10.idl \ d3d10_1.idl \ d3d11.idl \ @@ -187,6 +188,7 @@ SRCDIR_INCLUDES = \ cryptuiapi.h \ custcntl.h \ cvconst.h \ + d2dbasetypes.h \ d3d.h \ d3d10_1shader.h \ d3d10effect.h \ diff --git a/include/d2d1.idl b/include/d2d1.idl new file mode 100644 index 0000000..8c9cdb3 --- /dev/null +++ b/include/d2d1.idl @@ -0,0 +1,74 @@ +/* + * Copyright 2013 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "d2dbasetypes.h"; + +typedef D2D_POINT_2F D2D1_POINT_2F; + +typedef enum D2D1_FILL_MODE +{ + D2D1_FILL_MODE_ALTERNATE = 0, + D2D1_FILL_MODE_WINDING = 1, + D2D1_FILL_MODE_FORCE_DWORD = 0xffffffff +} D2D1_FILL_MODE; + +typedef enum D2D1_PATH_SEGMENT +{ + D2D1_PATH_SEGMENT_NONE = 0, + D2D1_PATH_SEGMENT_FORCE_UNSTROKED = 1, + D2D1_PATH_SEGMENT_FORCE_ROUND_LINE_JOIN = 2, + D2D1_PATH_SEGMENT_FORCE_DWORD = 0xffffffff +} D2D1_PATH_SEGMENT; + +typedef enum D2D1_FIGURE_BEGIN +{ + D2D1_FIGURE_BEGIN_FILLED = 0, + D2D1_FIGURE_BEGIN_HOLLOW = 1, + D2D1_FIGURE_BEGIN_FORCE_DWORD = 0xffffffff +} D2D1_FIGURE_BEGIN; + +typedef struct D2D1_BEZIER_SEGMENT +{ + D2D1_POINT_2F point1; + D2D1_POINT_2F point2; + D2D1_POINT_2F point3; +} D2D1_BEZIER_SEGMENT; + +typedef enum D2D1_FIGURE_END +{ + D2D1_FIGURE_END_OPEN = 0, + D2D1_FIGURE_END_CLOSED = 1, + D2D1_FIGURE_END_FORCE_DWORD = 0xffffffff +} D2D1_FIGURE_END; + +[ + local, + object, + uuid(2cd9069e-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1SimplifiedGeometrySink : IUnknown +{ + void SetFillMode(D2D1_FILL_MODE mode); + void SetSegmentFlags(D2D1_PATH_SEGMENT vertexFlags); + void BeginFigure(D2D1_POINT_2F startPoint, D2D1_FIGURE_BEGIN figureBegin); + void AddLines(const D2D1_POINT_2F *points, UINT32 count); + void AddBeziers(const D2D1_BEZIER_SEGMENT *beziers, UINT32 count); + void EndFigure(D2D1_FIGURE_END figureEnd); + HRESULT Close(); +} diff --git a/include/d2dbasetypes.h b/include/d2dbasetypes.h new file mode 100644 index 0000000..b306e2b --- /dev/null +++ b/include/d2dbasetypes.h @@ -0,0 +1,23 @@ +/* + * Copyright 2013 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +typedef struct D2D_POINT_2F +{ + FLOAT x; + FLOAT y; +} D2D_POINT_2F;

1 0

Alexandre Julliard : ntdll: Allocate TLS data in all running threads on module load.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: e54503f7085a5b62dfc373aaa6b98116bde784d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e54503f7085a5b62dfc373aaa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 23 18:16:51 2013 +0100 ntdll: Allocate TLS data in all running threads on module load. --- dlls/ntdll/loader.c | 49 +++++++++++++++++++++++++++++++++++++++++++--- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/thread.c | 11 ---------- 3 files changed, 46 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b8a9c66..e0907e7 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -97,6 +97,7 @@ static struct builtin_load_info *builtin_load_info = &default_load_info; static HANDLE main_exe_file; static UINT tls_module_count; /* number of modules with TLS directory */ static const IMAGE_TLS_DIRECTORY **tls_dirs; /* array of TLS directories */ +LIST_ENTRY tls_links = { &tls_links, &tls_links }; static RTL_CRITICAL_SECTION loader_section; static RTL_CRITICAL_SECTION_DEBUG critsect_debug = @@ -803,6 +804,7 @@ static SHORT alloc_tls_slot( LDR_MODULE *mod ) const IMAGE_TLS_DIRECTORY *dir; ULONG i, size; void *new_ptr; + LIST_ENTRY *entry; if (!(dir = RtlImageDirectoryEntryToData( mod->BaseAddress, TRUE, IMAGE_DIRECTORY_ENTRY_TLS, &size ))) return -1; @@ -826,10 +828,41 @@ static SHORT alloc_tls_slot( LDR_MODULE *mod ) new_ptr = RtlReAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, tls_dirs, new_count * sizeof(*tls_dirs) ); if (!new_ptr) return -1; + + /* resize the pointer block in all running threads */ + for (entry = tls_links.Flink; entry != &tls_links; entry = entry->Flink) + { + TEB *teb = CONTAINING_RECORD( entry, TEB, TlsLinks ); + void **old = teb->ThreadLocalStoragePointer; + void **new = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, new_count * sizeof(*new)); + + if (!new) return -1; + if (old) memcpy( new, old, tls_module_count * sizeof(*new) ); + teb->ThreadLocalStoragePointer = new; + TRACE( "thread %04lx tls block %p -> %p\n", (ULONG_PTR)teb->ClientId.UniqueThread, old, new ); + /* FIXME: can't free old block here, should be freed at thread exit */ + } + tls_dirs = new_ptr; tls_module_count = new_count; } + /* allocate the data block in all running threads */ + for (entry = tls_links.Flink; entry != &tls_links; entry = entry->Flink) + { + TEB *teb = CONTAINING_RECORD( entry, TEB, TlsLinks ); + + if (!(new_ptr = RtlAllocateHeap( GetProcessHeap(), 0, size + dir->SizeOfZeroFill ))) return -1; + memcpy( new_ptr, (void *)dir->StartAddressOfRawData, size ); + memset( (char *)new_ptr + size, 0, dir->SizeOfZeroFill ); + + TRACE( "thread %04lx slot %u: %u/%u bytes at %p\n", + (ULONG_PTR)teb->ClientId.UniqueThread, i, size, dir->SizeOfZeroFill, new_ptr ); + + RtlFreeHeap( GetProcessHeap(), 0, + interlocked_xchg_ptr( (void **)teb->ThreadLocalStoragePointer + i, new_ptr )); + } + *(DWORD *)dir->AddressOfIndex = i; tls_dirs[i] = dir; return i; @@ -956,9 +989,8 @@ static NTSTATUS alloc_thread_tls(void) memcpy( pointers[i], (void *)dir->StartAddressOfRawData, size ); memset( (char *)pointers[i] + size, 0, dir->SizeOfZeroFill ); - TRACE( "thread %04x idx %d: %d/%d bytes from %p to %p\n", - GetCurrentThreadId(), i, size, dir->SizeOfZeroFill, - (void *)dir->StartAddressOfRawData, pointers[i] ); + TRACE( "thread %04x slot %u: %u/%u bytes at %p\n", + GetCurrentThreadId(), i, size, dir->SizeOfZeroFill, pointers[i] ); } NtCurrentTeb()->ThreadLocalStoragePointer = pointers; return STATUS_SUCCESS; @@ -1229,6 +1261,10 @@ NTSTATUS MODULE_DllThreadAttach( LPVOID lpReserved ) RtlEnterCriticalSection( &loader_section ); + RtlAcquirePebLock(); + InsertHeadList( &tls_links, &NtCurrentTeb()->TlsLinks ); + RtlReleasePebLock(); + if ((status = alloc_thread_tls()) != STATUS_SUCCESS) goto done; mark = &NtCurrentTeb()->Peb->LdrData->InInitializationOrderModuleList; @@ -2521,11 +2557,17 @@ void WINAPI LdrShutdownThread(void) DLL_THREAD_DETACH, NULL ); } + RtlAcquirePebLock(); + RemoveEntryList( &NtCurrentTeb()->TlsLinks ); + RtlReleasePebLock(); + if ((pointers = NtCurrentTeb()->ThreadLocalStoragePointer)) { for (i = 0; i < tls_module_count; i++) RtlFreeHeap( GetProcessHeap(), 0, pointers[i] ); RtlFreeHeap( GetProcessHeap(), 0, pointers ); } + RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->FlsSlots ); + RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->TlsExpansionSlots ); RtlLeaveCriticalSection( &loader_section ); } @@ -2828,7 +2870,6 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, actctx_init(); load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; if ((status = fixup_imports( wm, load_path )) != STATUS_SUCCESS) goto error; - if ((status = alloc_thread_tls()) != STATUS_SUCCESS) goto error; heap_set_debug_flags( GetProcessHeap() ); status = wine_call_on_stack( attach_process_dlls, wm, NtCurrentTeb()->Tib.StackBase ); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index a45e6b0..4370084 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -103,6 +103,7 @@ NTSTATUS NTDLL_create_struct_sd(PSECURITY_DESCRIPTOR nt_sd, struct security_desc void NTDLL_free_struct_sd(struct security_descriptor *server_sd) DECLSPEC_HIDDEN; /* module handling */ +extern LIST_ENTRY tls_links DECLSPEC_HIDDEN; extern NTSTATUS MODULE_DllThreadAttach( LPVOID lpReserved ) DECLSPEC_HIDDEN; extern FARPROC RELAY_GetProcAddress( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, FARPROC proc, DWORD ordinal, const WCHAR *user ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 8a63725..9f0dfc0 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -67,7 +67,6 @@ static WCHAR current_dir[MAX_NT_PATH_LENGTH]; static RTL_BITMAP tls_bitmap; static RTL_BITMAP tls_expansion_bitmap; static RTL_BITMAP fls_bitmap; -static LIST_ENTRY tls_links; static int nb_threads = 1; /*********************************************************************** @@ -261,7 +260,6 @@ HANDLE thread_init(void) InitializeListHead( &ldr.InLoadOrderModuleList ); InitializeListHead( &ldr.InMemoryOrderModuleList ); InitializeListHead( &ldr.InInitializationOrderModuleList ); - InitializeListHead( &tls_links ); #ifdef __APPLE__ peb->Reserved[0] = get_dyld_image_info_addr(); #endif @@ -376,11 +374,6 @@ void exit_thread( int status ) } LdrShutdownThread(); - RtlAcquirePebLock(); - RemoveEntryList( &NtCurrentTeb()->TlsLinks ); - RtlReleasePebLock(); - RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->FlsSlots ); - RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->TlsExpansionSlots ); pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); @@ -425,10 +418,6 @@ static void start_thread( struct startup_info *info ) server_init_thread( func ); pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); - RtlAcquirePebLock(); - InsertHeadList( &tls_links, &teb->TlsLinks ); - RtlReleasePebLock(); - MODULE_DllThreadAttach( NULL ); if (TRACE_ON(relay))

1 0

Alexandre Julliard : ntdll: Allocate TLS slots dynamically on module load.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: 1a4eca6f16af0eabbeee6fcdebfa90abc0cec8d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a4eca6f16af0eabbeee6fcde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 23 12:54:26 2013 +0100 ntdll: Allocate TLS slots dynamically on module load. --- dlls/ntdll/loader.c | 110 ++++++++++++++++++++++++++++---------------------- 1 files changed, 62 insertions(+), 48 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 817cf8a..b8a9c66 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -792,6 +792,65 @@ static BOOL is_dll_native_subsystem( HMODULE module, const IMAGE_NT_HEADERS *nt, return TRUE; } +/************************************************************************* + * alloc_tls_slot + * + * Allocate a TLS slot for a newly-loaded module. + * The loader_section must be locked while calling this function. + */ +static SHORT alloc_tls_slot( LDR_MODULE *mod ) +{ + const IMAGE_TLS_DIRECTORY *dir; + ULONG i, size; + void *new_ptr; + + if (!(dir = RtlImageDirectoryEntryToData( mod->BaseAddress, TRUE, IMAGE_DIRECTORY_ENTRY_TLS, &size ))) + return -1; + + size = dir->EndAddressOfRawData - dir->StartAddressOfRawData; + if (!size && !dir->SizeOfZeroFill && !dir->AddressOfCallBacks) return -1; + + for (i = 0; i < tls_module_count; i++) if (!tls_dirs[i]) break; + + TRACE( "module %p data %p-%p zerofill %u index %p callback %p flags %x -> slot %u\n", mod->BaseAddress, + (void *)dir->StartAddressOfRawData, (void *)dir->EndAddressOfRawData, dir->SizeOfZeroFill, + (void *)dir->AddressOfIndex, (void *)dir->AddressOfCallBacks, dir->Characteristics, i ); + + if (i == tls_module_count) + { + UINT new_count = max( 32, tls_module_count * 2 ); + + if (!tls_dirs) + new_ptr = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, new_count * sizeof(*tls_dirs) ); + else + new_ptr = RtlReAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, tls_dirs, + new_count * sizeof(*tls_dirs) ); + if (!new_ptr) return -1; + tls_dirs = new_ptr; + tls_module_count = new_count; + } + + *(DWORD *)dir->AddressOfIndex = i; + tls_dirs[i] = dir; + return i; +} + + +/************************************************************************* + * free_tls_slot + * + * Free the module TLS slot on unload. + * The loader_section must be locked while calling this function. + */ +static void free_tls_slot( LDR_MODULE *mod ) +{ + ULONG i = (USHORT)mod->TlsIndex; + + if (mod->TlsIndex == -1) return; + assert( i < tls_module_count ); + tls_dirs[i] = NULL; +} + /************************************************************************* * alloc_module @@ -816,7 +875,6 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) wm->ldr.SizeOfImage = nt->OptionalHeader.SizeOfImage; wm->ldr.Flags = LDR_DONT_RESOLVE_REFS; wm->ldr.LoadCount = 1; - wm->ldr.TlsIndex = -1; wm->ldr.SectionHandle = NULL; wm->ldr.CheckSum = 0; wm->ldr.TimeDateStamp = 0; @@ -853,6 +911,8 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) wm->ldr.InInitializationOrderModuleList.Flink = NULL; wm->ldr.InInitializationOrderModuleList.Blink = NULL; + wm->ldr.TlsIndex = alloc_tls_slot( &wm->ldr ); + if (!(nt->OptionalHeader.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_NX_COMPAT)) { ULONG flags = MEM_EXECUTE_OPTION_ENABLE; @@ -864,52 +924,6 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) /************************************************************************* - * alloc_process_tls - * - * Allocate the process-wide structure for module TLS storage. - */ -static NTSTATUS alloc_process_tls(void) -{ - PLIST_ENTRY mark, entry; - PLDR_MODULE mod; - const IMAGE_TLS_DIRECTORY *dir; - ULONG size, i; - - mark = &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList; - for (entry = mark->Flink; entry != mark; entry = entry->Flink) - { - mod = CONTAINING_RECORD(entry, LDR_MODULE, InMemoryOrderModuleList); - if (!(dir = RtlImageDirectoryEntryToData( mod->BaseAddress, TRUE, - IMAGE_DIRECTORY_ENTRY_TLS, &size ))) - continue; - size = (dir->EndAddressOfRawData - dir->StartAddressOfRawData) + dir->SizeOfZeroFill; - if (!size && !dir->AddressOfCallBacks) continue; - tls_module_count++; - } - if (!tls_module_count) return STATUS_SUCCESS; - - TRACE( "count %u\n", tls_module_count ); - - tls_dirs = RtlAllocateHeap( GetProcessHeap(), 0, tls_module_count * sizeof(*tls_dirs) ); - if (!tls_dirs) return STATUS_NO_MEMORY; - - for (i = 0, entry = mark->Flink; entry != mark; entry = entry->Flink) - { - mod = CONTAINING_RECORD(entry, LDR_MODULE, InMemoryOrderModuleList); - if (!(dir = RtlImageDirectoryEntryToData( mod->BaseAddress, TRUE, - IMAGE_DIRECTORY_ENTRY_TLS, &size ))) - continue; - tls_dirs[i] = dir; - *(DWORD *)dir->AddressOfIndex = i; - mod->TlsIndex = i; - mod->LoadCount = -1; /* can't unload it */ - i++; - } - return STATUS_SUCCESS; -} - - -/************************************************************************* * alloc_thread_tls * * Allocate the per-thread structure for module TLS storage. @@ -2540,6 +2554,7 @@ static void free_modref( WINE_MODREF *wm ) } SERVER_END_REQ; + free_tls_slot( &wm->ldr ); RtlReleaseActivationContext( wm->ldr.ActivationContext ); NtUnmapViewOfSection( NtCurrentProcess(), wm->ldr.BaseAddress ); if (wm->ldr.Flags & LDR_WINE_INTERNAL) wine_dll_unload( wm->ldr.SectionHandle ); @@ -2813,7 +2828,6 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, actctx_init(); load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; if ((status = fixup_imports( wm, load_path )) != STATUS_SUCCESS) goto error; - if ((status = alloc_process_tls()) != STATUS_SUCCESS) goto error; if ((status = alloc_thread_tls()) != STATUS_SUCCESS) goto error; heap_set_debug_flags( GetProcessHeap() );

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
47
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 December 2013