July 2011 - Wine-Commits - list.winehq.org

Michael Stefaniuc : dmstyle: Remove an unused function declaration.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: a2653310e329924449d9a91a1bd1e7d0bf4a3d50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2653310e329924449d9a91a1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 27 14:08:07 2011 +0200 dmstyle: Remove an unused function declaration. --- dlls/dmstyle/dmstyle_private.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index 4b450db..e1c8e9a 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -95,7 +95,6 @@ typedef struct _DMUS_PRIVATE_STYLE_ITEM { extern HRESULT WINAPI DMUSIC_CreateDirectMusicAuditionTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; extern HRESULT WINAPI DMUSIC_CreateDirectMusicChordTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; extern HRESULT WINAPI DMUSIC_CreateDirectMusicCommandTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicMelodyFormulationTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; extern HRESULT WINAPI DMUSIC_CreateDirectMusicMotifTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; extern HRESULT WINAPI DMUSIC_CreateDirectMusicMuteTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; extern HRESULT WINAPI DMUSIC_CreateDirectMusicStyleTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN;

1 0

Frédéric Delanoy : programs: Assorted spelling fixes.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: 1b6eed8a99e8519e2dcfdbcd945632a992cda17e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b6eed8a99e8519e2dcfdbcd9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 27 11:46:59 2011 +0200 programs: Assorted spelling fixes. --- programs/taskmgr/graphctl.c | 8 ++++---- programs/winebrowser/main.c | 2 +- programs/winecfg/libraries.c | 2 +- programs/wineconsole/curses.c | 2 +- programs/wineconsole/user.c | 2 +- programs/winhlp32/hlpfile.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/taskmgr/graphctl.c b/programs/taskmgr/graphctl.c index c5395d5..8984784 100644 --- a/programs/taskmgr/graphctl.c +++ b/programs/taskmgr/graphctl.c @@ -57,7 +57,7 @@ static void GraphCtrl_Init(TGraphCtrl* this) * we need a starting point (i.e. a "previous" point) * use 0.0 as the default first point. * these are public member variables, and can be changed outside - * (after construction). Therefore m_perviousPosition could be set to + * (after construction). Therefore m_dPreviousPosition could be set to * a more appropriate value prior to the first call to SetPosition. */ this->m_dPreviousPosition[0] = 0.0; @@ -69,8 +69,8 @@ static void GraphCtrl_Init(TGraphCtrl* this) this->m_nYDecimals = 3; /* set some initial values for the scaling until "SetRange" is called. - * these are protected varaibles and must be set with SetRange - * in order to ensure that m_dRange is updated accordingly + * these are protected variables and must be set with SetRange + * in order to ensure that m_dRange is updated accordingly */ /* m_dLowerLimit = -10.0; */ /* m_dUpperLimit = 10.0; */ @@ -401,7 +401,7 @@ static void GraphCtrl_DrawPoint(TGraphCtrl* this) SRCCOPY); /* establish a rectangle over the right side of plot */ - /* which now needs to be cleaned up proir to adding the new point */ + /* which now needs to be cleaned up prior to adding the new point */ rectCleanUp = this->m_rectPlot; rectCleanUp.left = rectCleanUp.right - this->m_nShiftPixels; diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index f5ffe05..8635ad2 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -22,7 +22,7 @@ * Winebrowser is a winelib application that will start the appropriate * native browser or mail client for a wine installation that lacks a * windows browser/mail client. For example, you will be able to open - * urls via native mozilla if no browser has yet been installed in wine. + * URLs via native mozilla if no browser has yet been installed in wine. * * The application to launch is chosen from a default set or, if set, * taken from a registry key. diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index e402b4e..aa11b46 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -229,7 +229,7 @@ static int show_dll_in_list( const char *name ) static void set_controls_from_selection(HWND dialog) { - /* FIXME: display/update some information about the selected dll (purpose, recommended loadorder) maybe? */ + /* FIXME: display/update some information about the selected dll (purpose, recommended load order) maybe? */ } static void clear_settings(HWND dialog) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 00e5039..013a062 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -668,7 +668,7 @@ static unsigned WCCURSES_FillMouse(INPUT_RECORD* ir) WINE_TRACE("[%u]: (%d, %d) %08lx\n", mevt.id, mevt.x, mevt.y, (unsigned long)mevt.bstate); - /* macros to ease mapping ncurse button numbering to windows's one */ + /* macros to ease mapping ncurse button numbering to windows' one */ #define BTN1_BIT FROM_LEFT_1ST_BUTTON_PRESSED #define BTN2_BIT RIGHTMOST_BUTTON_PRESSED #define BTN3_BIT FROM_LEFT_2ND_BUTTON_PRESSED diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 22f33b1..dafab16 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -447,7 +447,7 @@ HFONT WCUSER_CopyFont(struct config_data* config, HWND hWnd, const LOGFONTW* lf, * - the width of all characters in the font * This isn't true in Wine. As a temporary workaround, we get as the width of the * cell, the width of the first character in the font, after checking that all - * characters in the font have the same width (I hear paranoïa coming) + * characters in the font have the same width (I hear paranoia coming) * when this gets fixed, the code should be using tm.tmAveCharWidth * or tm.tmMaxCharWidth as the cell width. */ diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index cf7bcdc..2f97a02 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -1585,7 +1585,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, case 0x8C: if (!HLPFILE_RtfAddControl(rd, "\\_")) goto done; - /* FIXME: it could be that hypen is also in input stream !! */ + /* FIXME: it could be that hyphen is also in input stream !! */ format += 1; rd->char_pos++; break;

1 0

André Hentschel : view: Add support for enhanced metafiles.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: 8286bfee71fc3ed92cb3dd2b552e5fa544e7a141 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8286bfee71fc3ed92cb3dd2b5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 25 23:52:50 2011 +0200 view: Add support for enhanced metafiles. --- programs/view/view.c | 39 +++++++++++++++++++++++++++++++++++---- 1 files changed, 35 insertions(+), 4 deletions(-) diff --git a/programs/view/view.c b/programs/view/view.c index e266209..917784d 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -27,9 +27,10 @@ static char szAppName[5] = "View"; static char szTitle[80]; static HMETAFILE hmf; +static HENHMETAFILE enhmf; static int deltax = 0, deltay = 0; static int width = 0, height = 0; -static BOOL isAldus; +static BOOL isAldus, isEnhanced; #include "pshpack1.h" typedef struct @@ -52,7 +53,7 @@ static BOOL FileOpen(HWND hWnd, char *fn, int fnsz) 0, 0, NULL, NULL, 0, 0, NULL, fnsz, NULL, 0, NULL, NULL, OFN_SHOWHELP, 0, 0, NULL, 0, NULL }; - ofn.lpstrFilter = "Metafiles\0*.wmf\0"; + ofn.lpstrFilter = "Metafiles\0*.wmf;*.emf\0"; ofn.hwndOwner = hWnd; ofn.lpstrFile = fn; if( fnsz < 1 ) @@ -61,6 +62,25 @@ static BOOL FileOpen(HWND hWnd, char *fn, int fnsz) return GetOpenFileName(&ofn); } +static BOOL FileIsEnhanced( LPCSTR szFileName ) +{ + HFILE hInFile; + ENHMETAHEADER enh; + + if( (hInFile = _lopen( szFileName, OF_READ ) ) == HFILE_ERROR ) + return FALSE; + + if( _lread( hInFile, &enh, sizeof(ENHMETAHEADER) ) != sizeof(ENHMETAHEADER) ) + { + _lclose( hInFile ); + return FALSE; + } + _lclose( hInFile ); + + /* Is it enhanced? */ + return (enh.dSignature == ENHMETA_SIGNATURE); +} + static BOOL FileIsPlaceable( LPCSTR szFileName ) { HFILE hInFile; @@ -154,7 +174,14 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT uMessage, WPARAM wparam, LPARAM SetWindowExtEx(ps.hdc, width, height, NULL); SetViewportExtEx(ps.hdc, width, height, NULL); SetViewportOrgEx(ps.hdc, deltax, deltay, NULL); - if(hmf) PlayMetaFile(ps.hdc, hmf); + if (isEnhanced && enhmf) + { + RECT r; + GetClientRect(hwnd, &r); + PlayEnhMetaFile(ps.hdc, enhmf, &r); + } + else if (hmf) + PlayMetaFile(ps.hdc, hmf); EndPaint(hwnd, &ps); } break; @@ -171,7 +198,11 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT uMessage, WPARAM wparam, LPARAM hmf = GetPlaceableMetaFile(hwnd, filename); } else { RECT r; - hmf = GetMetaFile(filename); + isEnhanced = FileIsEnhanced(filename); + if (isEnhanced) + enhmf = GetEnhMetaFile(filename); + else + hmf = GetMetaFile(filename); GetClientRect(hwnd, &r); width = r.right - r.left; height = r.bottom - r.top;

1 0

André Hentschel : view: Merge 3 C source files and a header file into one file.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: c243e19075631158b70a6d803750bbf651ce76c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c243e19075631158b70a6d803… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 25 23:52:01 2011 +0200 view: Merge 3 C source files and a header file into one file. --- programs/view/Makefile.in | 4 +- programs/view/globals.h | 53 ---------------- programs/view/init.c | 100 ------------------------------ programs/view/view.c | 148 ++++++++++++++++++++++++++++++++++++++++++--- programs/view/winmain.c | 67 -------------------- 5 files changed, 140 insertions(+), 232 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c243e19075631158b70a6…

1 0

Bernhard Loos : ntdll/tests: Add a number of named pipe tests using the nt api and ioctls.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: e0f54d1b203113a08512af2c03e666c568952267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0f54d1b203113a08512af2c0… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Tue Jul 26 23:40:48 2011 +0200 ntdll/tests: Add a number of named pipe tests using the nt api and ioctls. --- dlls/ntdll/tests/Makefile.in | 1 + dlls/ntdll/tests/pipe.c | 430 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 431 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0f54d1b203113a08512a…

1 0

Alexandre Julliard : widl: Don't set base types to 0 on proxy entry.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: ca22457d7bc88036029f03e70c0732a37e5759d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca22457d7bc88036029f03e70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 27 16:16:08 2011 +0200 widl: Don't set base types to 0 on proxy entry. --- tools/widl/proxy.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 5129971..699e073 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -111,12 +111,14 @@ static void clear_output_vars( const var_list_t *args ) if (!args) return; LIST_FOR_EACH_ENTRY( arg, args, const var_t, entry ) { - if (is_attr(arg->attrs, ATTR_OUT) && !is_attr(arg->attrs, ATTR_IN)) { - print_proxy( "if(%s)\n", arg->name ); - indent++; - print_proxy( "MIDL_memset( %s, 0, sizeof( *%s ));\n", arg->name, arg->name ); - indent--; - } + if (is_attr(arg->attrs, ATTR_IN)) continue; + if (!is_attr(arg->attrs, ATTR_OUT)) continue; + if (is_ptr(arg->type)) + { + if (type_get_type(type_pointer_get_ref(arg->type)) == TYPE_BASIC) continue; + if (type_get_type(type_pointer_get_ref(arg->type)) == TYPE_ENUM) continue; + } + print_proxy( "if (%s) MIDL_memset( %s, 0, sizeof( *%s ));\n", arg->name, arg->name, arg->name ); } }

1 0

Alexandre Julliard : widl: Clear out more types of parameters in the proxy error handlers.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: 0d76bb7ec34d37a861845e47ab14ae4cd375840e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d76bb7ec34d37a861845e47a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 27 16:04:22 2011 +0200 widl: Clear out more types of parameters in the proxy error handlers. --- tools/widl/proxy.c | 33 +++++---------------------------- tools/widl/typegen.c | 17 +++++++++++------ tools/widl/typegen.h | 2 ++ 3 files changed, 18 insertions(+), 34 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 8e2db07..5129971 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -147,20 +147,9 @@ static int need_delegation_indirect(const type_t *iface) static void free_variable( const var_t *arg, const char *local_var_prefix ) { unsigned int type_offset = arg->type->typestring_offset; - expr_t *iid; type_t *type = arg->type; - expr_t *size = get_size_is_expr(type, arg->name); - if (size) - { - print_proxy( "__frame->_StubMsg.MaxCount = " ); - write_expr(proxy, size, 0, 1, NULL, NULL, local_var_prefix); - fprintf(proxy, ";\n\n"); - print_proxy( "NdrClearOutParameters( &__frame->_StubMsg, "); - fprintf(proxy, "&__MIDL_TypeFormatString.Format[%u], ", type_offset ); - fprintf(proxy, "(void*)%s );\n", arg->name ); - return; - } + write_parameter_conf_or_var_exprs(proxy, indent, local_var_prefix, PHASE_FREE, arg, FALSE); switch (typegen_detect_type(type, arg->attrs, TDT_IGNORE_STRINGS)) { @@ -174,23 +163,11 @@ static void free_variable( const var_t *arg, const char *local_var_prefix ) break; case TGT_IFACE_POINTER: - iid = get_attrp( arg->attrs, ATTR_IIDIS ); - if( iid ) - { - print_proxy( "__frame->_StubMsg.MaxCount = (ULONG_PTR) " ); - write_expr(proxy, iid, 1, 1, NULL, NULL, local_var_prefix); - print_proxy( ";\n\n" ); - } - /* fall through */ case TGT_POINTER: - if (get_pointer_fc(type, arg->attrs, TRUE) == RPC_FC_FP) - { - print_proxy( "NdrClearOutParameters( &__frame->_StubMsg, "); - fprintf(proxy, "&__MIDL_TypeFormatString.Format[%u], ", type_offset ); - fprintf(proxy, "(void*)%s );\n", arg->name ); - } - else - print_proxy("/* FIXME: %s code for %s type %d missing */\n", __FUNCTION__, arg->name, type_get_type(type) ); + case TGT_ARRAY: + print_proxy( "NdrClearOutParameters( &__frame->_StubMsg, "); + fprintf(proxy, "&__MIDL_TypeFormatString.Format[%u], ", type_offset ); + fprintf(proxy, "(void *)%s );\n", arg->name ); break; default: diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 847e10b..dfc5a50 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4035,8 +4035,8 @@ expr_t *get_size_is_expr(const type_t *t, const char *name) return x; } -static void write_parameter_conf_or_var_exprs(FILE *file, int indent, const char *local_var_prefix, - enum remoting_phase phase, const var_t *var) +void write_parameter_conf_or_var_exprs(FILE *file, int indent, const char *local_var_prefix, + enum remoting_phase phase, const var_t *var, int valid_variance) { const type_t *type = var->type; /* get fundamental type for the argument */ @@ -4057,9 +4057,14 @@ static void write_parameter_conf_or_var_exprs(FILE *file, int indent, const char if (type_array_has_variance(type)) { print_file(file, indent, "__frame->_StubMsg.Offset = 0;\n"); /* FIXME */ - print_file(file, indent, "__frame->_StubMsg.ActualCount = (ULONG_PTR)"); - write_expr(file, type_array_get_variance(type), 1, 1, NULL, NULL, local_var_prefix); - fprintf(file, ";\n\n"); + if (valid_variance) + { + print_file(file, indent, "__frame->_StubMsg.ActualCount = (ULONG_PTR)"); + write_expr(file, type_array_get_variance(type), 1, 1, NULL, NULL, local_var_prefix); + fprintf(file, ";\n\n"); + } + else + print_file(file, indent, "__frame->_StubMsg.ActualCount = __frame->_StubMsg.MaxCount;\n\n"); } } break; @@ -4135,7 +4140,7 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const if (phase == PHASE_BUFFERSIZE && get_required_buffer_size( var, &alignment, pass )) return; - write_parameter_conf_or_var_exprs(file, indent, local_var_prefix, phase, var); + write_parameter_conf_or_var_exprs(file, indent, local_var_prefix, phase, var, TRUE); switch (typegen_detect_type(type, var->attrs, TDT_ALL_TYPES)) { diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index c98aff8..b6540e2 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -68,6 +68,8 @@ void write_typeformatstring(FILE *file, const statement_list_t *stmts, type_pred void write_procformatstring_offsets( FILE *file, const type_t *iface ); void print_phase_basetype(FILE *file, int indent, const char *local_var_prefix, enum remoting_phase phase, enum pass pass, const var_t *var, const char *varname); +void write_parameter_conf_or_var_exprs(FILE *file, int indent, const char *local_var_prefix, + enum remoting_phase phase, const var_t *var, int valid_variance); void write_remoting_arguments(FILE *file, int indent, const var_t *func, const char *local_var_prefix, enum pass pass, enum remoting_phase phase); unsigned int get_size_procformatstring_func(const type_t *iface, const var_t *func);

1 0

Austin English : gdi32/tests: Remove win9x hacks.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: c30c441ea7d6d6066a41e259d438f454b327a6e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c30c441ea7d6d6066a41e259d… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jul 26 18:01:07 2011 -0700 gdi32/tests: Remove win9x hacks. --- dlls/gdi32/tests/gdiobj.c | 6 +++--- dlls/gdi32/tests/palette.c | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c index bc00b3d..c854311 100644 --- a/dlls/gdi32/tests/gdiobj.c +++ b/dlls/gdi32/tests/gdiobj.c @@ -221,7 +221,7 @@ static void test_GetCurrentObject(void) hobj = GetCurrentObject(hdc, OBJ_PEN); ok(hobj == hpen, "OBJ_PEN is wrong: %p\n", hobj); hobj = GetCurrentObject(hdc, OBJ_EXTPEN); - ok(hobj == hpen || broken(hobj == 0) /* win9x */, "OBJ_EXTPEN is wrong: %p\n", hobj); + ok(hobj == hpen, "OBJ_EXTPEN is wrong: %p\n", hobj); hbrush = CreateSolidBrush(RGB(10, 20, 30)); assert(hbrush != 0); @@ -257,7 +257,7 @@ static void test_GetCurrentObject(void) hobj = GetCurrentObject(hdc, OBJ_PEN); ok(hobj == hpen, "OBJ_PEN is wrong: %p\n", hobj); hobj = GetCurrentObject(hdc, OBJ_EXTPEN); - ok(hobj == hpen || broken(hobj == 0) /* win9x */, "OBJ_EXTPEN is wrong: %p\n", hobj); + ok(hobj == hpen, "OBJ_EXTPEN is wrong: %p\n", hobj); hcs = GetColorSpace(hdc); if (hcs) @@ -268,7 +268,7 @@ static void test_GetCurrentObject(void) ok(hcs != 0, "CreateColorSpace failed\n"); SelectObject(hdc, hcs); hobj = GetCurrentObject(hdc, OBJ_COLORSPACE); - ok(hobj == hcs || broken(hobj == 0) /* win9x */, "OBJ_COLORSPACE is wrong: %p\n", hobj); + ok(hobj == hcs, "OBJ_COLORSPACE is wrong: %p\n", hobj); } hrgn = CreateRectRgn(1, 1, 100, 100); diff --git a/dlls/gdi32/tests/palette.c b/dlls/gdi32/tests/palette.c index 851c321..c9455ca 100644 --- a/dlls/gdi32/tests/palette.c +++ b/dlls/gdi32/tests/palette.c @@ -110,9 +110,7 @@ static void test_DIB_PAL_COLORS(void) { SetPixel( memhdc, 0, 0, setColor ); chkColor = RGB( logpalettedata[3].peRed, logpalettedata[3].peGreen, logpalettedata[3].peBlue ); getColor = GetPixel( memhdc, 0, 0 ); - ok( getColor == chkColor || - broken(getColor == 0), /* win9x */ - "getColor=%08X\n", (UINT)getColor ); + ok( getColor == chkColor, "getColor=%08X\n", (UINT)getColor ); SelectPalette( memhdc, hpalOld, FALSE ); DeleteObject( hpal );

1 0

Frédéric Delanoy : cmd/tests: Add tests for stdout redirection and appending operators.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: 011d5c331c8d2ef161e2fda4ea8282466e33d347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=011d5c331c8d2ef161e2fda4e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 26 21:32:07 2011 +0200 cmd/tests: Add tests for stdout redirection and appending operators. --- programs/cmd/tests/test_builtins.cmd | 32 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 21 +++++++++++++++++++ 2 files changed, 53 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 2062a9d..572fb38 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -28,6 +28,38 @@ echo .word echo word(a)space@ echo word(a)space@@space@ +echo ------------ Testing redirection operators -------------- +mkdir foobar & cd foobar +echo ...stdout redirection +echo foo>foo +type foo +echo foo 1> foo +type foo +echo foo1> foo +type foo +echo foo11> foo +type foo +echo foo12> foo +type foo +echo ...stdout appending +echo foo>foo +echo foo >>foo +type foo +del foo +echo foob >> foo +type foo +echo fooc 1>>foo +type foo +echo food1>>foo +type foo +echo food2>>foo +type foo +del foo +echo food21>>foo +type foo +cd .. +rd /s/q foobar + echo ------------ Testing ^^ escape character -------------- rem Using something like "echo foo^" asks for an additional char after a "More?" prompt on the following line; it's not possible to currently test that non-interactively echo ^hell^o, world diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index d939ec5..d10aa4c 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -47,6 +47,27 @@ word .word word(a)space@ word(a)space@@space@ +------------ Testing redirection operators -------------- +...stdout redirection +foo +foo(a)space@ +(a)todo_wine@foo1 +(a)todo_wine@foo11 +(a)todo_wine@foo12 +...stdout appending +foo +foo(a)space@ +foob(a)space@ +foob(a)space@ +fooc(a)space@ +foob(a)space@ +fooc(a)space@ +(a)todo_wine@food1 +(a)todo_wine@foob(a)space@ +(a)todo_wine@fooc(a)space@ +(a)todo_wine@food1 +(a)todo_wine@food2 +(a)todo_wine@food21 @todo_wine(a)------------ Testing ^ escape character -------------- @todo_wine(a)hello, world @todo_wine(a)hello, world

1 0

Alexandre Julliard : winex11: Force unprotecting the DIB section bits in PutImage.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: 372ad442fcea463b671af6fb394f0da0936dcfba URL: http://source.winehq.org/git/wine.git/?a=commit;h=372ad442fcea463b671af6fb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 27 12:18:03 2011 +0200 winex11: Force unprotecting the DIB section bits in PutImage. --- dlls/winex11.drv/bitblt.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index ee60ef8..8d2383a 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1919,6 +1919,10 @@ DWORD X11DRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info int height = dst->visrect.bottom - dst->visrect.top; image->data = dst_bits.ptr; + /* hack: make sure the bits are readable if we are reading from a DIB section */ + /* to be removed once we get rid of DIB access protections */ + if (!dst_bits.is_copy) IsBadReadPtr( dst_bits.ptr, height * image->bytes_per_line ); + if (bitmap) { RGNDATA *clip_data = NULL;

1 0