September 2012 - Wine-Commits

Dmitry Timoshkov : windowscodecs: GIF Graphic Control Extension block belongs to the image which follows it.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 880b98bf23f3031f4a0b6c2a1fd5f96e672e1927 URL: http://source.winehq.org/git/wine.git/?a=commit;h=880b98bf23f3031f4a0b6c2a1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 18 12:58:25 2012 +0900 windowscodecs: GIF Graphic Control Extension block belongs to the image which follows it. --- dlls/windowscodecs/ungif.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/ungif.c b/dlls/windowscodecs/ungif.c index 66310cb..7984e3a 100644 --- a/dlls/windowscodecs/ungif.c +++ b/dlls/windowscodecs/ungif.c @@ -885,16 +885,19 @@ DGifSlurp(GifFileType * GifFile) { case EXTENSION_RECORD_TYPE: { + int Function; Extensions *Extensions; - if (GifFile->ImageCount) + if (DGifGetExtension(GifFile, &Function, &ExtData) == GIF_ERROR) + return (GIF_ERROR); + + if (GifFile->ImageCount || Function == GRAPHICS_EXT_FUNC_CODE) Extensions = &temp_save; else Extensions = &GifFile->Extensions; - if (DGifGetExtension(GifFile, &Extensions->Function, &ExtData) == - GIF_ERROR) - return (GIF_ERROR); + Extensions->Function = Function; + while (ExtData != NULL) { /* Create an extension block with our data */

1 0

Dmitry Timoshkov : windowscodecs: Use symbolic names for GIF extensions.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 9db35b9ceac74de7349bee10dab39d7148227f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db35b9ceac74de7349bee10d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 18 13:02:51 2012 +0900 windowscodecs: Use symbolic names for GIF extensions. --- dlls/windowscodecs/gifformat.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index e3c2661..1dce11d 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -348,7 +348,8 @@ static HRESULT load_APE_metadata(IStream *stream, const GUID *vendor, DWORD opti hr = IStream_Read(stream, &ape_data, sizeof(ape_data), &bytesread); if (FAILED(hr) || bytesread != sizeof(ape_data)) return S_OK; - if (ape_data.extension_introducer != 0x21 || ape_data.extension_label != 0xff || + if (ape_data.extension_introducer != 0x21 || + ape_data.extension_label != APPLICATION_EXT_FUNC_CODE || ape_data.block_size != 11) return S_OK; @@ -455,7 +456,8 @@ static HRESULT load_GifComment_metadata(IStream *stream, const GUID *vendor, DWO hr = IStream_Read(stream, &ext_data, sizeof(ext_data), &bytesread); if (FAILED(hr) || bytesread != sizeof(ext_data)) return S_OK; - if (ext_data.extension_introducer != 0x21 || ext_data.extension_label != 0xfe) + if (ext_data.extension_introducer != 0x21 || + ext_data.extension_label != COMMENT_EXT_FUNC_CODE) return S_OK; data = NULL;

1 0

Alexandre Julliard : winex11: Add window data locking to the mouse functions.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 1cfed8922e3b865b7a8fde20a29bdfff7330d6bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cfed8922e3b865b7a8fde20a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 17 16:37:26 2012 +0200 winex11: Add window data locking to the mouse functions. --- dlls/winex11.drv/mouse.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 72b85b3..5808420 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -488,15 +488,18 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) struct x11drv_thread_data *thread_data; RECT rect; DWORD style; + BOOL fullscreen; if (hwnd == GetDesktopWindow()) return FALSE; - if (!(data = X11DRV_get_win_data( hwnd ))) return FALSE; style = GetWindowLongW( hwnd, GWL_STYLE ); if (!(style & WS_VISIBLE)) return FALSE; if ((style & (WS_POPUP | WS_CHILD)) == WS_CHILD) return FALSE; /* maximized windows don't count as full screen */ if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION) return FALSE; - if (!is_window_rect_fullscreen( &data->whole_rect )) return FALSE; + if (!(data = get_win_data( hwnd ))) return FALSE; + fullscreen = is_window_rect_fullscreen( &data->whole_rect ); + release_win_data( data ); + if (!fullscreen) return FALSE; if (!(thread_data = x11drv_thread_data())) return FALSE; if (GetTickCount() - thread_data->clip_reset < 1000) return FALSE; if (!reset && clipping_cursor && thread_data->clip_hwnd) return FALSE; /* already clipping */ @@ -541,7 +544,7 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU return; } - if (!(data = X11DRV_get_win_data( hwnd ))) return; + if (!(data = get_win_data( hwnd ))) return; if (window == data->whole_window) { @@ -565,6 +568,7 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU sync_window_cursor( data->whole_window ); last_cursor_change = input->u.mi.time; } + release_win_data( data ); if (hwnd != GetDesktopWindow()) {

1 0

Alexandre Julliard : winex11: Add window data locking to the focus event handlers.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 2c9ce4968ada1b147c090d1eff2a60b9d0324fa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c9ce4968ada1b147c090d1ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 18 11:24:55 2012 +0200 winex11: Add window data locking to the focus event handlers. --- dlls/winex11.drv/event.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 1c0cec3..c9ae725 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -516,15 +516,15 @@ DWORD EVENT_x11_time_to_win32_time(Time time) */ static inline BOOL can_activate_window( HWND hwnd ) { - struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); LONG style = GetWindowLongW( hwnd, GWL_STYLE ); + RECT rect; if (!(style & WS_VISIBLE)) return FALSE; if ((style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return FALSE; if (style & WS_MINIMIZE) return FALSE; if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_NOACTIVATE) return FALSE; if (hwnd == GetDesktopWindow()) return FALSE; - if (data && IsRectEmpty( &data->window_rect )) return FALSE; + if (GetWindowRect( hwnd, &rect ) && IsRectEmpty( &rect )) return FALSE; return !(style & WS_DISABLED); } @@ -874,15 +874,15 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event ) clipping_cursor = 1; return; } - if (!(data = X11DRV_get_win_data( hwnd ))) return; - if (!data->mapped || data->embedded) return; + if (!(data = get_win_data( hwnd ))) return; - if (!data->managed) + if (!data->managed && !data->embedded && data->mapped) { HWND hwndFocus = GetFocus(); if (hwndFocus && IsChild( hwnd, hwndFocus )) set_input_focus( thread_display(), data->whole_window ); } + release_win_data( data ); } @@ -1277,8 +1277,9 @@ void CDECL X11DRV_SetFocus( HWND hwnd ) struct x11drv_win_data *data; if (!(hwnd = GetAncestor( hwnd, GA_ROOT ))) return; - if (!(data = X11DRV_get_win_data( hwnd ))) return; + if (!(data = get_win_data( hwnd ))) return; if (!data->managed) set_input_focus( display, data->whole_window ); + release_win_data( data ); }

1 0

Jacek Caban : vbscript: Added support for do.. loop statement without an expression.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 5a2b3e0de64bdebf71400ed70eccf06758f29adb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a2b3e0de64bdebf71400ed70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 18 12:25:42 2012 +0200 vbscript: Added support for do..loop statement without an expression. --- dlls/vbscript/compile.c | 15 +++++++++++---- dlls/vbscript/parser.y | 1 + dlls/vbscript/tests/lang.vbs | 7 +++++++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 89e290d..327d97b 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -625,6 +625,7 @@ static HRESULT compile_dowhile_statement(compile_ctx_t *ctx, while_statement_t * { statement_ctx_t loop_ctx = {0}; unsigned start_addr; + vbsop_t jmp_op; HRESULT hres; start_addr = ctx->instr_cnt; @@ -636,11 +637,17 @@ static HRESULT compile_dowhile_statement(compile_ctx_t *ctx, while_statement_t * if(FAILED(hres)) return hres; - hres = compile_expression(ctx, stat->expr); - if(FAILED(hres)) - return hres; + if(stat->expr) { + hres = compile_expression(ctx, stat->expr); + if(FAILED(hres)) + return hres; + + jmp_op = stat->stat.type == STAT_DOUNTIL ? OP_jmp_false : OP_jmp_true; + }else { + jmp_op = OP_jmp; + } - hres = push_instr_addr(ctx, stat->stat.type == STAT_DOUNTIL ? OP_jmp_false : OP_jmp_true, start_addr); + hres = push_instr_addr(ctx, jmp_op, start_addr); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index d5a9934..3f86b04 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -185,6 +185,7 @@ SimpleStatement | tDO tNL StatementsNl_opt tLOOP DoType Expression { $$ = new_while_statement(ctx, $5 ? STAT_DOWHILE : STAT_DOUNTIL, $6, $3); CHECK_ERROR; } + | tDO tNL StatementsNl_opt tLOOP { $$ = new_while_statement(ctx, STAT_DOWHILE, NULL, $3); CHECK_ERROR; } | FunctionDecl { $$ = new_function_statement(ctx, $1); CHECK_ERROR; } | tEXIT tDO { $$ = new_statement(ctx, STAT_EXITDO, 0); CHECK_ERROR; } | tEXIT tFOR { $$ = new_statement(ctx, STAT_EXITFOR, 0); CHECK_ERROR; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index fd93df6..76f4003 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -346,6 +346,13 @@ do until false loop x = false +do + if x then exit do + x = true +loop +call ok(x, "x is false after do..loop?") + +x = false y = false do if x then

1 0

Jacek Caban : msi: Choose the right IActiveScriptParse* interface based on process type.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 645ce64196f98cc7b732565046ba27fd5686c762 URL: http://source.winehq.org/git/wine.git/?a=commit;h=645ce64196f98cc7b73256504… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 18 12:24:16 2012 +0200 msi: Choose the right IActiveScriptParse* interface based on process type. --- dlls/msi/script.c | 60 +++++++++++++++++++++++------------------------------ 1 files changed, 26 insertions(+), 34 deletions(-) diff --git a/dlls/msi/script.c b/dlls/msi/script.c index 94577ba..db80b1e 100644 --- a/dlls/msi/script.c +++ b/dlls/msi/script.c @@ -36,6 +36,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); +#ifdef _WIN64 + +#define IActiveScriptParse_Release IActiveScriptParse64_Release +#define IActiveScriptParse_InitNew IActiveScriptParse64_InitNew +#define IActiveScriptParse_ParseScriptText IActiveScriptParse64_ParseScriptText + +#else + +#define IActiveScriptParse_Release IActiveScriptParse32_Release +#define IActiveScriptParse_InitNew IActiveScriptParse32_InitNew +#define IActiveScriptParse_ParseScriptText IActiveScriptParse32_ParseScriptText + +#endif + static const WCHAR szJScript[] = { 'J','S','c','r','i','p','t',0}; static const WCHAR szVBScript[] = { 'V','B','S','c','r','i','p','t',0}; static const WCHAR szSession[] = {'S','e','s','s','i','o','n',0}; @@ -81,8 +95,7 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function { HRESULT hr; IActiveScript *pActiveScript = NULL; - IActiveScriptParse32 *pActiveScriptParse32 = NULL; - IActiveScriptParse64 *pActiveScriptParse64 = NULL; + IActiveScriptParse *pActiveScriptParse = NULL; MsiActiveScriptSite *pActiveScriptSite = NULL; IDispatch *pDispatch = NULL; DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0}; @@ -124,40 +137,20 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function goto done; } - if (type & msidbCustomActionType64BitScript) - { - hr = IActiveScript_QueryInterface(pActiveScript, &IID_IActiveScriptParse64, (void **)&pActiveScriptParse64); - if (FAILED(hr)) goto done; - - hr = IActiveScript_SetScriptSite(pActiveScript, (IActiveScriptSite *)pActiveScriptSite); - if (FAILED(hr)) goto done; - - hr = IActiveScriptParse64_InitNew(pActiveScriptParse64); - if (FAILED(hr)) goto done; - - hr = IActiveScript_AddNamedItem(pActiveScript, szSession, SCRIPTITEM_GLOBALMEMBERS); - if (FAILED(hr)) goto done; - - hr = IActiveScriptParse64_ParseScriptText(pActiveScriptParse64, script, NULL, NULL, NULL, 0, 0, 0L, NULL, NULL); - if (FAILED(hr)) goto done; - } - else - { - hr = IActiveScript_QueryInterface(pActiveScript, &IID_IActiveScriptParse32, (void **)&pActiveScriptParse32); - if (FAILED(hr)) goto done; + hr = IActiveScript_QueryInterface(pActiveScript, &IID_IActiveScriptParse, (void **)&pActiveScriptParse); + if (FAILED(hr)) goto done; - hr = IActiveScript_SetScriptSite(pActiveScript, (IActiveScriptSite *)pActiveScriptSite); - if (FAILED(hr)) goto done; + hr = IActiveScript_SetScriptSite(pActiveScript, (IActiveScriptSite *)pActiveScriptSite); + if (FAILED(hr)) goto done; - hr = IActiveScriptParse32_InitNew(pActiveScriptParse32); - if (FAILED(hr)) goto done; + hr = IActiveScriptParse_InitNew(pActiveScriptParse); + if (FAILED(hr)) goto done; - hr = IActiveScript_AddNamedItem(pActiveScript, szSession, SCRIPTITEM_GLOBALMEMBERS); - if (FAILED(hr)) goto done; + hr = IActiveScript_AddNamedItem(pActiveScript, szSession, SCRIPTITEM_GLOBALMEMBERS); + if (FAILED(hr)) goto done; - hr = IActiveScriptParse32_ParseScriptText(pActiveScriptParse32, script, NULL, NULL, NULL, 0, 0, 0L, NULL, NULL); - if (FAILED(hr)) goto done; - } + hr = IActiveScriptParse_ParseScriptText(pActiveScriptParse, script, NULL, NULL, NULL, 0, 0, 0L, NULL, NULL); + if (FAILED(hr)) goto done; hr = IActiveScript_SetScriptState(pActiveScript, SCRIPTSTATE_CONNECTED); if (FAILED(hr)) goto done; @@ -193,8 +186,7 @@ done: if (pDispatch) IDispatch_Release(pDispatch); if (pActiveScript) IActiveScript_Release(pActiveScript); - if (pActiveScriptParse32) IActiveScriptParse32_Release(pActiveScriptParse32); - if (pActiveScriptParse64) IActiveScriptParse64_Release(pActiveScriptParse64); + if (pActiveScriptParse) IActiveScriptParse_Release(pActiveScriptParse); if (pActiveScriptSite) { if (pActiveScriptSite->pSession) IDispatch_Release(pActiveScriptSite->pSession);

1 0

Jacek Caban : msi: Make script Session object visible by name.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 3b9a13e94c19a4cb59b7ab1dfa38a1455363cfd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b9a13e94c19a4cb59b7ab1df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 18 12:24:30 2012 +0200 msi: Make script Session object visible by name. --- dlls/msi/script.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/script.c b/dlls/msi/script.c index db80b1e..392c5ac 100644 --- a/dlls/msi/script.c +++ b/dlls/msi/script.c @@ -146,7 +146,7 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function hr = IActiveScriptParse_InitNew(pActiveScriptParse); if (FAILED(hr)) goto done; - hr = IActiveScript_AddNamedItem(pActiveScript, szSession, SCRIPTITEM_GLOBALMEMBERS); + hr = IActiveScript_AddNamedItem(pActiveScript, szSession, SCRIPTITEM_GLOBALMEMBERS|SCRIPTITEM_ISVISIBLE); if (FAILED(hr)) goto done; hr = IActiveScriptParse_ParseScriptText(pActiveScriptParse, script, NULL, NULL, NULL, 0, 0, 0L, NULL, NULL);

1 0

Jacek Caban : vbscript: Added Len implementation.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 3fa78601453abe7813a0b0d67bf5854cd39ddc3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa78601453abe7813a0b0d67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 18 12:25:26 2012 +0200 vbscript: Added Len implementation. --- dlls/vbscript/global.c | 24 ++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 6 ++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 3c28e96..0513664 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -468,8 +468,28 @@ static HRESULT Global_RGB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA static HRESULT Global_Len(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + DWORD len; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + if(V_VT(arg) == VT_NULL) + return return_null(res); + + if(V_VT(arg) != VT_BSTR) { + BSTR str; + + hres = to_string(arg, &str); + if(FAILED(hres)) + return hres; + + len = SysStringLen(str); + SysFreeString(str); + }else { + len = SysStringLen(V_BSTR(arg)); + } + + return return_int(res, len); } static HRESULT Global_LenB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index fd339dd..c17c5b4 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -173,4 +173,10 @@ TestLCase 0.123, doubleAsString(0.123) TestLCase Empty, "" Call ok(getVT(LCase(Null)) = "VT_NULL", "getVT(LCase(Null)) = " & getVT(LCase(Null))) +Call ok(Len("abc") = 3, "Len(abc) = " & Len("abc")) +Call ok(Len("") = 0, "Len() = " & Len("")) +Call ok(Len(1) = 1, "Len(1) = " & Len(1)) +Call ok(isNull(Len(null)), "Len(null) = " & Len(null)) +Call ok(Len(empty) = 0, "Len(empty) = " & Len(empty)) + Call reportSuccess()

1 0

Dmitry Timoshkov : windowscodecs: Create global metadata blocks in the GIF decoder.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 88faba8e1a1b1e38a320765c6b32bb08d8094f82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88faba8e1a1b1e38a320765c6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 18 12:57:19 2012 +0900 windowscodecs: Create global metadata blocks in the GIF decoder. --- dlls/windowscodecs/ungif.c | 15 +++++++++++++-- dlls/windowscodecs/ungif.h | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/ungif.c b/dlls/windowscodecs/ungif.c index 97038d9..66310cb 100644 --- a/dlls/windowscodecs/ungif.c +++ b/dlls/windowscodecs/ungif.c @@ -884,13 +884,21 @@ DGifSlurp(GifFileType * GifFile) { break; case EXTENSION_RECORD_TYPE: - if (DGifGetExtension(GifFile, &temp_save.Function, &ExtData) == + { + Extensions *Extensions; + + if (GifFile->ImageCount) + Extensions = &temp_save; + else + Extensions = &GifFile->Extensions; + + if (DGifGetExtension(GifFile, &Extensions->Function, &ExtData) == GIF_ERROR) return (GIF_ERROR); while (ExtData != NULL) { /* Create an extension block with our data */ - if (AddExtensionBlock(&temp_save, ExtData[0], &ExtData[1]) + if (AddExtensionBlock(Extensions, ExtData[0], &ExtData[1]) == GIF_ERROR) return (GIF_ERROR); @@ -899,6 +907,7 @@ DGifSlurp(GifFileType * GifFile) { temp_save.Function = 0; } break; + } case TERMINATE_RECORD_TYPE: break; @@ -1003,6 +1012,8 @@ DGifCloseFile(GifFileType * GifFile) { GifFile->SavedImages = NULL; } + FreeExtension(&GifFile->Extensions); + ungif_free(GifFile); return GIF_OK; diff --git a/dlls/windowscodecs/ungif.h b/dlls/windowscodecs/ungif.h index 6c9f418..6caa600 100644 --- a/dlls/windowscodecs/ungif.h +++ b/dlls/windowscodecs/ungif.h @@ -117,6 +117,7 @@ typedef struct GifFileType { SBackGroundColor, /* I hope you understand this one... */ SAspectRatio; /* Pixel aspect ratio, in 1/64 units, starting at 1:4. */ ColorMapObject *SColorMap; /* NULL if not exists. */ + Extensions Extensions; int ImageCount; /* Number of current image */ GifImageDesc Image; /* Block describing current image */ struct SavedImage *SavedImages; /* Use this to accumulate file state */

1 0

Alexandre Julliard : user32/tests: Fix coordinates in the UpdateLayeredWindow broken case.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 8e87b9233aa8de045e0d0b568f749d4da6fa5bce URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e87b9233aa8de045e0d0b568… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 18 10:27:09 2012 +0200 user32/tests: Fix coordinates in the UpdateLayeredWindow broken case. --- dlls/user32/tests/msg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 3208751..2e4ad7d 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13935,7 +13935,7 @@ static void test_layered_window(void) "wrong window rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); GetClientRect( hwnd, &rect ); ok( (rect.right == 250 && rect.bottom == 300) || - broken(rect.right == client.right - 100 && rect.bottom == client.bottom - 50), + broken(rect.right == client.right - 50 && rect.bottom == client.bottom), "wrong client rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); DestroyWindow( hwnd );

1 0