July 2008 - Wine-commits - list.winehq.org

Juan Lang : iphlpapi: Partially implement IcmpSendEcho2 using IcmpSendEcho.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: 8c4953f05a8dd39d7eaafc49bfab175119727fbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c4953f05a8dd39d7eaafc49b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 17 09:40:22 2008 -0700 iphlpapi: Partially implement IcmpSendEcho2 using IcmpSendEcho. --- dlls/iphlpapi/icmp.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/iphlpapi/iphlpapi.spec | 2 +- 2 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index d4a45e4..3abdbba 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -68,6 +68,7 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "winternl.h" #include "ipexport.h" #include "icmpapi.h" #include "wine/debug.h" @@ -476,6 +477,41 @@ DWORD WINAPI IcmpSendEcho( return res; } +/*********************************************************************** + * IcmpSendEcho2 (IPHLPAPI.@) + */ +DWORD WINAPI IcmpSendEcho2( + HANDLE IcmpHandle, + HANDLE Event, + PIO_APC_ROUTINE ApcRoutine, + PVOID ApcContext, + IPAddr DestinationAddress, + LPVOID RequestData, + WORD RequestSize, + PIP_OPTION_INFORMATION RequestOptions, + LPVOID ReplyBuffer, + DWORD ReplySize, + DWORD Timeout + ) +{ + TRACE("(%p, %p, %p, %p, %08lx, %p, %d, %p, %p, %d, %d): stub\n", IcmpHandle, + Event, ApcRoutine, ApcContext, DestinationAddress, RequestData, + RequestSize, RequestOptions, ReplyBuffer, ReplySize, Timeout); + + if (Event) + { + FIXME("unsupported for events\n"); + return 0; + } + if (ApcRoutine) + { + FIXME("unsupported for APCs\n"); + return 0; + } + return IcmpSendEcho(IcmpHandle, DestinationAddress, RequestData, + RequestSize, RequestOptions, ReplyBuffer, ReplySize, Timeout); +} + /* * Copyright (c) 1989 The Regents of the University of California. * All rights reserved. diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index c31dc49..24c4e94 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -57,7 +57,7 @@ @ stdcall IcmpCloseHandle(ptr) @ stdcall IcmpCreateFile() @ stub IcmpParseReplies -@ stub IcmpSendEcho2 +@ stdcall IcmpSendEcho2(ptr ptr ptr ptr long ptr long ptr ptr long long) @ stdcall IcmpSendEcho(ptr long ptr long ptr ptr long long) @ stub InternalCreateIpForwardEntry @ stub InternalCreateIpNetEntry

1 0

Juan Lang : iphlpapi: Move Icmp* functions from icmp to iphlpapi.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: 65549c5e58d42b4736bb47251030a6f6d0c0a66a URL: http://source.winehq.org/git/wine.git/?a=commit;h=65549c5e58d42b4736bb47251… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 17 09:39:29 2008 -0700 iphlpapi: Move Icmp* functions from icmp to iphlpapi. --- dlls/icmp/Makefile.in | 2 -- dlls/icmp/icmp.spec | 8 ++++---- dlls/iphlpapi/Makefile.in | 1 + dlls/{icmp/icmp_main.c => iphlpapi/icmp.c} | 8 ++++---- dlls/{icmp => iphlpapi}/ip.h | 0 dlls/{icmp => iphlpapi}/ip_icmp.h | 0 dlls/iphlpapi/iphlpapi.spec | 5 +++++ 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/icmp/Makefile.in b/dlls/icmp/Makefile.in index 5286e86..3154034 100644 --- a/dlls/icmp/Makefile.in +++ b/dlls/icmp/Makefile.in @@ -6,8 +6,6 @@ MODULE = icmp.dll IMPORTLIB = icmp IMPORTS = kernel32 -C_SRCS = icmp_main.c - @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/icmp/icmp.spec b/dlls/icmp/icmp.spec index 93d5b27..ec69de4 100644 --- a/dlls/icmp/icmp.spec +++ b/dlls/icmp/icmp.spec @@ -1,8 +1,8 @@ -@ stdcall IcmpCloseHandle(ptr) -@ stdcall IcmpCreateFile() +@ stdcall IcmpCloseHandle(ptr) iphlpapi.IcmpCloseHandle +@ stdcall IcmpCreateFile() iphlpapi.IcmpCreateFile @ stub IcmpParseReplies -@ stub IcmpSendEcho2 -@ stdcall IcmpSendEcho(ptr long ptr long ptr ptr long long) +@ stdcall IcmpSendEcho2(ptr ptr ptr ptr long ptr long ptr ptr long long) iphlpapi.IcmpSendEcho2 +@ stdcall IcmpSendEcho(ptr long ptr long ptr ptr long long) iphlpapi.IcmpSendEcho @ stub do_echo_rep @ stub do_echo_req @ stub register_icmp diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in index b52a1c0..76315af 100644 --- a/dlls/iphlpapi/Makefile.in +++ b/dlls/iphlpapi/Makefile.in @@ -8,6 +8,7 @@ IMPORTS = advapi32 kernel32 EXTRALIBS = @RESOLVLIBS@ C_SRCS = \ + icmp.c \ ifenum.c \ iphlpapi_main.c \ ipstats.c diff --git a/dlls/icmp/icmp_main.c b/dlls/iphlpapi/icmp.c similarity index 99% rename from dlls/icmp/icmp_main.c rename to dlls/iphlpapi/icmp.c index 82243da..d4a45e4 100644 --- a/dlls/icmp/icmp_main.c +++ b/dlls/iphlpapi/icmp.c @@ -146,7 +146,7 @@ static int in_cksum(u_short *addr, int len) */ /*********************************************************************** - * IcmpCreateFile (ICMP.@) + * IcmpCreateFile (IPHLPAPI.@) */ HANDLE WINAPI IcmpCreateFile(VOID) { @@ -171,7 +171,7 @@ HANDLE WINAPI IcmpCreateFile(VOID) /*********************************************************************** - * IcmpCloseHandle (ICMP.@) + * IcmpCloseHandle (IPHLPAPI.@) */ BOOL WINAPI IcmpCloseHandle(HANDLE IcmpHandle) { @@ -189,7 +189,7 @@ BOOL WINAPI IcmpCloseHandle(HANDLE IcmpHandle) /*********************************************************************** - * IcmpSendEcho (ICMP.@) + * IcmpSendEcho (IPHLPAPI.@) */ DWORD WINAPI IcmpSendEcho( HANDLE IcmpHandle, @@ -364,7 +364,7 @@ DWORD WINAPI IcmpSendEcho( case ICMP_UNREACH_ISOLATED: #endif #ifdef ICMP_UNREACH_HOST_PROHIB - case ICMP_UNREACH_HOST_PROHIB: + case ICMP_UNREACH_HOST_PROHIB: #endif #ifdef ICMP_UNREACH_TOSHOST case ICMP_UNREACH_TOSHOST: diff --git a/dlls/icmp/ip.h b/dlls/iphlpapi/ip.h similarity index 100% rename from dlls/icmp/ip.h rename to dlls/iphlpapi/ip.h diff --git a/dlls/icmp/ip_icmp.h b/dlls/iphlpapi/ip_icmp.h similarity index 100% rename from dlls/icmp/ip_icmp.h rename to dlls/iphlpapi/ip_icmp.h diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 5ea43c5..c31dc49 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -54,6 +54,11 @@ @ stdcall GetUdpTable( ptr ptr long ) @ stub GetUdpTableFromStack @ stdcall GetUniDirectionalAdapterInfo( ptr ptr ) +@ stdcall IcmpCloseHandle(ptr) +@ stdcall IcmpCreateFile() +@ stub IcmpParseReplies +@ stub IcmpSendEcho2 +@ stdcall IcmpSendEcho(ptr long ptr long ptr ptr long long) @ stub InternalCreateIpForwardEntry @ stub InternalCreateIpNetEntry @ stub InternalDeleteIpForwardEntry

1 0

James Hawkins : services: Assign the service manager db to the lock in LockServiceDatabase.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: d725626a2bd1dede71a631a898beba99186bc81c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d725626a2bd1dede71a631a89… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Jul 17 12:24:58 2008 -0500 services: Assign the service manager db to the lock in LockServiceDatabase. --- programs/services/rpc.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 3176a1e..ed353d4 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -897,6 +897,7 @@ DWORD svcctl_LockServiceDatabase( SC_RPC_LOCK *phLock) { struct sc_manager_handle *manager; + struct sc_lock *lock; DWORD err; WINE_TRACE("(%p, %p)\n", hSCManager, phLock); @@ -908,13 +909,16 @@ DWORD svcctl_LockServiceDatabase( if (err != ERROR_SUCCESS) return err; - *phLock = HeapAlloc(GetProcessHeap(), 0, sizeof(struct sc_lock)); - if (!*phLock) + lock = HeapAlloc(GetProcessHeap(), 0, sizeof(struct sc_lock)); + if (!lock) { scmdatabase_unlock_startup(manager->db); return ERROR_NOT_ENOUGH_SERVER_MEMORY; } + lock->db = manager->db; + *phLock = lock; + return ERROR_SUCCESS; }

1 0

Alexander Nicolaysen Sørnes : Updated Norwegian Bokmål Readme file.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: 4df06c4cfe620f3551c73cb0b2368108fa0c9c44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df06c4cfe620f3551c73cb0b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 17 21:23:26 2008 +0200 Updated Norwegian Bokmål Readme file. --- documentation/README.no | 168 +++++++++++++++++++++------------------------- 1 files changed, 77 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4df06c4cfe620f3551c73…

1 0

Alexander Nicolaysen Sørnes : regedit: Fixes for Norwegian Bokmål translation.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: 0952fd3a894f223540b042e3591632253c2a018e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0952fd3a894f223540b042e35… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 17 20:00:03 2008 +0200 regedit: Fixes for Norwegian Bokmål translation. --- programs/regedit/No.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/regedit/No.rc b/programs/regedit/No.rc index 746dc0d..62b7055 100644 --- a/programs/regedit/No.rc +++ b/programs/regedit/No.rc @@ -286,12 +286,12 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_ERROR "Feil" - IDS_BAD_KEY "Kunne ikke sp�rre n�kkelen '%s'" - IDS_BAD_VALUE "Kunne ikke sp��re verdien '%s'" - IDS_UNSUPPORTED_TYPE "Kunne ikke redigere n�kler av typen '%ld'" + IDS_BAD_KEY "Klarte ikke lese n�kkelen �%s�" + IDS_BAD_VALUE "Klarte ikke lese verdien �%s�" + IDS_UNSUPPORTED_TYPE "Kan ikke redigere n�kler av typen �%ld�" IDS_TOO_BIG_VALUE "Verdien er for stor (%ld)" IDS_DELETE_BOX_TITLE "Bekreft sletting av verdi" - IDS_DELETE_BOX_TEXT "Virkelig slette verdien '%s'?" + IDS_DELETE_BOX_TEXT "Virkelig slette verdien �%s�?" IDS_DELETE_BOX_TEXT_MULTIPLE "Virkelig slette disse verdiene?" IDS_NEWKEY "Ny n�kkel #%d" IDS_NEWVALUE "Ny verdi #%d"

1 0

Alexander Nicolaysen Sørnes : winefile: Don't access uninitialized value.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: abea9de69bf802de748f48d7e36bf514d6e94426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abea9de69bf802de748f48d7e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 17 19:53:16 2008 +0200 winefile: Don't access uninitialized value. Spotted by Dan Kegel. --- programs/winefile/winefile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 79ccbd4..311d580 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -2708,7 +2708,7 @@ static BOOL calc_widths(Pane* pane, BOOL anyway) SendMessage(pane->hwnd, LB_SETHORIZONTALEXTENT, x, 0); /* no change? */ - if (!memcmp(orgWidths, pane->widths, sizeof(orgWidths))) + if (!anyway && !memcmp(orgWidths, pane->widths, sizeof(orgWidths))) return FALSE; /* don't move, if only collapsing an entry */

1 0

Alexander Nicolaysen Sørnes : wordpad: Show error if file open fails.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: b69592416c57d12fe70811f82b7f6297bde9d7ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=b69592416c57d12fe70811f82… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 17 16:58:07 2008 +0200 wordpad: Show error if file open fails. --- programs/wordpad/En.rc | 2 ++ programs/wordpad/No.rc | 2 ++ programs/wordpad/wordpad.c | 19 +++++++++++++++++++ programs/wordpad/wordpad.h | 2 ++ 4 files changed, 25 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index d1a8473..b9e4552 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -236,4 +236,6 @@ BEGIN STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" STRING_WRITE_FAILED, "Could not save the file." STRING_WRITE_ACCESS_DENIED, "You do not have access to save the file." + STRING_OPEN_FAILED, "Could not open the file." + STRING_OPEN_ACCESS_DENIED, "You do not have access to open the file." END diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index f73b145..5a3be26 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -236,4 +236,6 @@ BEGIN STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" STRING_WRITE_FAILED, "Klarte ikke lagre filen." STRING_WRITE_ACCESS_DENIED, "Du har ikke tilgang til � lagre filen." + STRING_OPEN_FAILED, "Klarte ikke �pne filen." + STRING_OPEN_ACCESS_DENIED, "Du har ikke tilgang til � �pne filen." END diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 20fa60c..be6bb8b 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -698,6 +698,22 @@ static void set_fileformat(WPARAM format) target_device(hMainWnd, wordWrap[reg_formatindex(fileFormat)]); } +static void ShowOpenError(DWORD Code) +{ + LPWSTR Message; + + switch(Code) + { + case ERROR_ACCESS_DENIED: + Message = MAKEINTRESOURCEW(STRING_OPEN_ACCESS_DENIED); + break; + + default: + Message = MAKEINTRESOURCEW(STRING_OPEN_FAILED); + } + MessageBoxW(hMainWnd, Message, wszAppTitle, MB_ICONEXCLAMATION | MB_OK); +} + static void DoOpenFile(LPCWSTR szOpenFileName) { HANDLE hFile; @@ -709,7 +725,10 @@ static void DoOpenFile(LPCWSTR szOpenFileName) hFile = CreateFileW(szOpenFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) + { + ShowOpenError(GetLastError()); return; + } ReadFile(hFile, fileStart, 5, &readOut, NULL); SetFilePointer(hFile, 0, NULL, FILE_BEGIN); diff --git a/programs/wordpad/wordpad.h b/programs/wordpad/wordpad.h index c5305bb..96b2a25 100644 --- a/programs/wordpad/wordpad.h +++ b/programs/wordpad/wordpad.h @@ -195,6 +195,8 @@ #define STRING_OLE_STORAGE_NOT_SUPPORTED 1706 #define STRING_WRITE_FAILED 1707 #define STRING_WRITE_ACCESS_DENIED 1708 +#define STRING_OPEN_FAILED 1709 +#define STRING_OPEN_ACCESS_DENIED 1710 LPWSTR file_basename(LPWSTR);

1 0

Huw Davies : gdiplus: Skip some tests if certain fonts are not installed.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: 5aa90f375c367f7218b7b136e454e42818ccb596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aa90f375c367f7218b7b136e… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 17 16:45:31 2008 +0100 gdiplus: Skip some tests if certain fonts are not installed. --- dlls/gdiplus/tests/font.c | 88 +++++++++++++++++++++++++++----------------- 1 files changed, 54 insertions(+), 34 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 0487655..5f6494b 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -53,6 +53,11 @@ static void test_createfont(void) stat = GdipDeleteFont(font); expect (InvalidParameter, stat); stat = GdipCreateFontFamilyFromName(arial, NULL, &fontfamily); + if(stat == FontFamilyNotFound) + { + skip("Arial not installed\n"); + return; + } expect (Ok, stat); stat = GdipCreateFont(fontfamily, 12, FontStyleRegular, UnitPoint, &font); expect (Ok, stat); @@ -174,6 +179,11 @@ todo_wine } stat = GdipCreateFontFamilyFromName (arial, NULL, &family); + if(stat == FontFamilyNotFound) + { + skip("Arial not installed\n"); + return; + } expect (Ok, stat); stat = GdipGetFamilyName (family, itsName, LANG_NEUTRAL); @@ -205,46 +215,56 @@ static void test_fontfamily_properties (void) GpStatus stat; UINT16 result = 0; - GdipCreateFontFamilyFromName(arial, NULL, &FontFamily); + stat = GdipCreateFontFamilyFromName(arial, NULL, &FontFamily); + if(stat == FontFamilyNotFound) + skip("Arial not installed\n"); + else + { todo_wine { - stat = GdipGetLineSpacing(FontFamily, FontStyleRegular, &result); - expect(Ok, stat); - ok (result == 2355, "Expected 2355, got %d\n", result); + stat = GdipGetLineSpacing(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); + ok (result == 2355, "Expected 2355, got %d\n", result); } - result = 0; - stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result); - expect(Ok, stat); - ok(result == 2048, "Expected 2048, got %d\n", result); - result = 0; - stat = GdipGetCellAscent(FontFamily, FontStyleRegular, &result); - expect(Ok, stat); - ok(result == 1854, "Expected 1854, got %d\n", result); - result = 0; - stat = GdipGetCellDescent(FontFamily, FontStyleRegular, &result); - ok(result == 434, "Expected 434, got %d\n", result); - GdipDeleteFontFamily(FontFamily); - - GdipCreateFontFamilyFromName(TimesNewRoman, NULL, &FontFamily); - result = 0; + result = 0; + stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); + ok(result == 2048, "Expected 2048, got %d\n", result); + result = 0; + stat = GdipGetCellAscent(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); + ok(result == 1854, "Expected 1854, got %d\n", result); + result = 0; + stat = GdipGetCellDescent(FontFamily, FontStyleRegular, &result); + ok(result == 434, "Expected 434, got %d\n", result); + GdipDeleteFontFamily(FontFamily); + } + + stat = GdipCreateFontFamilyFromName(TimesNewRoman, NULL, &FontFamily); + if(stat == FontFamilyNotFound) + skip("Times New Roman not installed\n"); + else + { + result = 0; todo_wine { - stat = GdipGetLineSpacing(FontFamily, FontStyleRegular, &result); - expect(Ok, stat); - ok(result == 2355, "Expected 2355, got %d\n", result); + stat = GdipGetLineSpacing(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); + ok(result == 2355, "Expected 2355, got %d\n", result); } - result = 0; - stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result); - expect(Ok, stat); - ok(result == 2048, "Expected 2048, got %d\n", result); - result = 0; - stat = GdipGetCellAscent(FontFamily, FontStyleRegular, &result); - expect(Ok, stat); - ok(result == 1825, "Expected 1825, got %d\n", result); - result = 0; - stat = GdipGetCellDescent(FontFamily, FontStyleRegular, &result); - ok(result == 443, "Expected 443 got %d\n", result); - GdipDeleteFontFamily(FontFamily); + result = 0; + stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); + ok(result == 2048, "Expected 2048, got %d\n", result); + result = 0; + stat = GdipGetCellAscent(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); + ok(result == 1825, "Expected 1825, got %d\n", result); + result = 0; + stat = GdipGetCellDescent(FontFamily, FontStyleRegular, &result); + ok(result == 443, "Expected 443 got %d\n", result); + GdipDeleteFontFamily(FontFamily); + } } static void test_getgenerics (void)

1 0

Huw Davies : user32: Don't read past the end of a global memory block.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: bf89330d146f1c08bf81bd16bea90a4e8c5a8a11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf89330d146f1c08bf81bd16b… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 17 15:10:28 2008 +0100 user32: Don't read past the end of a global memory block. --- dlls/user32/tests/dde.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 56c8893..127b61d 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -178,8 +178,10 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA ok(poke->cfFormat == CF_TEXT, "Expected CF_TEXT, got %d\n", poke->cfFormat); if (msg_index == 5) - ok(lstrcmpA((LPSTR)poke->Value, "poke data\r\n"), - "Expected 'poke data\\r\\n', got %s\n", poke->Value); + { + size = GlobalSize((HGLOBAL)lo); + ok(size == 4, "got %d\n", size); + } else ok(!lstrcmpA((LPSTR)poke->Value, "poke data\r\n"), "Expected 'poke data\\r\\n', got %s\n", poke->Value);

1 0

Lei Zhang : user32: Clamp newly created windows to the minimum window size.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: b3f4091b47e70681a9909bfccd19dee95657fabd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3f4091b47e70681a9909bfcc… Author: Lei Zhang <thestig(a)google.com> Date: Mon Jul 14 16:51:15 2008 -0700 user32: Clamp newly created windows to the minimum window size. --- dlls/user32/tests/msg.c | 6 +++--- dlls/user32/win.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d79b2c4..c2012d5 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -3374,7 +3374,7 @@ static void test_mdi_messages(void) 0, 0, CW_USEDEFAULT, CW_USEDEFAULT, mdi_client, 0, GetModuleHandleA(0), NULL); assert(mdi_child2); - ok_sequence(WmCreateMDIchildInvisibleMaxSeq4, "Create maximized invisible MDI child window", TRUE); + ok_sequence(WmCreateMDIchildInvisibleMaxSeq4, "Create maximized invisible MDI child window", FALSE); ok(IsZoomed(mdi_child2), "MDI child should be maximized\n"); ok(!(GetWindowLongA(mdi_child2, GWL_STYLE) & WS_VISIBLE), "MDI child should be not visible\n"); ok(!IsWindowVisible(mdi_child2), "MDI child should be not visible\n"); @@ -4577,10 +4577,10 @@ static void test_setwindowpos(void) NULL, NULL, 0); GetWindowRect(hwnd, &rc); - todo_wine expect(sysX, rc.right); + expect(sysX, rc.right); expect(winY, rc.bottom); GetClientRect(hwnd, &rc); - todo_wine expect(sysX - 6, rc.right); + expect(sysX - 6, rc.right); expect(winY - 25, rc.bottom); flush_events(); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 9a97a3a..2b7f620 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1165,6 +1165,8 @@ static HWND WIN_CreateWindowEx( CREATESTRUCTA *cs, LPCWSTR className, UINT flags WINPOS_GetMinMaxInfo( hwnd, &maxSize, &maxPos, &minTrack, &maxTrack); if (maxTrack.x < cx) cx = maxTrack.x; if (maxTrack.y < cy) cy = maxTrack.y; + if (minTrack.x > cx) cx = minTrack.x; + if (minTrack.y > cy) cy = minTrack.y; } if (cx < 0) cx = 0;

1 0