April 2016 - Wine-Commits - list.winehq.org

Jean-Christophe Cardot : winhlp32: Rework and rename HLPFILE_HalfPointsToTwips.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: master Commit: a01c003007f6b2a7e53f6d726384d584710f1966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a01c003007f6b2a7e53f6d726… Author: Jean-Christophe Cardot <wine(a)cardot.net> Date: Sun Apr 10 22:06:11 2016 +0200 winhlp32: Rework and rename HLPFILE_HalfPointsToTwips. HLPFILE_HalfPointsToTwips was performing a useless transformation of the RTF measures, using a hardcoded 72 DPI. As winhlp32 makes use of the richedit component, it is counter productive to transform the measures, as this is taken care of by richedit himself. Signed-off-by: Jean-Christophe Cardot <wine(a)cardot.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winhlp32/hlpfile.c | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 141af62..5e61bcf 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -1199,16 +1199,9 @@ static HLPFILE_LINK* HLPFILE_AllocLink(struct RtfData* rd, int cookie, return link; } -static unsigned HLPFILE_HalfPointsToTwips(unsigned pts) +static unsigned HLPFILE_HalfPointsScale(HLPFILE_PAGE* page, unsigned pts) { - static unsigned logPxY; - if (!logPxY) - { - HDC hdc = GetDC(NULL); - logPxY = GetDeviceCaps(hdc, LOGPIXELSY); - ReleaseDC(NULL, hdc); - } - return MulDiv(pts, 72 * 10, logPxY); + return pts * page->file->scale - page->file->rounderr; } /*********************************************************************** @@ -1289,10 +1282,10 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, { int pos; sprintf(tmp, "\\trgaph%d\\trleft%d", - HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 6), table_width, 32767)), - HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 0), table_width, 32767))); + HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 6), table_width, 32767)), + HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 0), table_width, 32767))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; - pos = HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 6) / 2, table_width, 32767)); + pos = HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 6) / 2, table_width, 32767)); for (nc = 0; nc < ncol; nc++) { WINE_TRACE("column(%d/%d) gap=%d width=%d\n", @@ -1300,7 +1293,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, GET_SHORT(format, nc*4+2)); pos += GET_SHORT(format, nc * 4) + GET_SHORT(format, nc * 4 + 2); sprintf(tmp, "\\cellx%d", - HLPFILE_HalfPointsToTwips(MulDiv(pos, table_width, 32767))); + HLPFILE_HalfPointsScale(page, MulDiv(pos, table_width, 32767))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } } @@ -1309,8 +1302,8 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, WINE_TRACE("column(0/%d) gap=%d width=%d\n", ncol, GET_SHORT(format, 0), GET_SHORT(format, 2)); sprintf(tmp, "\\trleft%d\\cellx%d ", - HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 0), table_width, 32767)), - HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 0) + GET_SHORT(format, 2), + HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 0), table_width, 32767)), + HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 0) + GET_SHORT(format, 2), table_width, 32767))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } @@ -1337,32 +1330,32 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, if (bits & 0x0001) fetch_long(&format); if (bits & 0x0002) { - sprintf(tmp, "\\sb%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + sprintf(tmp, "\\sb%d", HLPFILE_HalfPointsScale(page, fetch_short(&format))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } if (bits & 0x0004) { - sprintf(tmp, "\\sa%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + sprintf(tmp, "\\sa%d", HLPFILE_HalfPointsScale(page, fetch_short(&format))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } if (bits & 0x0008) { - sprintf(tmp, "\\sl%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + sprintf(tmp, "\\sl%d", HLPFILE_HalfPointsScale(page, fetch_short(&format))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } if (bits & 0x0010) { - sprintf(tmp, "\\li%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + sprintf(tmp, "\\li%d", HLPFILE_HalfPointsScale(page, fetch_short(&format))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } if (bits & 0x0020) { - sprintf(tmp, "\\ri%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + sprintf(tmp, "\\ri%d", HLPFILE_HalfPointsScale(page, fetch_short(&format))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } if (bits & 0x0040) { - sprintf(tmp, "\\fi%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + sprintf(tmp, "\\fi%d", HLPFILE_HalfPointsScale(page, fetch_short(&format))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } if (bits & 0x0100) @@ -1383,7 +1376,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, w = GET_SHORT(format, 0); format += 2; if (w) { - sprintf(tmp, "\\brdrw%d", HLPFILE_HalfPointsToTwips(w)); + sprintf(tmp, "\\brdrw%d", HLPFILE_HalfPointsScale(page, w)); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } } @@ -1407,7 +1400,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, } /* FIXME: do kind */ sprintf(tmp, "%s\\tx%d", - kind, HLPFILE_HalfPointsToTwips(tab & 0x3FFF)); + kind, HLPFILE_HalfPointsScale(page, tab & 0x3FFF)); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } }

1 0

Jean-Christophe Cardot : winhlp32: Add some trace calls.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: master Commit: ae56f3d093c84b47248be6a66cebd58c0bb59668 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae56f3d093c84b47248be6a66… Author: Jean-Christophe Cardot <wine(a)cardot.net> Date: Sun Apr 10 22:06:08 2016 +0200 winhlp32: Add some trace calls. Signed-off-by: Jean-Christophe Cardot <wine(a)cardot.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winhlp32/hlpfile.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 8a68af5..4c898e9 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -693,6 +693,7 @@ static BOOL HLPFILE_RtfAddRawString(struct RtfData* rd, const char* str, size_t static BOOL HLPFILE_RtfAddControl(struct RtfData* rd, const char* str) { + WINE_TRACE("%s\n", debugstr_a(str)); if (*str == '\\' || *str == '{') rd->in_text = FALSE; else if (*str == '}') rd->in_text = TRUE; return HLPFILE_RtfAddRawString(rd, str, strlen(str)); @@ -1258,6 +1259,8 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, format = buf + 0x15; format_end = buf + GET_UINT(buf, 0x10); + WINE_TRACE("Record type (buf[0x14]) = 0x%x\n", buf[0x14]); + if (buf[0x14] == HLP_DISPLAY || buf[0x14] == HLP_TABLE) { fetch_long(&format); @@ -1440,13 +1443,13 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, /* else: null text, keep on storing attributes */ text += textsize + 1; + WINE_TRACE("format=%02x\n", *format); if (*format == 0xff) { format++; break; } - WINE_TRACE("format=%02x\n", *format); switch (*format) { case 0x20:

1 0

Sergei Bolotov : widl: Support for toggling and checking status for warnings, support for warning 2368.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: master Commit: 376daa91d832ec9e4c1d399957b35ee98c761ae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=376daa91d832ec9e4c1d39995… Author: Sergei Bolotov <bolotov.s.s(a)yandex.ru> Date: Tue Mar 29 23:06:45 2016 +0300 widl: Support for toggling and checking status for warnings, support for warning 2368. Signed-off-by: Sergei Bolotov <bolotov.s.s(a)yandex.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/test_tlb.idl | 2 ++ tools/widl/parser.h | 3 ++ tools/widl/parser.l | 60 ++++++++++++++++++++++++++++++++++++++++ tools/widl/parser.y | 9 +++++- tools/widl/write_msft.c | 3 +- 5 files changed, 75 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/test_tlb.idl b/dlls/oleaut32/tests/test_tlb.idl index 53729dc..ad35af4 100644 --- a/dlls/oleaut32/tests/test_tlb.idl +++ b/dlls/oleaut32/tests/test_tlb.idl @@ -24,6 +24,8 @@ import "oaidl.idl"; /* needed by widl */ +midl_pragma warning ( disable : 2368 ) + [uuid(8b05fe77-4a6c-4133-b9cd-8f81747af784)] library Test { diff --git a/tools/widl/parser.h b/tools/widl/parser.h index 1bcc3c1..f48cacc 100644 --- a/tools/widl/parser.h +++ b/tools/widl/parser.h @@ -45,6 +45,9 @@ void pop_import(void); int is_type(const char *name); +int do_warning(char *toggle, warning_list_t *wnum); +int is_warning_enabled(int warning); + extern char *temp_name; #endif diff --git a/tools/widl/parser.l b/tools/widl/parser.l index c0b2fcd..6520ce7 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -76,6 +76,8 @@ static int cbufalloc = 0; static int kw_token(const char *kw); static int attr_token(const char *kw); +static warning_list_t *disabled_warnings = NULL; + #define MAX_IMPORT_DEPTH 10 struct { YY_BUFFER_STATE state; @@ -556,3 +558,61 @@ void abort_import(void) for (ptr=0; ptr<import_stack_ptr; ptr++) unlink(import_stack[ptr].temp_name); } + +static void warning_disable(int warning) +{ + warning_t *warning_entry; + LIST_FOR_EACH_ENTRY(warning_entry, disabled_warnings, warning_t, entry) + if(warning_entry->num == warning) + return; + warning_entry = xmalloc( sizeof(*warning_entry) ); + warning_entry->num = warning; + list_add_tail(disabled_warnings, &warning_entry->entry); +} + +static void warning_enable(int warning) +{ + warning_t *warning_entry; + LIST_FOR_EACH_ENTRY(warning_entry, disabled_warnings, warning_t, entry) + if(warning_entry->num == warning) + { + list_remove(&warning_entry->entry); + free(warning_entry); + break; + } +} + +int do_warning(char *toggle, warning_list_t *wnum) +{ + warning_t *warning, *next; + int ret = 1; + if(!disabled_warnings) + { + disabled_warnings = xmalloc( sizeof(*disabled_warnings) ); + list_init( disabled_warnings ); + } + + if(!strcmp(toggle, "disable")) + LIST_FOR_EACH_ENTRY(warning, wnum, warning_t, entry) + warning_disable(warning->num); + else if(!strcmp(toggle, "enable")) + LIST_FOR_EACH_ENTRY(warning, wnum, warning_t, entry) + warning_enable(warning->num); + else + ret = 0; + + LIST_FOR_EACH_ENTRY_SAFE(warning, next, wnum, warning_t, entry) + free(warning); + return ret; +} + +int is_warning_enabled(int warning) +{ + warning_t *warning_entry; + if(!disabled_warnings) + return 1; + LIST_FOR_EACH_ENTRY(warning_entry, disabled_warnings, warning_t, entry) + if(warning_entry->num == warning) + return 0; + return 1; +} diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 3131e0d..6551ea2 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -381,7 +381,14 @@ statement: | pragma_warning { $$ = NULL; } ; -pragma_warning: tPRAGMA_WARNING '(' aIDENTIFIER ':' warnings ')' { $$ = NULL; } +pragma_warning: tPRAGMA_WARNING '(' aIDENTIFIER ':' warnings ')' + { + int result; + $$ = NULL; + result = do_warning($3, $5); + if(!result) + error_loc("expected \"disable\" or \"enable\"\n"); + } ; warnings: diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 8b65ead..137bb2d 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -51,6 +51,7 @@ #include "header.h" #include "hash.h" #include "typetree.h" +#include "parser.h" enum MSFT_segment_index { MSFT_SEG_TYPEINFO = 0, /* type information */ @@ -504,7 +505,7 @@ static int ctl2_alloc_guid( offset = ctl2_find_guid(typelib, hash_key, &guid->guid); if (offset != -1) { - if (pedantic) + if (is_warning_enabled(2368)) warning("duplicate uuid {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", guid->guid.Data1, guid->guid.Data2, guid->guid.Data3, guid->guid.Data4[0], guid->guid.Data4[1], guid->guid.Data4[2], guid->guid.Data4[3],

1 0

Sergei Bolotov : widl: Handle "midl_pragma warning" statement in parser.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: master Commit: 646dfe746d0842c882df33fb0f3ebedc2d6095bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=646dfe746d0842c882df33fb0… Author: Sergei Bolotov <bolotov.s.s(a)yandex.ru> Date: Tue Mar 29 23:06:44 2016 +0300 widl: Handle "midl_pragma warning" statement in parser. Signed-off-by: Sergei Bolotov <bolotov.s.s(a)yandex.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 1 + tools/widl/parser.y | 31 ++++++++++++++++++++++++++++++- tools/widl/widltypes.h | 7 +++++++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 5c2dcab..c0b2fcd 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -164,6 +164,7 @@ UUID *parse_uuid(const char *u) yy_pop_state(); } <PP_PRAGMA>[^\n]* parser_lval.str = xstrdup(yytext); yy_pop_state(); return aPRAGMA; +<INITIAL>^{ws}*midl_pragma{ws}+warning return tPRAGMA_WARNING; <INITIAL,ATTR>\" yy_push_state(QUOTE); cbufidx = 0; <QUOTE>\" { yy_pop_state(); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 7de7567..3131e0d 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -83,6 +83,7 @@ static declarator_t *make_declarator(var_t *var); static type_t *make_safearray(type_t *type); static typelib_t *make_library(const char *name, const attr_list_t *attrs); static type_t *append_ptrchain_type(type_t *ptrchain, type_t *type); +static warning_list_t *append_warning(warning_list_t *, int); static type_t *reg_typedefs(decl_spec_t *decl_spec, var_list_t *names, attr_list_t *attrs); static type_t *find_type_or_error(const char *name, int t); @@ -148,6 +149,8 @@ static struct namespace *current_namespace = &global_namespace; declarator_list_t *declarator_list; statement_t *statement; statement_list_t *stmt_list; + warning_t *warning; + warning_list_t *warning_list; ifref_t *ifref; ifref_list_t *ifref_list; char *str; @@ -224,6 +227,7 @@ static struct namespace *current_namespace = &global_namespace; %token tOUT %token tPARTIALIGNORE tPASCAL %token tPOINTERDEFAULT +%token tPRAGMA_WARNING %token tPROGID tPROPERTIES %token tPROPGET tPROPPUT tPROPPUTREF %token tPROXY tPTR @@ -291,8 +295,9 @@ static struct namespace *current_namespace = &global_namespace; %type <uuid> uuid_string %type <import> import_start %type <typelib> library_start librarydef -%type <statement> statement typedef +%type <statement> statement typedef pragma_warning %type <stmt_list> gbl_statements imp_statements int_statements +%type <warning_list> warnings %left ',' %right '?' ':' @@ -373,6 +378,15 @@ statement: | import { $$ = make_statement_import($1); } | typedef ';' { $$ = $1; } | aPRAGMA { $$ = make_statement_pragma($1); } + | pragma_warning { $$ = NULL; } + ; + +pragma_warning: tPRAGMA_WARNING '(' aIDENTIFIER ':' warnings ')' { $$ = NULL; } + ; + +warnings: + aNUM { $$ = append_warning(NULL, $1); } + | warnings aNUM { $$ = append_warning($1, $2); } ; typedecl: @@ -1413,6 +1427,21 @@ static type_t *append_ptrchain_type(type_t *ptrchain, type_t *type) return ptrchain; } +static warning_list_t *append_warning(warning_list_t *list, int num) +{ + warning_t *entry; + + if(!list) + { + list = xmalloc( sizeof(*list) ); + list_init( list ); + } + entry = xmalloc( sizeof(*entry) ); + entry->num = num; + list_add_tail( list, &entry->entry ); + return list; +} + static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const declarator_t *decl, int top) { diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 4d51312..1f4a9dd 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -51,6 +51,7 @@ typedef struct _user_type_t context_handle_t; typedef struct _user_type_t generic_handle_t; typedef struct _type_list_t type_list_t; typedef struct _statement_t statement_t; +typedef struct _warning_t warning_t; typedef struct list attr_list_t; typedef struct list str_list_t; @@ -63,6 +64,7 @@ typedef struct list user_type_list_t; typedef struct list context_handle_list_t; typedef struct list generic_handle_list_t; typedef struct list statement_list_t; +typedef struct list warning_list_t; enum attr_type { @@ -538,6 +540,11 @@ struct _statement_t { } u; }; +struct _warning_t { + int num; + struct list entry; +}; + typedef enum { SYS_WIN16, SYS_WIN32,

1 0

Austin English : wimgapi: Add WIMGetMountedImages stub.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: master Commit: dc0377aabaf8457fb436870bf7bc00df7dcd1bbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc0377aabaf8457fb436870bf… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Mar 24 15:25:21 2016 -0500 wimgapi: Add WIMGetMountedImages stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wimgapi/main.c | 8 ++++++++ dlls/wimgapi/wimgapi.spec | 2 +- include/Makefile.in | 1 + include/wimgapi.h | 38 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/wimgapi/main.c b/dlls/wimgapi/main.c index d7c3bab..a7321fa 100644 --- a/dlls/wimgapi/main.c +++ b/dlls/wimgapi/main.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "wine/debug.h" +#include "wimgapi.h" WINE_DEFAULT_DEBUG_CHANNEL(wimgapi); @@ -50,3 +51,10 @@ DWORD WINAPI WIMRegisterMessageCallback(HANDLE wim, FARPROC callback, PVOID data FIXME("(%p %p %p) stub\n", wim, callback, data); return 0; } + +BOOL WINAPI WIMGetMountedImages(PWIM_MOUNT_LIST list, DWORD *length) +{ + FIXME("(%p %p) stub\n", list, length); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} diff --git a/dlls/wimgapi/wimgapi.spec b/dlls/wimgapi/wimgapi.spec index 7464a5a..bb79d5b 100644 --- a/dlls/wimgapi/wimgapi.spec +++ b/dlls/wimgapi/wimgapi.spec @@ -21,7 +21,7 @@ @ stub WIMGetMountedImageHandle @ stub WIMGetMountedImageInfo @ stub WIMGetMountedImageInfoFromFile -@ stub WIMGetMountedImages +@ stdcall WIMGetMountedImages(ptr ptr) @ stub WIMInitFileIOCallbacks @ stub WIMLoadImage @ stub WIMMountImage diff --git a/include/Makefile.in b/include/Makefile.in index ac10691..fb1c195 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -617,6 +617,7 @@ HEADER_SRCS = \ wfext.h \ wia.h \ wiadef.h \ + wimgapi.h \ winbase.h \ wincon.h \ wincred.h \ diff --git a/include/wimgapi.h b/include/wimgapi.h new file mode 100644 index 0000000..e517b57 --- /dev/null +++ b/include/wimgapi.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2015 Austin English + * + * 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 _WIMGAPI_H_ +#define _WIMGAPI_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct _WIM_MOUNT_LIST +{ + WCHAR WimPath[MAX_PATH]; + WCHAR MountPath[MAX_PATH]; + DWORD ImageIndex; + BOOL MountedForRW; +} WIM_MOUNT_LIST, *PWIM_MOUNT_LIST, *LPWIM_MOUNT_LIST; + +#ifdef __cplusplus +} +#endif + +#endif /* _WIMGAPI_H_ */

1 0

Nikolay Sivov : ieframe: Convert to integer without additional string buffer allocation.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: master Commit: b771a4a488f4a27ffe6dedabaa9447160a611a03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b771a4a488f4a27ffe6dedaba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 11 22:14:55 2016 +0300 ieframe: Convert to integer without additional string buffer allocation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/intshcut.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index 385b059..563cfc2 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -514,9 +514,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam int iconindex; PROPSPEC ps; PROPVARIANT pv; - char *iconindexastring = co_strdupWtoA(iconindexstring); - sscanf(iconindexastring, "%d", &iconindex); - CoTaskMemFree(iconindexastring); + iconindex = strtolW(iconindexstring, NULL, 10); ps.ulKind = PRSPEC_PROPID; ps.u.propid = PID_IS_ICONINDEX; pv.vt = VT_I4;

1 0

Bernhard Übelacker : ntoskrnl.exe: Make IoAllocateIrp not crash on negative values.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: master Commit: 64aec5d8dbae329958b9b677d3289de78142e289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64aec5d8dbae329958b9b677d… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Tue Mar 29 22:13:16 2016 +0200 ntoskrnl.exe: Make IoAllocateIrp not crash on negative values. Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 0e87b82..a52b5df 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -592,15 +592,20 @@ PIRP WINAPI IoAllocateIrp( CCHAR stack_size, BOOLEAN charge_quota ) { SIZE_T size; PIRP irp; + CCHAR loc_count = stack_size; TRACE( "%d, %d\n", stack_size, charge_quota ); - size = sizeof(IRP) + stack_size * sizeof(IO_STACK_LOCATION); + if (loc_count < 8 && loc_count != 1) + loc_count = 8; + + size = sizeof(IRP) + loc_count * sizeof(IO_STACK_LOCATION); irp = ExAllocatePool( NonPagedPool, size ); if (irp == NULL) return NULL; IoInitializeIrp( irp, size, stack_size ); - irp->AllocationFlags = IRP_ALLOCATED_FIXED_SIZE; + if (stack_size >= 1 && stack_size <= 8) + irp->AllocationFlags = IRP_ALLOCATED_FIXED_SIZE; if (charge_quota) irp->AllocationFlags |= IRP_LOOKASIDE_ALLOCATION; return irp;

1 0

Aaryaman Vasishta : d3drm/tests: Add tests for IDirect3DRMObject::Add/ DeleteDestroyCallback.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: master Commit: e62475b0f1edd6959c3971ff8ebdef965b471bbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e62475b0f1edd6959c3971ff8… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Apr 11 23:52:32 2016 +0530 d3drm/tests: Add tests for IDirect3DRMObject::Add/DeleteDestroyCallback. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 240 ++++++++++++++++++++++------------------------- 1 file changed, 114 insertions(+), 126 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e62475b0f1edd6959c397…

1 0

Huw Davies : gdi32: Use abs() on an integer argument to avoid a clang warning.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: master Commit: bb4ead4c7cc7b285b16bb3432785f23736e5fb67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb4ead4c7cc7b285b16bb3432… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 12 12:33:13 2016 +0100 gdi32: Use abs() on an integer argument to avoid a clang warning. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/painting.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index f978001..32b6183 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -303,8 +303,8 @@ BOOL WINAPI ArcTo( HDC hdc, INT xstart, INT ystart, INT xend, INT yend ) { - double width = fabs(right-left), - height = fabs(bottom-top), + double width = abs( right - left ), + height = abs( bottom - top ), xradius = width/2, yradius = height/2, xcenter = right > left ? left+xradius : right+xradius,

1 0

Nikolay Sivov : ieframe: Handle storage opening failure in shortcut Load() .
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: master Commit: 4302281d51ef8e6bc41be42f7df04d8510d17545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4302281d51ef8e6bc41be42f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 11 22:14:56 2016 +0300 ieframe: Handle storage opening failure in shortcut Load(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/intshcut.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index 563cfc2..2376b1b 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -483,6 +483,15 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam return hr; } + hr = IPropertySetStorage_Open(This->property_set_storage, &FMTID_Intshcut, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &pPropStg); + if (FAILED(hr)) + { + CoTaskMemFree(filename); + CoTaskMemFree(url); + return hr; + } + CoTaskMemFree(This->currentFile); This->currentFile = filename; CoTaskMemFree(This->url); @@ -492,8 +501,6 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam /* Now we're going to read in the iconfile and iconindex. If we don't find them, that's not a failure case -- it's possible that they just aren't in there. */ - hr = IPropertySetStorage_Open(This->property_set_storage, &FMTID_Intshcut, - STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &pPropStg); if (get_profile_string(str_header, str_iconfile, pszFileName, &iconfile) == S_OK) {

1 0