September 2008 - Wine-commits

Alexandre Julliard : libwine: Add support for relocating MS-style imports that use OriginalFirstThunk.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: stable Commit: ed8204b9de40d9e83630ffe2deecdd0bf021049e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed8204b9de40d9e83630ffe2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 4 21:52:36 2008 +0200 libwine: Add support for relocating MS-style imports that use OriginalFirstThunk. (cherry picked from commit 4eb350b86b50edf84a5587f54483c22ecb5a2750) --- libs/wine/loader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 0f05f0c..dde5a70 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -277,7 +277,7 @@ static void fixup_imports( IMAGE_IMPORT_DESCRIPTOR *dir, BYTE *base, int delta ) fixup_rva_dwords( &dir->u.OriginalFirstThunk, delta, 1 ); fixup_rva_dwords( &dir->Name, delta, 1 ); fixup_rva_dwords( &dir->FirstThunk, delta, 1 ); - ptr = (UINT_PTR *)(base + dir->FirstThunk); + ptr = (UINT_PTR *)(base + (dir->u.OriginalFirstThunk ? dir->u.OriginalFirstThunk : dir->FirstThunk)); while (*ptr) { if (!(*ptr & IMAGE_ORDINAL_FLAG)) *ptr += delta;

1 0

Alexander Nicolaysen Sørnes : kernel32/ winerr: Add Norwegian Bokmå l translation.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: stable Commit: 55bf3cd71983dc452a2430419c6276eeddc82958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55bf3cd71983dc452a2430419… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Aug 20 19:19:40 2008 +0200 kernel32/winerr: Add Norwegian Bokmål translation. (cherry picked from commit edf48ea287a765674a417ad7d1161270b1a59b36) --- .gitignore | 1 + dlls/kernel32/Makefile.in | 3 +- dlls/kernel32/kernel.rc | 1 + dlls/kernel32/nls/winerr_nor.mc | 3731 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 3735 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=55bf3cd71983dc452a243…

1 0

Mikołaj Zalewski : advapi32: Remove access checks from advapi32 (makes KEY_WOW64_* work).
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: stable Commit: 12db06129c2ac3d76bac8d219a71dbc7361c634c URL: http://source.winehq.org/git/wine.git/?a=commit;h=12db06129c2ac3d76bac8d219… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Jul 24 12:19:17 2008 +0200 advapi32: Remove access checks from advapi32 (makes KEY_WOW64_* work). (cherry picked from commit daafda22f840edc9a584abc7925f9ee17ef18228) --- dlls/advapi32/registry.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 9ce3da0..3a8ff4e 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -44,9 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg); -/* allowed bits for access mask */ -#define KEY_ACCESS_MASK (KEY_ALL_ACCESS | MAXIMUM_ALLOWED) - #define HKEY_SPECIAL_ROOT_FIRST HKEY_CLASSES_ROOT #define HKEY_SPECIAL_ROOT_LAST HKEY_DYN_DATA #define NB_SPECIAL_ROOT_KEYS ((UINT)HKEY_SPECIAL_ROOT_LAST - (UINT)HKEY_SPECIAL_ROOT_FIRST + 1) @@ -188,7 +185,6 @@ LSTATUS WINAPI RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, LPWSTR UNICODE_STRING nameW, classW; if (reserved) return ERROR_INVALID_PARAMETER; - if (!(access & KEY_ACCESS_MASK) || (access & ~KEY_ACCESS_MASK)) return ERROR_ACCESS_DENIED; if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; attr.Length = sizeof(attr); @@ -243,7 +239,6 @@ LSTATUS WINAPI RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR cl access = KEY_ALL_ACCESS; /* Win95 ignores the access mask */ if (name && *name == '\\') name++; /* win9x,ME ignores one (and only one) beginning backslash */ } - else if (!(access & KEY_ACCESS_MASK) || (access & ~KEY_ACCESS_MASK)) return ERROR_ACCESS_DENIED; if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; attr.Length = sizeof(attr);

1 0

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

25 Sep '08

Module: wine Branch: stable Commit: 9906ed18cb264a37b35b8a016155881b825a81e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9906ed18cb264a37b35b8a016… 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. (cherry picked from commit b3f4091b47e70681a9909bfccd19dee95657fabd) --- dlls/user32/win.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 1824a52..11adcec 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1114,6 +1114,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

Daniel Santos : ws2_32: WSASendTo() should clear last error on success.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: stable Commit: 488ab26a836026c74cc1e35a19b80d76fe9ebd8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=488ab26a836026c74cc1e35a1… Author: Daniel Santos <daniel.santos(a)pobox.com> Date: Thu Jul 17 13:52:51 2008 -0500 ws2_32: WSASendTo() should clear last error on success. (cherry picked from commit b54b282a4f89da3809ae0e166a096bc0ebd6d52b) --- dlls/ws2_32/socket.c | 2 ++ dlls/ws2_32/tests/sock.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 889f88f..31be2b9 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2756,6 +2756,7 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, } else NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)ws2_async_apc, (ULONG_PTR)wsa, (ULONG_PTR)iosb, 0 ); + WSASetLastError(0); return 0; } @@ -2820,6 +2821,7 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, TRACE(" -> %i bytes\n", *lpNumberOfBytesSent); release_sock_fd( s, fd ); + WSASetLastError(0); return 0; error: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8ee5c37..6ba6667 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2078,6 +2078,34 @@ end: closesocket(v6); } +static void test_WSASendTo(void) +{ + SOCKET s; + struct sockaddr_in addr; + char buf[12] = "hello world"; + WSABUF data_buf; + DWORD bytesSent; + + addr.sin_family = AF_INET; + addr.sin_port = htons(139); + addr.sin_addr.s_addr = inet_addr("127.0.0.1"); + data_buf.len = sizeof(buf); + data_buf.buf = buf; + + if( (s = socket(AF_INET, SOCK_DGRAM, 0)) == INVALID_SOCKET) { + ok(0, "socket() failed error: %d\n", WSAGetLastError()); + return; + } + + WSASetLastError(12345); + if(WSASendTo(s, &data_buf, 1, &bytesSent, 0, (struct sockaddr*)&addr, sizeof(addr), NULL, NULL)) { + ok(0, "WSASendTo() failed error: %d\n", WSAGetLastError()); + return; + } + ok(!WSAGetLastError(), "WSAGetLastError() should return zero after " + "a successful call to WSASendTo()\n"); +} + /**************** Main program ***************/ START_TEST( sock ) @@ -2117,6 +2145,8 @@ START_TEST( sock ) test_send(); test_write_events(); + test_WSASendTo(); + test_ipv6only(); Exit();

1 0

Alexandre Julliard : user32: Fix MapWindowPoints behavior in the process that owns the desktop window.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: stable Commit: c13025c16b5d97f445d26f52e80bd2d86f64a612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c13025c16b5d97f445d26f52e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 22 15:31:04 2008 +0200 user32: Fix MapWindowPoints behavior in the process that owns the desktop window. (cherry picked from commit 406f5b2545d553b36d370a913a8454078797b097) --- dlls/user32/painting.c | 2 ++ dlls/user32/winpos.c | 14 ++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 436bd16..65f708e 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -623,6 +623,8 @@ static HRGN send_ncpaint( HWND hwnd, HWND *child, UINT *flags ) if (child) hwnd = *child; + if (hwnd == GetDesktopWindow()) return whole_rgn; + if (whole_rgn) { RECT client, update; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 621f89a..2077dc6 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -434,8 +434,11 @@ static void WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, POINT *offset ) } if (wndPtr == WND_DESKTOP) break; if (wndPtr == WND_OTHER_PROCESS) goto other_process; - offset->x += wndPtr->rectClient.left; - offset->y += wndPtr->rectClient.top; + if (wndPtr->parent) + { + offset->x += wndPtr->rectClient.left; + offset->y += wndPtr->rectClient.top; + } hwnd = wndPtr->parent; WIN_ReleasePtr( wndPtr ); } @@ -455,8 +458,11 @@ static void WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, POINT *offset ) } if (wndPtr == WND_DESKTOP) break; if (wndPtr == WND_OTHER_PROCESS) goto other_process; - offset->x -= wndPtr->rectClient.left; - offset->y -= wndPtr->rectClient.top; + if (wndPtr->parent) + { + offset->x -= wndPtr->rectClient.left; + offset->y -= wndPtr->rectClient.top; + } hwnd = wndPtr->parent; WIN_ReleasePtr( wndPtr ); }

1 0

Mikołaj Zalewski : shell32: autocomplete: Don' t pass NULL pceltFetched to IEnumString_Next.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: stable Commit: 0cece0820a36dae814f95093ff66d505d0bed2aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cece0820a36dae814f95093f… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Jul 24 11:22:48 2008 +0200 shell32: autocomplete: Don't pass NULL pceltFetched to IEnumString_Next. (cherry picked from commit 763018e176053b838c42e18048d5ee9dc50bcd41) --- dlls/shell32/autocomplete.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 4c32b3f..5eb76f7 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -574,7 +574,8 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, IEnumString_Reset(This->enumstr); filled = FALSE; for(cpt = 0;;) { - hr = IEnumString_Next(This->enumstr, 1, &strs, NULL); + ULONG fetched; + hr = IEnumString_Next(This->enumstr, 1, &strs, &fetched); if (hr != S_OK) break;

1 0

Mikołaj Zalewski : comctl32: Fix the file version string declaration.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: stable Commit: 0efd45abf78ec969285827e7d09356dbf63dfaa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0efd45abf78ec969285827e7d… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Jul 19 10:24:13 2008 +0200 comctl32: Fix the file version string declaration. (cherry picked from commit e016078fdf655cdc8f9b5c4c3b183cfecbe15872) --- dlls/comctl32/rsrc.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/rsrc.rc b/dlls/comctl32/rsrc.rc index 9028df9..772248a 100644 --- a/dlls/comctl32/rsrc.rc +++ b/dlls/comctl32/rsrc.rc @@ -30,9 +30,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_FILEDESCRIPTION_STR "Wine Common Controls" #define WINE_FILENAME_STR "comctl32.dll" #define WINE_FILEVERSION COMCTL32_VERSION, COMCTL32_VERSION_MINOR, 4704, 1100 -#define WINE_FILEVERSIONSTR "5.81" +#define WINE_FILEVERSION_STR "5.81" #define WINE_PRODUCTVERSION WINE_FILEVERSION -#define WINE_PRODUCTVERSION_STR WINE_FILEVERSIONSTR +#define WINE_PRODUCTVERSION_STR WINE_FILEVERSION_STR #include "wine/wine_common_ver.rc"

1 0

Mikołaj Zalewski : oleaut32: Use custom file version in VERSIONINFO.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: stable Commit: a7b76d1e4ea9dd5d4403adb14cf34357855346c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7b76d1e4ea9dd5d4403adb14… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Jul 19 10:26:20 2008 +0200 oleaut32: Use custom file version in VERSIONINFO. (cherry picked from commit 9907387b7eaadd6dd0b06b1161ebbf61d5bd009b) --- dlls/oleaut32/version.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/version.rc b/dlls/oleaut32/version.rc index 5a3f1ff..6887af3 100644 --- a/dlls/oleaut32/version.rc +++ b/dlls/oleaut32/version.rc @@ -19,5 +19,7 @@ #define WINE_OLESELFREGISTER #define WINE_FILEDESCRIPTION_STR "Wine OLE dll" #define WINE_FILENAME_STR "oleaut32.dll" +#define WINE_FILEVERSION 6, 0, 6001, 18000 /* version from Vista SP1 */ +#define WINE_FILEVERSION_STR "6.0.6001.18000" #include "wine/wine_common_ver.rc"

1 0

Dmitry Timoshkov : wine.inf: Add Baltic font substitutions.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: stable Commit: a2a94730317184fb86d047945a3d03912a9e2c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2a94730317184fb86d047945… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Jun 22 22:41:03 2008 +0900 wine.inf: Add Baltic font substitutions. (cherry picked from commit 4aa985981c835e8d03362e5a203c7134bd922f9d) --- tools/wine.inf.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 251f706..38c48d5 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -281,10 +281,12 @@ HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"windir",0x000 HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"winsysdir",,"%11%" [Fonts] +HKLM,%FontSubStr%,"Arial Baltic,186",,"Arial,186" HKLM,%FontSubStr%,"Arial CE,238",,"Arial,238" HKLM,%FontSubStr%,"Arial CYR,204",,"Arial,204" HKLM,%FontSubStr%,"Arial Greek,161",,"Arial,161" HKLM,%FontSubStr%,"Arial TUR,162",,"Arial,162" +HKLM,%FontSubStr%,"Courier New Baltic,186",,"Courier New,186" HKLM,%FontSubStr%,"Courier New CE,238",,"Courier New,238" HKLM,%FontSubStr%,"Courier New CYR,204",,"Courier New,204" HKLM,%FontSubStr%,"Courier New Greek,161",,"Courier New,161" @@ -293,6 +295,7 @@ HKLM,%FontSubStr%,"Helv",,"MS Sans Serif" HKLM,%FontSubStr%,"Helvetica",,"Arial" HKLM,%FontSubStr%,"MS Shell Dlg 2",,"Tahoma" HKLM,%FontSubStr%,"Times",,"Times New Roman" +HKLM,%FontSubStr%,"Times New Roman Baltic,186",,"Times New Roman,186" HKLM,%FontSubStr%,"Times New Roman CE,238",,"Times New Roman,238" HKLM,%FontSubStr%,"Times New Roman CYR,204",,"Times New Roman,204" HKLM,%FontSubStr%,"Times New Roman Greek,161",,"Times New Roman,161"

1 0