December 2013 - Wine-commits

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

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

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 : 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 : 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 : 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 : 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 : 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 : winedump: Use BOOL type where appropriate.
by Alexandre Julliard 26 Dec '13

26 Dec '13

Module: wine Branch: master Commit: 2fd1b85c77498f6a3bef75defb1c842a6feeec42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fd1b85c77498f6a3bef75def… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 24 10:24:27 2013 +0100 winedump: Use BOOL type where appropriate. --- tools/winedump/symbol.c | 6 ++-- tools/winedump/tlb.c | 76 ++++++++++++++++++++++---------------------- tools/winedump/winedump.h | 2 +- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/tools/winedump/symbol.c b/tools/winedump/symbol.c index 69b54b8..4dccb45 100644 --- a/tools/winedump/symbol.c +++ b/tools/winedump/symbol.c @@ -126,7 +126,7 @@ void symbol_clear(parsed_symbol *sym) * * Check if a symbol is a valid C identifier */ -int symbol_is_valid_c(const parsed_symbol *sym) +BOOL symbol_is_valid_c(const parsed_symbol *sym) { char *name; @@ -138,10 +138,10 @@ int symbol_is_valid_c(const parsed_symbol *sym) while (*name) { if (!isalnum (*name) && *name != '_') - return 0; + return FALSE; name++; } - return 1; + return TRUE; } diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index 9bc487f..9c3067b 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -46,7 +46,7 @@ enum TYPEKIND { struct seg_t; -typedef int (*dump_seg_t)(struct seg_t*); +typedef BOOL (*dump_seg_t)(struct seg_t*); typedef struct seg_t { const char *name; @@ -59,7 +59,7 @@ static int offset=0; static int indent; static int typeinfo_cnt; static int header_flags = 0; -static int msft_eof = 0; +static BOOL msft_eof = FALSE; static int msft_typeinfo_offs[1000]; static int msft_typeinfo_kind[1000]; @@ -73,7 +73,7 @@ static const void *tlb_read(int size) { if(ret) offset += size; else - msft_eof = -1; + msft_eof = TRUE; return ret; } @@ -277,7 +277,7 @@ static void dump_msft_typeinfobase(void) print_end_block(); } -static int dump_msft_typeinfobases(seg_t *seg) +static BOOL dump_msft_typeinfobases(seg_t *seg) { int i; @@ -285,7 +285,7 @@ static int dump_msft_typeinfobases(seg_t *seg) dump_msft_typeinfobase(); assert(offset == seg->offset+seg->length); - return -1; + return TRUE; } static void dump_msft_impinfo(int n) @@ -299,7 +299,7 @@ static void dump_msft_impinfo(int n) print_end_block(); } -static int dump_msft_impinfos(seg_t *seg) +static BOOL dump_msft_impinfos(seg_t *seg) { int i; @@ -307,7 +307,7 @@ static int dump_msft_impinfos(seg_t *seg) dump_msft_impinfo(i); assert(offset == seg->offset+seg->length); - return -1; + return TRUE; } static void dump_msft_impfile(int n) @@ -322,7 +322,7 @@ static void dump_msft_impfile(int n) print_end_block(); } -static int dump_msft_impfiles(seg_t *seg) +static BOOL dump_msft_impfiles(seg_t *seg) { int i; @@ -330,10 +330,10 @@ static int dump_msft_impfiles(seg_t *seg) dump_msft_impfile(i); assert(offset == seg->offset+seg->length); - return -1; + return TRUE; } -static int dump_msft_reftabs(seg_t *seg) +static BOOL dump_msft_reftabs(seg_t *seg) { print_begin_block("RefTab"); @@ -341,10 +341,10 @@ static int dump_msft_reftabs(seg_t *seg) print_end_block(); - return -1; + return TRUE; } -static int dump_msft_guidhashtab(seg_t *seg) +static BOOL dump_msft_guidhashtab(seg_t *seg) { print_begin_block("GuidHashTab"); @@ -353,7 +353,7 @@ static int dump_msft_guidhashtab(seg_t *seg) print_end_block(); assert(offset == seg->offset+seg->length); - return -1; + return TRUE; } static void dump_msft_guidentry(int n) @@ -367,7 +367,7 @@ static void dump_msft_guidentry(int n) print_end_block(); } -static int dump_msft_guidtab(seg_t *seg) +static BOOL dump_msft_guidtab(seg_t *seg) { int i; @@ -375,17 +375,17 @@ static int dump_msft_guidtab(seg_t *seg) dump_msft_guidentry(i); assert(offset == seg->offset+seg->length); - return -1; + return TRUE; } -static int dump_msft_namehashtab(seg_t *seg) +static BOOL dump_msft_namehashtab(seg_t *seg) { print_begin_block("NameHashTab"); dump_binary(seg->length); /* FIXME */ print_end_block(); - return -1; + return TRUE; } static void dump_string(int len, int align_off) @@ -415,7 +415,7 @@ static void dump_msft_name(int base, int n) print_end_block(); } -static int dump_msft_nametab(seg_t *seg) +static BOOL dump_msft_nametab(seg_t *seg) { int i, base = offset; @@ -423,7 +423,7 @@ static int dump_msft_nametab(seg_t *seg) dump_msft_name(base, i); assert(offset == seg->offset+seg->length); - return -1; + return TRUE; } static void dump_msft_string(int n) @@ -447,7 +447,7 @@ static void dump_msft_string(int n) print_end_block(); } -static int dump_msft_stringtab(seg_t *seg) +static BOOL dump_msft_stringtab(seg_t *seg) { int i; @@ -455,7 +455,7 @@ static int dump_msft_stringtab(seg_t *seg) dump_msft_string(i); assert(offset == seg->offset+seg->length); - return -1; + return TRUE; } static void dump_msft_typedesc(int n) @@ -468,7 +468,7 @@ static void dump_msft_typedesc(int n) print_end_block(); } -static int dump_msft_typedesctab(seg_t *seg) +static BOOL dump_msft_typedesctab(seg_t *seg) { int i; @@ -480,20 +480,20 @@ static int dump_msft_typedesctab(seg_t *seg) print_end_block(); assert(offset == seg->offset+seg->length); - return -1; + return TRUE; } -static int dump_msft_arraydescs(seg_t *seg) +static BOOL dump_msft_arraydescs(seg_t *seg) { print_begin_block("ArrayDescriptions"); dump_binary(seg->length); /* FIXME */ print_end_block(); - return -1; + return TRUE; } -static int dump_msft_custdata(seg_t *seg) +static BOOL dump_msft_custdata(seg_t *seg) { unsigned short vt; unsigned i, n; @@ -520,7 +520,7 @@ static int dump_msft_custdata(seg_t *seg) } print_end_block(); - return -1; + return TRUE; } static void dump_msft_cdguid(int n) @@ -534,7 +534,7 @@ static void dump_msft_cdguid(int n) print_end_block(); } -static int dump_msft_cdguids(seg_t *seg) +static BOOL dump_msft_cdguids(seg_t *seg) { int i; @@ -542,25 +542,25 @@ static int dump_msft_cdguids(seg_t *seg) dump_msft_cdguid(i); assert(offset == seg->offset+seg->length); - return -1; + return TRUE; } -static int dump_msft_res0e(seg_t *seg) +static BOOL dump_msft_res0e(seg_t *seg) { print_begin_block("res0e"); dump_binary(seg->length); print_end_block(); - return -1; + return TRUE; } -static int dump_msft_res0f(seg_t *seg) +static BOOL dump_msft_res0f(seg_t *seg) { print_begin_block("res0f"); dump_binary(seg->length); print_end_block(); - return -1; + return TRUE; } static void dump_msft_func(int n) @@ -658,7 +658,7 @@ static void dump_msft_coclass(int n) dump_msft_ref(i); } -static int dump_msft_typeinfo(int n) +static BOOL dump_msft_typeinfo(int n) { int i; @@ -667,7 +667,7 @@ static int dump_msft_typeinfo(int n) if((msft_typeinfo_kind[n] & 0xf) == TKIND_COCLASS) { dump_msft_coclass(n); print_end_block(); - return -1; + return TRUE; } print_dec("size"); @@ -698,7 +698,7 @@ static int dump_msft_typeinfo(int n) print_end_block(); - return -1; + return TRUE; } static seg_t segdir[] = { @@ -743,7 +743,7 @@ static void dump_msft_segdir(void) print_end_block(); } -static int dump_offset(void) +static BOOL dump_offset(void) { int i; @@ -755,7 +755,7 @@ static int dump_offset(void) if(msft_typeinfo_offs[i] == offset) return dump_msft_typeinfo(i); - return 0; + return FALSE; } enum FileSig get_kind_msft(void) diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 5cd74b3..45243cf 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -170,7 +170,7 @@ int symbol_search (parsed_symbol *symbol); void symbol_clear(parsed_symbol *sym); -int symbol_is_valid_c(const parsed_symbol *sym); +BOOL symbol_is_valid_c(const parsed_symbol *sym); const char *symbol_get_call_convention(const parsed_symbol *sym);

1 0

Alexandre Julliard : makedep: Specify the old extension explicitly when replacing it.
by Alexandre Julliard 26 Dec '13

26 Dec '13

Module: wine Branch: master Commit: 3c7bec3ce8a4b09595baac9d33648dcf17312955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c7bec3ce8a4b09595baac9d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 24 11:27:35 2013 +0100 makedep: Specify the old extension explicitly when replacing it. --- tools/makedep.c | 77 +++++++++++++++--------------------------------------- 1 files changed, 22 insertions(+), 55 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 33c7589..ec00ec8 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -342,11 +342,16 @@ static char *get_extension( char *filename ) /******************************************************************* * replace_extension */ -static char *replace_extension( const char *name, unsigned int old_len, const char *new_ext ) +static char *replace_extension( const char *name, const char *old_ext, const char *new_ext ) { - char *ret = xmalloc( strlen( name ) + strlen( new_ext ) + 1 ); - strcpy( ret, name ); - strcpy( ret + strlen( ret ) - old_len, new_ext ); + char *ret; + int name_len = strlen( name ); + int ext_len = strlen( old_ext ); + + if (name_len >= ext_len && !strcmp( name + name_len - ext_len, old_ext )) name_len -= ext_len; + ret = xmalloc( name_len + strlen( new_ext ) + 1 ); + memcpy( ret, name, name_len ); + strcpy( ret + name_len, new_ext ); return ret; } @@ -616,7 +621,7 @@ static FILE *open_include_file( struct incl_file *pFile ) if (strendswith( pFile->name, ".tab.h" )) { - filename = replace_extension( pFile->name, 6, ".y" ); + filename = replace_extension( pFile->name, ".tab.h", ".y" ); if (src_dir) filename = strmake( "%s/%s", src_dir, filename ); if ((file = open_file( filename ))) @@ -634,7 +639,7 @@ static FILE *open_include_file( struct incl_file *pFile ) if (strendswith( pFile->name, ".h" )) { - filename = replace_extension( pFile->name, 2, ".idl" ); + filename = replace_extension( pFile->name, ".h", ".idl" ); if (src_dir) filename = strmake( "%s/%s", src_dir, filename ); if ((file = open_file( filename ))) @@ -669,7 +674,7 @@ static FILE *open_include_file( struct incl_file *pFile ) if (strendswith( pFile->name, ".h" )) { - filename = replace_extension( pFile->name, 2, ".idl" ); + filename = replace_extension( pFile->name, ".h", ".idl" ); if (top_src_dir) filename = strmake( "%s/include/%s", top_src_dir, filename ); else if (top_obj_dir) @@ -690,7 +695,7 @@ static FILE *open_include_file( struct incl_file *pFile ) if (strendswith( pFile->name, ".h" )) { - filename = replace_extension( pFile->name, 2, ".h.in" ); + filename = replace_extension( pFile->name, ".h", ".h.in" ); if (top_src_dir) filename = strmake( "%s/include/%s", top_src_dir, filename ); else if (top_obj_dir) @@ -711,7 +716,7 @@ static FILE *open_include_file( struct incl_file *pFile ) if (strendswith( pFile->name, "tmpl.h" )) { - filename = replace_extension( pFile->name, 2, ".x" ); + filename = replace_extension( pFile->name, ".h", ".x" ); if (top_src_dir) filename = strmake( "%s/include/%s", top_src_dir, filename ); else if (top_obj_dir) @@ -1015,13 +1020,11 @@ static void parse_in_file( struct incl_file *source, FILE *file ) */ static void parse_generated_idl( struct incl_file *source ) { - char *header = replace_extension( source->name, 4, ".h" ); - source->filename = xstrdup( source->name ); if (strendswith( source->name, "_c.c" )) { - add_include( source, header, 0 ); + add_include( source, replace_extension( source->name, "_c.c", ".h" ), 0 ); } else if (strendswith( source->name, "_i.c" )) { @@ -1034,15 +1037,13 @@ static void parse_generated_idl( struct incl_file *source ) add_include( source, "objbase.h", 1 ); add_include( source, "rpcproxy.h", 1 ); add_include( source, "wine/exception.h", 1 ); - add_include( source, header, 0 ); + add_include( source, replace_extension( source->name, "_p.c", ".h" ), 0 ); } else if (strendswith( source->name, "_s.c" )) { add_include( source, "wine/exception.h", 1 ); - add_include( source, header, 0 ); + add_include( source, replace_extension( source->name, "_s.c", ".h" ), 0 ); } - - free( header ); } /******************************************************************* @@ -1134,7 +1135,7 @@ static struct incl_file *add_src_file( const char *name ) if (strendswith( file->name, ".o" )) { /* default to .c for unknown extra object files */ - file->filename = replace_extension( file->name, 2, ".c" ); + file->filename = replace_extension( file->name, ".o", ".c" ); return file; } @@ -1166,44 +1167,10 @@ static void add_generated_sources(void) { if (!(source->flags & idl_outputs[i].flag)) continue; if (!strendswith( idl_outputs[i].ext, ".c" )) continue; - add_src_file( replace_extension( source->name, 4, idl_outputs[i].ext )); + add_src_file( replace_extension( source->name, ".idl", idl_outputs[i].ext )); } if (source->flags & FLAG_IDL_PROXY) add_src_file( "dlldata.o" ); } - - LIST_FOR_EACH_ENTRY_SAFE( source, next, &sources, struct incl_file, entry ) - { - if (strendswith( source->name, "_c.c" ) || - strendswith( source->name, "_i.c" ) || - strendswith( source->name, "_p.c" ) || - strendswith( source->name, "_s.c" ) || - strendswith( source->name, ".tlb" )) - { - char *idl = replace_extension( source->name, 4, ".idl" ); - struct incl_file *file = add_src_file( idl ); - if (strendswith( source->name, "_c.c" )) file->flags |= FLAG_IDL_CLIENT; - else if (strendswith( source->name, "_i.c" )) file->flags |= FLAG_IDL_IDENT; - else if (strendswith( source->name, "_p.c" )) file->flags |= FLAG_IDL_PROXY; - else if (strendswith( source->name, "_s.c" )) file->flags |= FLAG_IDL_SERVER; - else if (strendswith( source->name, ".tlb" )) file->flags |= FLAG_IDL_TYPELIB; - continue; - } - if (strendswith( source->name, "_r.res" ) || - strendswith( source->name, "_t.res" )) - { - char *idl = replace_extension( source->name, 6, ".idl" ); - struct incl_file *file = add_src_file( idl ); - if (strendswith( source->name, "_r.res" )) file->flags |= FLAG_IDL_REGISTER; - else if (strendswith( source->name, "_t.res" )) file->flags |= FLAG_IDL_TYPELIB; - continue; - } - if (strendswith( source->name, ".pot" )) - { - char *rc = replace_extension( source->name, 4, ".rc" ); - struct incl_file *file = add_src_file( rc ); - file->flags |= FLAG_RC_PO; - } - } } @@ -1483,7 +1450,7 @@ static struct strarray output_sources(void) { if (strendswith( obj, ".man" ) && source->sourcename) { - char *dir, *dest = replace_extension( obj, 4, "" ); + char *dir, *dest = replace_extension( obj, ".man", "" ); char *lang = strchr( dest, '.' ); if (lang) { @@ -1594,14 +1561,14 @@ static struct strarray output_sources(void) column = output( "check test:" ); LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) if (strendswith( source->name, ".c" ) && !is_generated_idl( source )) - output_filename( replace_extension( source->name, 2, ".ok" ), &column ); + output_filename( replace_extension( source->name, ".c", ".ok" ), &column ); output( "\n" ); output( "testclean::\n" ); column = output( "\t$(RM)" ); LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) if (strendswith( source->name, ".c" ) && !is_generated_idl( source )) { - char *ok_file = replace_extension( source->name, 2, ".ok" ); + char *ok_file = replace_extension( source->name, ".c", ".ok" ); output_filename( ok_file, &column ); strarray_add( &clean_files, ok_file ); }

1 0