wine-commits March 2014

wine-commits@winehq.org

2 participants
530 discussions

Piotr Caban : user32: Change SetFocus behavior on windows with parent and no WS_CHILD flag.
by Alexandre Julliard 26 Mar '14

26 Mar '14

Module: wine Branch: master Commit: 1cf3d8caa4df59490343ef9427ea5c6bc2af44c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cf3d8caa4df59490343ef942… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 26 12:54:38 2014 +0100 user32: Change SetFocus behavior on windows with parent and no WS_CHILD flag. --- dlls/user32/focus.c | 1 + dlls/user32/tests/win.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index bd2e572..c47a82d 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -277,6 +277,7 @@ HWND WINAPI SetFocus( HWND hwnd ) HWND parent; LONG style = GetWindowLongW( hwndTop, GWL_STYLE ); if (style & (WS_MINIMIZE | WS_DISABLED)) return 0; + if (!(style & WS_CHILD)) break; parent = GetAncestor( hwndTop, GA_PARENT ); if (!parent || parent == GetDesktopWindow()) { diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index f8c919a..cb74b8e 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3724,6 +3724,25 @@ todo_wine check_active_state(popup, 0, popup); SetActiveWindow(parent); + SetFocus(popup); + check_active_state(popup, 0, popup); + + EnableWindow(child1, FALSE); + check_active_state(popup, 0, popup); + SetFocus(parent); + check_active_state(parent, 0, parent); + SetFocus(popup); + check_active_state(popup, 0, popup); + EnableWindow(child1, TRUE); + + ShowWindow(child1, SW_MINIMIZE); + SetFocus(parent); + check_active_state(parent, 0, parent); + SetFocus(popup); + check_active_state(popup, 0, popup); + ShowWindow(child1, SW_HIDE); + + SetActiveWindow(parent); SetFocus(parent); check_active_state(parent, 0, parent);

1 0

Alistair Leslie-Hughes : dbghelp: Improve dwarf support.
by Alexandre Julliard 26 Mar '14

26 Mar '14

Module: wine Branch: master Commit: b816a8e629ee2debe5eaec6bbebf085d0e2aecac URL: http://source.winehq.org/git/wine.git/?a=commit;h=b816a8e629ee2debe5eaec6bb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 14 16:24:10 2014 +1100 dbghelp: Improve dwarf support. --- dlls/dbghelp/dwarf.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 159f9bb..e7c36b0 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1440,6 +1440,9 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, switch (child->abbrev->tag) { + case DW_TAG_array_type: + dwarf2_parse_array_type(ctx, di); + break; case DW_TAG_member: /* FIXME: should I follow the sibling stuff ?? */ dwarf2_parse_udt_member(ctx, child, (struct symt_udt*)di->symt); @@ -1710,7 +1713,10 @@ static void dwarf2_parse_subprogram_label(dwarf2_subprogram_t* subpgm, static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, struct symt_block* parent_block, - dwarf2_debug_info_t* di); + dwarf2_debug_info_t* di); + +static struct symt* dwarf2_parse_subroutine_type(dwarf2_parse_context_t* ctx, + dwarf2_debug_info_t* di); static void dwarf2_parse_inlined_subroutine(dwarf2_subprogram_t* subpgm, struct symt_block* parent_block, @@ -1801,6 +1807,12 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, case DW_TAG_variable: dwarf2_parse_variable(subpgm, block, child); break; + case DW_TAG_pointer_type: + dwarf2_parse_pointer_type(subpgm->ctx, di); + break; + case DW_TAG_subroutine_type: + dwarf2_parse_subroutine_type(subpgm->ctx, di); + break; case DW_TAG_lexical_block: dwarf2_parse_subprogram_block(subpgm, block, child); break; @@ -1930,6 +1942,9 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, case DW_TAG_inlined_subroutine: dwarf2_parse_inlined_subroutine(&subpgm, NULL, child); break; + case DW_TAG_pointer_type: + dwarf2_parse_pointer_type(subpgm.ctx, di); + break; case DW_TAG_subprogram: /* FIXME: likely a declaration (to be checked) * skip it for now

1 0

Kai Tietz : corerror.h: Merge with mingw-w64's extensions.
by Alexandre Julliard 26 Mar '14

26 Mar '14

Module: wine Branch: master Commit: 83b6b22ff89451125654a6fcfad859b5800c00a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83b6b22ff89451125654a6fcf… Author: Kai Tietz <ktietz70(a)googlemail.com> Date: Wed Mar 26 15:18:00 2014 +0100 corerror.h: Merge with mingw-w64's extensions. --- include/corerror.h | 1145 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 1140 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83b6b22ff89451125654a…

1 0

Hugh McMaster : regsvr32: Move silent check to the output_write function.
by Alexandre Julliard 26 Mar '14

26 Mar '14

Module: wine Branch: master Commit: 3858ea03a3f94d205a2d9429a04783735de6092f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3858ea03a3f94d205a2d9429a… Author: Hugh McMaster <hugh.mcmaster(a)masterindexing.com> Date: Wed Mar 19 12:03:49 2014 +1100 regsvr32: Move silent check to the output_write function. --- programs/regsvr32/regsvr32.c | 50 ++++++++++++++---------------------------- 1 file changed, 17 insertions(+), 33 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index c795f42..624acd6 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -72,6 +72,8 @@ static void __cdecl output_write(UINT id, ...) char *str; DWORD len, nOut, ret; + if (Silent) return; + if (!LoadStringA(GetModuleHandleA(NULL), id, fmt, sizeof(fmt)/sizeof(fmt[0]))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); @@ -112,16 +114,13 @@ static VOID *LoadProc(const char* strDll, const char* procName, HMODULE* DllHand *DllHandle = LoadLibraryExA(strDll, 0, LOAD_WITH_ALTERED_SEARCH_PATH); if(!*DllHandle) { - if(!Silent) - output_write(STRING_DLL_LOAD_FAILED, strDll); - + output_write(STRING_DLL_LOAD_FAILED, strDll); ExitProcess(1); } proc = (VOID *) GetProcAddress(*DllHandle, procName); if(!proc) { - if(!Silent) - output_write(STRING_PROC_NOT_IMPLEMENTED, procName, strDll); + output_write(STRING_PROC_NOT_IMPLEMENTED, procName, strDll); FreeLibrary(*DllHandle); return NULL; } @@ -141,13 +140,10 @@ static int RegisterDll(const char* strDll) hr = pfRegister(); if(FAILED(hr)) { - if(!Silent) - output_write(STRING_REGISTER_FAILED, strDll); - + output_write(STRING_REGISTER_FAILED, strDll); return -1; } - if(!Silent) - output_write(STRING_REGISTER_SUCCESSFUL, strDll); + output_write(STRING_REGISTER_SUCCESSFUL, strDll); if(DllHandle) FreeLibrary(DllHandle); @@ -167,13 +163,10 @@ static int UnregisterDll(char* strDll) hr = pfUnregister(); if(FAILED(hr)) { - if(!Silent) - output_write(STRING_UNREGISTER_FAILED, strDll); - + output_write(STRING_UNREGISTER_FAILED, strDll); return -1; } - if(!Silent) - output_write(STRING_UNREGISTER_SUCCESSFUL, strDll); + output_write(STRING_UNREGISTER_SUCCESSFUL, strDll); if(DllHandle) FreeLibrary(DllHandle); @@ -193,22 +186,16 @@ static int InstallDll(BOOL install, char *strDll, WCHAR *command_line) hr = pfInstall(install, command_line); if(FAILED(hr)) { - if(!Silent) - { - if (install) - output_write(STRING_INSTALL_FAILED, strDll); - else - output_write(STRING_UNINSTALL_FAILED, strDll); - } - return -1; - } - if(!Silent) - { if (install) - output_write(STRING_INSTALL_SUCCESSFUL, strDll); + output_write(STRING_INSTALL_FAILED, strDll); else - output_write(STRING_UNINSTALL_SUCCESSFUL, strDll); + output_write(STRING_UNINSTALL_FAILED, strDll); + return -1; } + if (install) + output_write(STRING_INSTALL_SUCCESSFUL, strDll); + else + output_write(STRING_UNINSTALL_SUCCESSFUL, strDll); if(DllHandle) FreeLibrary(DllHandle); @@ -320,11 +307,8 @@ int main(int argc, char* argv[]) if (!DllFound) { - if(!Silent) - { - output_write(STRING_HEADER); - output_write(STRING_USAGE); - } + output_write(STRING_HEADER); + output_write(STRING_USAGE); return 1; }

1 0

Hugh McMaster : regsvr32: Replace printf calls with WriteConsole function.
by Alexandre Julliard 26 Mar '14

26 Mar '14

Module: wine Branch: master Commit: 412a4f13f676fe105d75da5d2b9b399916c64f74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=412a4f13f676fe105d75da5d2… Author: Hugh McMaster <hugh.mcmaster(a)masterindexing.com> Date: Wed Mar 19 11:54:57 2014 +1100 regsvr32: Replace printf calls with WriteConsole function. --- configure | 2 +- configure.ac | 2 +- po/ar.po | 70 +++++++++++++++++++++++++++++++++ po/bg.po | 68 ++++++++++++++++++++++++++++++++ po/ca.po | 70 +++++++++++++++++++++++++++++++++ po/cs.po | 70 +++++++++++++++++++++++++++++++++ po/da.po | 70 +++++++++++++++++++++++++++++++++ po/de.po | 70 +++++++++++++++++++++++++++++++++ po/el.po | 68 ++++++++++++++++++++++++++++++++ po/en.po | 84 +++++++++++++++++++++++++++++++++++++++ po/en_US.po | 84 +++++++++++++++++++++++++++++++++++++++ po/eo.po | 68 ++++++++++++++++++++++++++++++++ po/es.po | 70 +++++++++++++++++++++++++++++++++ po/fa.po | 68 ++++++++++++++++++++++++++++++++ po/fi.po | 70 +++++++++++++++++++++++++++++++++ po/fr.po | 70 +++++++++++++++++++++++++++++++++ po/he.po | 70 +++++++++++++++++++++++++++++++++ po/hi.po | 68 ++++++++++++++++++++++++++++++++ po/hr.po | 70 +++++++++++++++++++++++++++++++++ po/hu.po | 70 +++++++++++++++++++++++++++++++++ po/it.po | 70 +++++++++++++++++++++++++++++++++ po/ja.po | 70 +++++++++++++++++++++++++++++++++ po/ko.po | 70 +++++++++++++++++++++++++++++++++ po/lt.po | 70 +++++++++++++++++++++++++++++++++ po/ml.po | 68 ++++++++++++++++++++++++++++++++ po/nb_NO.po | 70 +++++++++++++++++++++++++++++++++ po/nl.po | 70 +++++++++++++++++++++++++++++++++ po/or.po | 68 ++++++++++++++++++++++++++++++++ po/pa.po | 68 ++++++++++++++++++++++++++++++++ po/pl.po | 70 +++++++++++++++++++++++++++++++++ po/pt_BR.po | 70 +++++++++++++++++++++++++++++++++ po/pt_PT.po | 70 +++++++++++++++++++++++++++++++++ po/rm.po | 68 ++++++++++++++++++++++++++++++++ po/ro.po | 70 +++++++++++++++++++++++++++++++++ po/ru.po | 70 +++++++++++++++++++++++++++++++++ po/sk.po | 68 ++++++++++++++++++++++++++++++++ po/sl.po | 70 +++++++++++++++++++++++++++++++++ po/sr_RS(a)cyrillic.po | 69 ++++++++++++++++++++++++++++++++ po/sr_RS(a)latin.po | 69 ++++++++++++++++++++++++++++++++ po/sv.po | 70 +++++++++++++++++++++++++++++++++ po/te.po | 68 ++++++++++++++++++++++++++++++++ po/th.po | 68 ++++++++++++++++++++++++++++++++ po/tr.po | 70 +++++++++++++++++++++++++++++++++ po/uk.po | 70 +++++++++++++++++++++++++++++++++ po/wa.po | 68 ++++++++++++++++++++++++++++++++ po/wine.pot | 68 ++++++++++++++++++++++++++++++++ po/zh_CN.po | 68 ++++++++++++++++++++++++++++++++ po/zh_TW.po | 70 +++++++++++++++++++++++++++++++++ programs/regsvr32/Makefile.in | 2 +- programs/regsvr32/regsvr32.c | 87 +++++++++++++++++++++++++++++------------ programs/regsvr32/regsvr32.h | 34 ++++++++++++++++ programs/regsvr32/regsvr32.rc | 35 ++++++++++++++++- 52 files changed, 3349 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=412a4f13f676fe105d75d…

1 0

Thomas Faber : comctl32: Make Str* functions private.
by Alexandre Julliard 26 Mar '14

26 Mar '14

Module: wine Branch: master Commit: 6609a42334a1c04b0346440b4fb24294f21c693c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6609a42334a1c04b0346440b4… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Wed Mar 26 11:03:49 2014 +0100 comctl32: Make Str* functions private. --- dlls/comctl32/comctl32.spec | 52 +++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index ef638a4..0dff369 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -62,32 +62,32 @@ 341 stdcall -noname SendNotify(long long long ptr) 342 stdcall -noname SendNotifyEx(long long long ptr long) 345 stdcall -ordinal TaskDialogIndirect(ptr ptr ptr ptr) -350 stdcall -noname StrChrA(str str) -351 stdcall -noname StrRChrA(str str long) -352 stdcall -noname StrCmpNA(str str long) -353 stdcall -noname StrCmpNIA(str str long) -354 stdcall -noname StrStrA(str str) -355 stdcall -noname StrStrIA(str str) -356 stdcall -noname StrCSpnA(str str) -357 stdcall -noname StrToIntA(str) -358 stdcall -noname StrChrW(wstr long) -359 stdcall -noname StrRChrW(wstr wstr long) -360 stdcall -noname StrCmpNW(wstr wstr long) -361 stdcall -noname StrCmpNIW(wstr wstr long) -362 stdcall -noname StrStrW(wstr wstr) -363 stdcall -noname StrStrIW(wstr wstr) -364 stdcall -noname StrCSpnW(wstr wstr) -365 stdcall -noname StrToIntW(wstr) -366 stdcall -noname StrChrIA(str long) -367 stdcall -noname StrChrIW(wstr long) -368 stdcall -noname StrRChrIA(str str long) -369 stdcall -noname StrRChrIW(wstr wstr long) -372 stdcall -noname StrRStrIA(str str str) -373 stdcall -noname StrRStrIW(wstr wstr wstr) -374 stdcall -noname StrCSpnIA(str str) -375 stdcall -noname StrCSpnIW(wstr wstr) -376 stdcall -noname IntlStrEqWorkerA(long str str long) -377 stdcall -noname IntlStrEqWorkerW(long wstr wstr long) +350 stdcall -noname -private StrChrA(str str) +351 stdcall -noname -private StrRChrA(str str long) +352 stdcall -noname -private StrCmpNA(str str long) +353 stdcall -noname -private StrCmpNIA(str str long) +354 stdcall -noname -private StrStrA(str str) +355 stdcall -noname -private StrStrIA(str str) +356 stdcall -noname -private StrCSpnA(str str) +357 stdcall -noname -private StrToIntA(str) +358 stdcall -noname -private StrChrW(wstr long) +359 stdcall -noname -private StrRChrW(wstr wstr long) +360 stdcall -noname -private StrCmpNW(wstr wstr long) +361 stdcall -noname -private StrCmpNIW(wstr wstr long) +362 stdcall -noname -private StrStrW(wstr wstr) +363 stdcall -noname -private StrStrIW(wstr wstr) +364 stdcall -noname -private StrCSpnW(wstr wstr) +365 stdcall -noname -private StrToIntW(wstr) +366 stdcall -noname -private StrChrIA(str long) +367 stdcall -noname -private StrChrIW(wstr long) +368 stdcall -noname -private StrRChrIA(str str long) +369 stdcall -noname -private StrRChrIW(wstr wstr long) +372 stdcall -noname -private StrRStrIA(str str str) +373 stdcall -noname -private StrRStrIW(wstr wstr wstr) +374 stdcall -noname -private StrCSpnIA(str str) +375 stdcall -noname -private StrCSpnIW(wstr wstr) +376 stdcall -noname -private IntlStrEqWorkerA(long str str long) +377 stdcall -noname -private IntlStrEqWorkerW(long wstr wstr long) 382 stdcall -noname SmoothScrollWindow(ptr) 383 stub -noname DoReaderMode 384 stdcall -noname SetPathWordBreakProc(ptr long)

1 0

Piotr Caban : qcap/tests: Fix AviMux test failures on Win2k.
by Alexandre Julliard 26 Mar '14

26 Mar '14

Module: wine Branch: master Commit: 085891b8f6732281829c82a9d5a4afff5df59d63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=085891b8f6732281829c82a9d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 26 10:51:34 2014 +0100 qcap/tests: Fix AviMux test failures on Win2k. --- dlls/qcap/tests/qcap.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 9479e5d..4ad4d7c 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1779,11 +1779,13 @@ static void test_AviMux(char *arg) props.cbAlign = 0xdeadbee3; props.cbPrefix = 0xdeadbee4; hr = IMemInputPin_GetAllocatorRequirements(memin, &props); - ok(hr == S_OK, "GetAllocatorRequirments returned %x\n", hr); - ok(props.cBuffers == 0xdeadbee1, "cBuffers = %d\n", props.cBuffers); - ok(props.cbBuffer == 0xdeadbee2, "cbBuffer = %d\n", props.cbBuffer); - ok(props.cbAlign == 1, "cbAlign = %d\n", props.cbAlign); - ok(props.cbPrefix == 8, "cbPrefix = %d\n", props.cbPrefix); + ok(hr==S_OK || broken(hr==E_INVALIDARG), "GetAllocatorRequirments returned %x\n", hr); + if(hr == S_OK) { + ok(props.cBuffers == 0xdeadbee1, "cBuffers = %d\n", props.cBuffers); + ok(props.cbBuffer == 0xdeadbee2, "cbBuffer = %d\n", props.cbBuffer); + ok(props.cbAlign == 1, "cbAlign = %d\n", props.cbAlign); + ok(props.cbPrefix == 8, "cbPrefix = %d\n", props.cbPrefix); + } hr = IMemInputPin_GetAllocator(memin, &memalloc); ok(hr == S_OK, "GetAllocator returned %x\n", hr); @@ -1830,7 +1832,6 @@ static void test_AviMux(char *arg) hr = IBaseFilter_Run(avimux, 0); ok(hr == S_OK, "Run returned %x\n", hr); CHECK_CALLED(MediaSeeking_GetPositions); - CHECK_CALLED(MemInputPin_QueryInterface_IStream); hr = IBaseFilter_GetState(avimux, 0, &state); ok(hr == S_OK, "GetState returned %x\n", hr); @@ -1911,6 +1912,7 @@ static void test_AviMux(char *arg) hr = IBaseFilter_Stop(avimux); ok(hr == S_OK, "Stop returned %x\n", hr); + CHECK_CALLED(MemInputPin_QueryInterface_IStream); hr = IBaseFilter_GetState(avimux, 0, &state); ok(hr == S_OK, "GetState returned %x\n", hr);

1 0

Javier Cantero : user32/tests: Add SubtractRect() test.
by Alexandre Julliard 26 Mar '14

26 Mar '14

Module: wine Branch: master Commit: 6ac11c60f01bf4286915f8e55f150f936a4db6e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac11c60f01bf4286915f8e55… Author: Javier Cantero <jcantero(a)escomposlinux.org> Date: Tue Mar 25 18:38:49 2014 +0100 user32/tests: Add SubtractRect() test. --- dlls/user32/tests/uitools.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/user32/tests/uitools.c b/dlls/user32/tests/uitools.c index c3f5508..0401448 100644 --- a/dlls/user32/tests/uitools.c +++ b/dlls/user32/tests/uitools.c @@ -63,7 +63,41 @@ static void test_FillRect(void) ReleaseDC(0, hdc); } +static void test_SubtractRect(void) +{ + RECT rect1; + RECT rect2; + RECT rectr; + BOOL result; + + /* case 1: source rectangles don't intersect */ + SetRect(&rect1, 50, 50, 150, 100); + SetRect(&rect2, 250, 200, 1500, 1000); + result = SubtractRect(&rectr, &rect1, &rect2); + ok(result, "SubtractRect returned FALSE but subtraction should not be empty\n"); + ok(result && rectr.left == 50 && rectr.top == 50 && rectr.right ==150 + && rectr.bottom == 100, "wrong rect subtraction of SubtractRect " + "(dest rect={%d, %d, %d, %d})\n", rectr.left, rectr.top, rectr.right, rectr.bottom); + + /* case 2: source rect 2 partially overlaps rect 1 */ + SetRect(&rect1, 2431, 626, 3427, 1608); + SetRect(&rect2, 2499, 626, 3427, 1608); + result = SubtractRect(&rectr, &rect1, &rect2); + ok(result, "SubtractRect returned FALSE but subtraction should not be empty\n"); + ok(result && rectr.left == 2431 && rectr.top == 626 && rectr.right == 2499 + && rectr.bottom == 1608, "wrong rect subtraction of SubtractRect " + "(dest rect={%d, %d, %d, %d})\n", rectr.left, rectr.top, rectr.right, rectr.bottom); + + /* case 3: source rect 2 completely overlaps rect 1 */ + SetRect(&rect1, 250, 250, 400, 500); + SetRect(&rect2, 50, 50, 1500, 1000); + result = SubtractRect(&rectr, &rect1, &rect2); + ok(!result, "SubtractRect returned TRUE but subtraction should be empty " + "(dest rect={%d, %d, %d, %d})\n", rectr.left, rectr.top, rectr.right, rectr.bottom); +} + START_TEST(uitools) { test_FillRect(); + test_SubtractRect(); }

1 0

Javier Cantero : user32: Fix side effect in SubtractRect().
by Alexandre Julliard 26 Mar '14

26 Mar '14

Module: wine Branch: master Commit: 1f15169f725894edfa2f33e16b8827d3d2c11a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f15169f725894edfa2f33e16… Author: Javier Cantero <jcantero(a)escomposlinux.org> Date: Thu Mar 20 16:07:32 2014 +0100 user32: Fix side effect in SubtractRect(). --- dlls/user32/uitools.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index c11a1d3..1afb1c89 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -1421,14 +1421,14 @@ BOOL WINAPI SubtractRect( LPRECT dest, const RECT *src1, const RECT *src2 ) SetRectEmpty( dest ); return FALSE; } - *dest = *src1; if (IntersectRect( &tmp, src1, src2 )) { - if (EqualRect( &tmp, dest )) + if (EqualRect( &tmp, src1 )) { SetRectEmpty( dest ); return FALSE; } + *dest = *src1; if ((tmp.top == dest->top) && (tmp.bottom == dest->bottom)) { if (tmp.left == dest->left) dest->left = tmp.right; @@ -1440,6 +1440,10 @@ BOOL WINAPI SubtractRect( LPRECT dest, const RECT *src1, const RECT *src2 ) else if (tmp.bottom == dest->bottom) dest->bottom = tmp.top; } } + else + { + *dest = *src1; + } return TRUE; }

1 0

Hermès Bélusca-Maïto : winemac.drv: Fix a typo in _MSC_VER.
by Alexandre Julliard 26 Mar '14

26 Mar '14

Module: wine Branch: master Commit: 7a7925c8728eb2b357f45c3f6ebc5b729656d3ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a7925c8728eb2b357f45c3f6… Author: Hermès Bélusca-Maïto <hermes.belusca(a)sfr.fr> Date: Tue Mar 25 18:46:13 2014 +0100 winemac.drv: Fix a typo in _MSC_VER. --- dlls/winemac.drv/macdrv_cocoa.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 564910c..1550280 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -89,7 +89,7 @@ #ifndef DECLSPEC_HIDDEN -# if defined(__MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__) +# if defined(_MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__) # define DECLSPEC_HIDDEN # elif defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) # define DECLSPEC_HIDDEN __attribute__((visibility ("hidden")))

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
53
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 March 2014