wine-commits May 2011

wine-commits@winehq.org

2 participants
945 discussions

Aric Stewart : usp10/test: Add Thaana shaping test.
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: 42274ed8ab5c3c7a4d8fdc808e6e83199d51f3e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42274ed8ab5c3c7a4d8fdc808… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 24 09:43:23 2011 -0500 usp10/test: Add Thaana shaping test. --- dlls/usp10/tests/usp10.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index d086b19..33469d5 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -585,6 +585,24 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; + /* Thaana */ + static const WCHAR test_thaana[] = {0x078a, 0x07ae, 0x0792, 0x07b0, 0x0020, 0x0796, 0x07aa, 0x0789, 0x07b0, 0x0795, 0x07ac, 0x0791, 0x07b0}; + static const shapeTest_char thaana_c[] = {{12,{0,0}},{12,{0,0}},{10,{0,0}},{10,{0,0}},{8,{1,0}},{7,{0,0}},{7,{0,0}},{5,{0,0}},{5,{0,0}},{3,{0,0}},{3,{0,0}},{1,{0,0}},{1,{0,0}}}; + static const shapeTest_glyph thaana_g[] = { + {1,{{SCRIPT_JUSTIFY_NONE,0,1,1,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,1,1,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,1,1,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,1,1,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,1,1,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,1,1,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; + if (!pScriptItemizeOpenType || !pScriptShapeOpenType) { win_skip("ScriptShapeOpenType not available on this platform\n"); @@ -649,6 +667,14 @@ static void test_ScriptShapeOpenType(HDC hdc) SelectObject(hdc, hfont_orig); DeleteObject(hfont); } + + test_valid = find_font_for_range(hdc, "MV Boli", 72, test_thaana[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_thaana, 13, &Control, &State, 0, 13, thaana_c, thaana_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

Aric Stewart : usp10/tests: Add Syriac shaping test.
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: 2d8955429c152a6df26ca6731f9880fc32222f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d8955429c152a6df26ca6731… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 24 09:43:18 2011 -0500 usp10/tests: Add Syriac shaping test. --- dlls/usp10/tests/usp10.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 9efe463..d086b19 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -574,6 +574,17 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}}; + /* Syriac */ + static const WCHAR test_syriac[] = {0x0710, 0x0710, 0x0710, 0x0728, 0x0718, 0x0723,0}; + static const shapeTest_char syriac_c[] = {{5,{0,0}},{4,{0,0}},{3,{0,0}},{2,{0,0}},{1,{0,0}},{0,{0,0}}}; + static const shapeTest_glyph syriac_g[] = { + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; + if (!pScriptItemizeOpenType || !pScriptShapeOpenType) { win_skip("ScriptShapeOpenType not available on this platform\n"); @@ -630,6 +641,14 @@ static void test_ScriptShapeOpenType(HDC hdc) SelectObject(hdc, hfont_orig); DeleteObject(hfont); } + + test_valid = find_font_for_range(hdc, "Estrangelo Edessa", 71, test_syriac[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_syriac, 6, &Control, &State, 0, 6, syriac_c, syriac_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

Aric Stewart : usp10: Add Thai shaping test.
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: ee450d5041ef63feee18b7bc697c5929d90952f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee450d5041ef63feee18b7bc6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 24 09:43:12 2011 -0500 usp10: Add Thai shaping test. --- dlls/usp10/tests/usp10.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index ccc2630..9efe463 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -559,6 +559,21 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_ARABIC_NORMAL,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_ARABIC_SEEN,1,0,0,0,0},0}} }; + /* Thai */ + static const WCHAR test_thai[] = {0x0e2a, 0x0e04, 0x0e23, 0x0e34, 0x0e1b, 0x0e15, 0x0e4c, 0x0e44, 0x0e17, 0x0e22,}; + static const shapeTest_char thai_c[] = {{0,{0,0}},{1,{0,0}},{2,{0,0}},{2,{0,0}},{4,{0,0}},{5,{0,0}},{5,{0,0}},{7,{0,0}},{8,{0,0}},{9,{0,0}}}; + static const shapeTest_glyph thai_g[] = { + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,0,1,1,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,0,1,1,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}}; + if (!pScriptItemizeOpenType || !pScriptShapeOpenType) { win_skip("ScriptShapeOpenType not available on this platform\n"); @@ -607,6 +622,14 @@ static void test_ScriptShapeOpenType(HDC hdc) SelectObject(hdc, hfont_orig); DeleteObject(hfont); } + + test_valid = find_font_for_range(hdc, "Microsoft Sans Serif", 24, test_thai[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_thai, 10, &Control, &State, 0, 10, thai_c, thai_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

Aric Stewart : usp10: Add Arabic shaping test.
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: 0d324b1fab33d04d26f2a0329821e9e32b0bae79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d324b1fab33d04d26f2a0329… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 24 09:43:06 2011 -0500 usp10: Add Arabic shaping test. --- dlls/usp10/tests/usp10.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index faa457c..ccc2630 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -551,6 +551,14 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}} }; + /* Arabic */ + static const WCHAR test_arabic[] = {0x0633,0x0644,0x0627,0x0645,0}; + static const shapeTest_char arabic_c[] = {{2,{0,0}},{1,{0,0}},{1,{0,0}},{0,{0,0}}}; + static const shapeTest_glyph arabic_g[] = { + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_ARABIC_NORMAL,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_ARABIC_SEEN,1,0,0,0,0},0}} }; + if (!pScriptItemizeOpenType || !pScriptShapeOpenType) { win_skip("ScriptShapeOpenType not available on this platform\n"); @@ -583,6 +591,7 @@ static void test_ScriptShapeOpenType(HDC hdc) test_shape_ok(hdc, test1, 4, &Control, &State, 0, 4, t1_c, t1_g); test_shape_ok(hdc, test2, 4, &Control, &State, 1, 4, t2_c, t2_g); + test_valid = find_font_for_range(hdc, "Microsoft Sans Serif", 11, test_hebrew[0], &hfont, &hfont_orig); if (hfont != NULL) { @@ -590,6 +599,14 @@ static void test_ScriptShapeOpenType(HDC hdc) SelectObject(hdc, hfont_orig); DeleteObject(hfont); } + + test_valid = find_font_for_range(hdc, "Microsoft Sans Serif", 13, test_arabic[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_arabic, 4, &Control, &State, 0, 3, arabic_c, arabic_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

Aric Stewart : usp10: Add Hebrew shaping test.
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: 670f27104a89972bc4df901e1d2cfaebb8c5c318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=670f27104a89972bc4df901e1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 24 09:43:00 2011 -0500 usp10: Add Hebrew shaping test. --- dlls/usp10/tests/usp10.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index adc63bb..faa457c 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -542,6 +542,14 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, {0,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}} }; + /* Hebrew */ + static const WCHAR test_hebrew[] = {0x05e9, 0x05dc, 0x05d5, 0x05dd,0}; + static const shapeTest_char hebrew_c[] = {{3,{0,0}},{2,{0,0}},{1,{0,0}},{0,{0,0}}}; + static const shapeTest_glyph hebrew_g[] = { + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}} }; if (!pScriptItemizeOpenType || !pScriptShapeOpenType) { @@ -575,6 +583,13 @@ static void test_ScriptShapeOpenType(HDC hdc) test_shape_ok(hdc, test1, 4, &Control, &State, 0, 4, t1_c, t1_g); test_shape_ok(hdc, test2, 4, &Control, &State, 1, 4, t2_c, t2_g); + test_valid = find_font_for_range(hdc, "Microsoft Sans Serif", 11, test_hebrew[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_hebrew, 4, &Control, &State, 0, 4, hebrew_c, hebrew_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

Aric Stewart : usp10/tests: Update test_ScriptShapeOpenType framework to shape in a given font.
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: 50a1ed1b94a6d6dcc446b5e2f09150ce0289c468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50a1ed1b94a6d6dcc446b5e2f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 24 09:41:59 2011 -0500 usp10/tests: Update test_ScriptShapeOpenType framework to shape in a given font. --- dlls/usp10/tests/usp10.c | 182 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 165 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50a1ed1b94a6d6dcc446b…

1 0

Jörg Höhle : include: Use SEGPTR for 16bit string pointers in MCI_*_PARMS16.
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: 985beb33f3827f9ee22e613d01abb941c4c54f26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=985beb33f3827f9ee22e613d0… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue May 24 08:35:45 2011 +0200 include: Use SEGPTR for 16bit string pointers in MCI_*_PARMS16. --- include/wine/mmsystem16.h | 46 ++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/include/wine/mmsystem16.h b/include/wine/mmsystem16.h index 245c779..d30a1ba 100644 --- a/include/wine/mmsystem16.h +++ b/include/wine/mmsystem16.h @@ -513,7 +513,7 @@ typedef struct { typedef struct { DWORD dwCallback; - LPCSTR lpfilename; + SEGPTR lpfilename; } MCI_LOAD_PARMS16, *LPMCI_LOAD_PARMS16; typedef struct { @@ -582,7 +582,7 @@ typedef struct { WORD wReserved1; WORD nCmdShow; WORD wReserved2; - LPCSTR lpstrText; + SEGPTR lpstrText; } MCI_ANIM_WINDOW_PARMS16, *LPMCI_ANIM_WINDOW_PARMS16; typedef struct { @@ -605,9 +605,9 @@ typedef struct { DWORD dwCallback; MCIDEVICEID16 wDeviceID; WORD wReserved0; - LPCSTR lpstrDeviceType; - LPCSTR lpstrElementName; - LPCSTR lpstrAlias; + SEGPTR lpstrDeviceType; + SEGPTR lpstrElementName; + SEGPTR lpstrAlias; DWORD dwStyle; HWND16 hWndParent; WORD wReserved1; @@ -634,13 +634,13 @@ typedef struct { typedef struct { DWORD dwCallback; - LPCSTR lpfilename; + SEGPTR lpfilename; RECT16 rc; } MCI_OVLY_SAVE_PARMS16, *LPMCI_OVLY_SAVE_PARMS16; typedef struct { DWORD dwCallback; - LPCSTR lpfilename; + SEGPTR lpfilename; RECT16 rc; } MCI_OVLY_LOAD_PARMS16, *LPMCI_OVLY_LOAD_PARMS16; @@ -652,7 +652,7 @@ typedef struct { typedef struct { DWORD dwCallback; - LPSTR lpstrFileName; + SEGPTR lpstrFileName; RECT16 rc; } MCI_DGV_CAPTURE_PARMS16, *LPMCI_DGV_CAPTURE_PARMS16; @@ -687,18 +687,18 @@ typedef MCI_DGV_RECT_PARMS16 MCI_DGV_FREEZE_PARMS16, * LPMCI_DGV_FREEZE_PARMS16; typedef struct { DWORD dwCallback; - LPSTR lpstrReturn; + SEGPTR lpstrReturn; DWORD dwRetSize; DWORD dwItem; } MCI_DGV_INFO_PARMS16, * LPMCI_DGV_INFO_PARMS16; typedef struct { DWORD dwCallback; - LPSTR lpstrReturn; + SEGPTR lpstrReturn; DWORD dwLength; DWORD dwNumber; DWORD dwItem; - LPSTR lpstrAlgorithm; + SEGPTR lpstrAlgorithm; } MCI_DGV_LIST_PARMS16, *LPMCI_DGV_LIST_PARMS16; typedef MCI_LOAD_PARMS16 MCI_DGV_LOAD_PARMS16 , * LPMCI_DGV_LOAD_PARMS16; @@ -707,9 +707,9 @@ typedef struct { DWORD dwCallback; UINT16 wDeviceID; UINT16 wReserved0; - LPSTR lpstrDeviceType; - LPSTR lpstrElementName; - LPSTR lpstrAlias; + SEGPTR lpstrDeviceType; + SEGPTR lpstrElementName; + SEGPTR lpstrAlias; DWORD dwStyle; HWND16 hWndParent; UINT16 wReserved1; @@ -728,8 +728,8 @@ typedef MCI_DGV_RECT_PARMS16 MCI_DGV_PUT_PARMS16, * LPMCI_DGV_PUT_PARMS16; typedef struct { DWORD dwCallback; DWORD dwItem; - LPSTR lpstrName; - DWORD lpstrAlgorithm; + SEGPTR lpstrName; + SEGPTR lpstrAlgorithm; DWORD dwHandle; } MCI_DGV_QUALITY_PARMS16, *LPMCI_DGV_QUALITY_PARMS16; @@ -744,19 +744,19 @@ typedef struct { typedef struct { DWORD dwCallback; - LPSTR lpstrPath; + SEGPTR lpstrPath; DWORD dwSize; } MCI_DGV_RESERVE_PARMS16, *LPMCI_DGV_RESERVE_PARMS16A; typedef struct { DWORD dwCallback; - LPSTR lpstrFileName; + SEGPTR lpstrFileName; RECT16 rc; } MCI_DGV_RESTORE_PARMS16, *LPMCI_DGV_RESTORE_PARMS16; typedef struct { DWORD dwCallback; - LPSTR lpstrFileName; + SEGPTR lpstrFileName; RECT16 rc; } MCI_DGV_SAVE_PARMS16, *LPMCI_DGV_SAVE_PARMS16; @@ -765,8 +765,8 @@ typedef struct { DWORD dwItem; DWORD dwValue; DWORD dwOver; - LPSTR lpstrAlgorithm; - LPSTR lpstrQuality; + SEGPTR lpstrAlgorithm; + SEGPTR lpstrQuality; } MCI_DGV_SETAUDIO_PARMS16, *LPMCI_DGV_SETAUDIO_PARMS16; typedef struct { @@ -774,8 +774,8 @@ typedef struct { DWORD dwItem; DWORD dwValue; DWORD dwOver; - LPSTR lpstrAlgorithm; - LPSTR lpstrQuality; + SEGPTR lpstrAlgorithm; + SEGPTR lpstrQuality; DWORD dwSourceNumber; } MCI_DGV_SETVIDEO_PARMS16, *LPMCI_DGV_SETVIDEO_PARMS16;

1 0

Francois Gouget : include: Add some __RPC_XXX macros to help compile code using midl-generated headers .
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: 96f33b94bdf61b20e78f99529689e8d6fa66a749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96f33b94bdf61b20e78f99529… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 24 13:10:09 2011 +0200 include: Add some __RPC_XXX macros to help compile code using midl-generated headers. --- include/Makefile.in | 1 + include/rpcndr.h | 1 + include/rpcsal.h | 167 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 169 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 9a11ff1..1db5e81 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -447,6 +447,7 @@ SRCDIR_INCLUDES = \ rpcndr.h \ rpcnterr.h \ rpcproxy.h \ + rpcsal.h \ rstbas.idl \ rstinf.idl \ rstloc.idl \ diff --git a/include/rpcndr.h b/include/rpcndr.h index cd93d8e..1754f5e 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -24,6 +24,7 @@ #define __WINE_RPCNDR_H #include <basetsd.h> +#include <rpcsal.h> #ifdef __cplusplus extern "C" { diff --git a/include/rpcsal.h b/include/rpcsal.h new file mode 100644 index 0000000..ffa114a --- /dev/null +++ b/include/rpcsal.h @@ -0,0 +1,167 @@ +/* + * Copyright (C) 2011 Francois Gouget + * + * 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 + */ + + +#ifndef __RPCSAL_H_VERSION__ +# define __RPCSAL_H_VERSION__ 100 +#endif + +#define __RPC__deref_in +#define __RPC__deref_in_opt +#define __RPC__deref_in_string +#define __RPC__deref_in_opt_string +#define __RPC__deref_in_ecount(size) +#define __RPC__deref_in_ecount_opt(size) +#define __RPC__deref_in_ecount_opt_string(size) +#define __RPC__deref_in_ecount_full(size) +#define __RPC__deref_in_ecount_full_opt(size) +#define __RPC__deref_in_ecount_full_string(size) +#define __RPC__deref_in_ecount_full_opt_string(size) +#define __RPC__deref_in_ecount_part(size, length) +#define __RPC__deref_in_ecount_part_opt(size, length) +#define __RPC__deref_in_xcount(size) +#define __RPC__deref_in_xcount_opt(size) +#define __RPC__deref_in_xcount_opt_string(size) +#define __RPC__deref_in_xcount_full(size) +#define __RPC__deref_in_xcount_full_opt(size) +#define __RPC__deref_in_xcount_full_string(size) +#define __RPC__deref_in_xcount_full_opt_string(size) +#define __RPC__deref_in_xcount_part(size, length) +#define __RPC__deref_in_xcount_part_opt(size, length) + +#define __RPC__deref_inout +#define __RPC__deref_inout_opt +#define __RPC__deref_inout_string +#define __RPC__deref_inout_opt_string +#define __RPC__deref_inout_ecount_opt(size) +#define __RPC__deref_inout_ecount_full(size) +#define __RPC__deref_inout_ecount_full_opt(size) +#define __RPC__deref_inout_ecount_full_string(size) +#define __RPC__deref_inout_ecount_full_opt_string(size) +#define __RPC__deref_inout_ecount_part_opt(size, length) +#define __RPC__deref_inout_xcount_opt(size) +#define __RPC__deref_inout_xcount_full(size) +#define __RPC__deref_inout_xcount_full_opt(size) +#define __RPC__deref_inout_xcount_full_string(size) +#define __RPC__deref_inout_xcount_full_opt_string(size) +#define __RPC__deref_inout_xcount_part_opt(size, length) + +#define __RPC__deref_out +#define __RPC__deref_out_opt +#define __RPC__deref_out_string +#define __RPC__deref_out_opt_string +#define __RPC__deref_out_ecount(size) +#define __RPC__deref_out_ecount_opt(size) +#define __RPC__deref_out_ecount_full(size) +#define __RPC__deref_out_ecount_full_opt(size) +#define __RPC__deref_out_ecount_full_string(size) +#define __RPC__deref_out_ecount_full_opt_string(size) +#define __RPC__deref_out_ecount_part(size, length) +#define __RPC__deref_out_ecount_part_opt(size, length) +#define __RPC__deref_out_xcount(size) +#define __RPC__deref_out_xcount_opt(size) +#define __RPC__deref_out_xcount_full(size) +#define __RPC__deref_out_xcount_full_opt(size) +#define __RPC__deref_out_xcount_full_string(size) +#define __RPC__deref_out_xcount_full_opt_string(size) +#define __RPC__deref_out_xcount_part(size, length) +#define __RPC__deref_out_xcount_part_opt(size, length) + +#define __RPC__deref_opt_in +#define __RPC__deref_opt_in_opt +#define __RPC__deref_opt_in_string +#define __RPC__deref_opt_in_opt_string + +#define __RPC__deref_opt_inout +#define __RPC__deref_opt_inout_opt +#define __RPC__deref_opt_inout_string +#define __RPC__deref_opt_inout_opt_string +#define __RPC__deref_opt_inout_ecount(size) +#define __RPC__deref_opt_inout_ecount_opt(size) +#define __RPC__deref_opt_inout_ecount_full(size) +#define __RPC__deref_opt_inout_ecount_full_opt(size) +#define __RPC__deref_opt_inout_ecount_full_string(size) +#define __RPC__deref_opt_inout_ecount_full_opt_string(size) +#define __RPC__deref_opt_inout_ecount_part(size, length) +#define __RPC__deref_opt_inout_ecount_part_opt(size, length) +#define __RPC__deref_opt_inout_xcount(size) +#define __RPC__deref_opt_inout_xcount_opt(size) +#define __RPC__deref_opt_inout_xcount_full(size) +#define __RPC__deref_opt_inout_xcount_full_opt(size) +#define __RPC__deref_opt_inout_xcount_full_string(size) +#define __RPC__deref_opt_inout_xcount_full_opt_string(size) +#define __RPC__deref_opt_inout_xcount_part(size, length) +#define __RPC__deref_opt_inout_xcount_part_opt(size, length) + +#define __RPC__in +#define __RPC__in_opt +#define __RPC__in_string +#define __RPC__in_opt_string +#define __RPC__in_ecount(size) +#define __RPC__in_ecount_opt(size) +#define __RPC__in_ecount_full(size) +#define __RPC__in_ecount_full_opt(size) +#define __RPC__in_ecount_full_string(size) +#define __RPC__in_ecount_full_opt_string(size) +#define __RPC__in_ecount_part(size, length) +#define __RPC__in_ecount_part_opt(size, length) +#define __RPC__in_xcount(size) +#define __RPC__in_xcount_opt(size) +#define __RPC__in_xcount_full(size) +#define __RPC__in_xcount_full_opt(size) +#define __RPC__in_xcount_full_string(size) +#define __RPC__in_xcount_full_opt_string(size) +#define __RPC__in_xcount_part(size, length) +#define __RPC__in_xcount_part_opt(size, length) + +#define __RPC__inout +#define __RPC__inout_opt +#define __RPC__inout_string +#define __RPC__inout_opt_string +#define __RPC__opt_inout +#define __RPC__inout_ecount(size) +#define __RPC__inout_ecount_opt(size) +#define __RPC__inout_ecount_full(size) +#define __RPC__inout_ecount_full_opt(size) +#define __RPC__inout_ecount_full_string(size) +#define __RPC__inout_ecount_full_opt_string(size) +#define __RPC__inout_ecount_part(size, length) +#define __RPC__inout_ecount_part_opt(size, length) +#define __RPC__inout_xcount(size) +#define __RPC__inout_xcount_opt(size) +#define __RPC__inout_xcount_full(size) +#define __RPC__inout_xcount_full_opt(size) +#define __RPC__inout_xcount_full_string(size) +#define __RPC__inout_xcount_full_opt_string(size) +#define __RPC__inout_xcount_part(size, length) +#define __RPC__inout_xcount_part_opt(size, length) + +#define __RPC__out +#define __RPC__out_ecount(size) +#define __RPC__out_ecount_full(size) +#define __RPC__out_ecount_full_string(size) +#define __RPC__out_ecount_part(size, length) +#define __RPC__out_xcount(size) +#define __RPC__out_xcount_full(size) +#define __RPC__out_xcount_full_string(size) +#define __RPC__out_xcount_part(size, length) + +#define __RPC_full_pointer +#define __RPC_ref_pointer +#define __RPC_string +#define __RPC_unique_pointer

1 0

Francois Gouget : include: Add a set of parameter documentation macros to help compile windows applications .
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: 37978baa4a61f0339caadd739712e230f2a861b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37978baa4a61f0339caadd739… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 24 13:09:59 2011 +0200 include: Add a set of parameter documentation macros to help compile windows applications. --- include/dbghelp.h | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/imagehlp.h | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+), 0 deletions(-) diff --git a/include/dbghelp.h b/include/dbghelp.h index 34805f4..483ef29 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -21,6 +21,66 @@ #ifndef __WINE_DBGHELP_H #define __WINE_DBGHELP_H +/* A set of documentation macros (see also imagehlp.h) */ +#ifndef __deref_out +# define __deref_out +#endif +#ifndef __deref_out_opt +# define __deref_out_opt +#endif +#ifndef __deref_opt_out +# define __deref_opt_out +#endif +#ifndef __in +# define __in +#endif +#ifndef __in_opt +# define __in_opt +#endif +#ifndef __in_bcount +# define __in_bcount(x) +#endif +#ifndef __in_bcount_opt +# define __in_bcount_opt(x) +#endif +#ifndef __in_ecount +# define __in_ecount(x) +#endif +#ifndef __inout +# define __inout +#endif +#ifndef __inout_opt +# define __inout_opt +#endif +#ifndef __inout_bcount +# define __inout_bcount(x) +#endif +#ifndef __inout_ecount +# define __inout_ecount(x) +#endif +#ifndef __out +# define __out +#endif +#ifndef __out_opt +# define __out_opt +#endif +#ifndef __out_bcount +# define __out_bcount(x) +#endif +#ifndef __out_bcount_opt +# define __out_bcount_opt(x) +#endif +#ifndef __out_ecount +# define __out_ecount(x) +#endif +#ifndef __out_ecount_opt +# define __out_ecount_opt(x) +#endif +#ifndef __out_xcount +# define __out_xcount(x) +#endif + + #ifdef __cplusplus extern "C" { #endif /* defined(__cplusplus) */ diff --git a/include/imagehlp.h b/include/imagehlp.h index f72f1ce..8c8250d 100644 --- a/include/imagehlp.h +++ b/include/imagehlp.h @@ -23,6 +23,66 @@ #include <wintrust.h> +/* A set of documentation macros (see also dbghelp.h) */ +#ifndef __deref_out +# define __deref_out +#endif +#ifndef __deref_out_opt +# define __deref_out_opt +#endif +#ifndef __deref_opt_out +# define __deref_opt_out +#endif +#ifndef __in +# define __in +#endif +#ifndef __in_opt +# define __in_opt +#endif +#ifndef __in_bcount +# define __in_bcount(x) +#endif +#ifndef __in_bcount_opt +# define __in_bcount_opt(x) +#endif +#ifndef __in_ecount +# define __in_ecount(x) +#endif +#ifndef __inout +# define __inout +#endif +#ifndef __inout_opt +# define __inout_opt +#endif +#ifndef __inout_bcount +# define __inout_bcount(x) +#endif +#ifndef __inout_ecount +# define __inout_ecount(x) +#endif +#ifndef __out +# define __out +#endif +#ifndef __out_opt +# define __out_opt +#endif +#ifndef __out_bcount +# define __out_bcount(x) +#endif +#ifndef __out_bcount_opt +# define __out_bcount_opt(x) +#endif +#ifndef __out_ecount +# define __out_ecount(x) +#endif +#ifndef __out_ecount_opt +# define __out_ecount_opt(x) +#endif +#ifndef __out_xcount +# define __out_xcount(x) +#endif + + #ifdef __cplusplus extern "C" { #endif /* defined(__cplusplus) */

1 0

Dan Kegel : cmd: del /a: test deleting readonly files, with fix.
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: ff1e7038b2755161d3931b019ad6f6af23970d1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff1e7038b2755161d3931b019… Author: Dan Kegel <dank(a)kegel.com> Date: Sun May 22 08:27:38 2011 -0700 cmd: del /a: test deleting readonly files, with fix. --- programs/cmd/builtins.c | 5 +++-- programs/cmd/tests/test_builtins.cmd | 16 ++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 4 ++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7a6ae72..c8baef1 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -712,9 +712,10 @@ BOOL WCMD_delete (WCHAR *command, BOOL expectDir) { /* Only proceed if ok to */ if (ok) { - /* If file is read only, and /F supplied, delete it */ + /* If file is read only, and /A:r or /F supplied, delete it */ if (fd.dwFileAttributes & FILE_ATTRIBUTE_READONLY && - strstrW (quals, parmF) != NULL) { + ((wanted_attrs & FILE_ATTRIBUTE_READONLY) || + strstrW (quals, parmF) != NULL)) { SetFileAttributesW(fpath, fd.dwFileAttributes & ~FILE_ATTRIBUTE_READONLY); } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 2b117e4..62dbc6c 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -78,6 +78,22 @@ if /i not foo==FOO echo if /i seems to be broken if /I foo==FOO echo if /I seems to work if /I not foo==FOO echo if /I seems to be broken +echo -----------Testing del /a----------- +del /f/q *.test > nul +echo r > r.test +attrib +r r.test +echo not-r > not-r.test + +if not exist not-r.test echo not-r.test not found before delete, bad +del /a:-r *.test +if not exist not-r.test echo not-r.test not found after delete, good + +if not exist r.test echo r.test not found before delete, bad +if exist r.test echo r.test found before delete, good +del /a:r *.test +if not exist r.test echo r.test not found after delete, good +if exist r.test echo r.test found after delete, bad + echo -----------Testing GOTO----------- if a==a goto dest1 :dest1 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index e4644d3..0dcd926 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -78,6 +78,10 @@ Testing case sensitivity with and without /i option if seems to default to case sensitivity if /i seems to work if /I seems to work +-----------Testing del /a----------- +not-r.test not found after delete, good +r.test found before delete, good +r.test not found after delete, good -----------Testing GOTO----------- goto with no leading space worked goto with a leading space worked

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2011