May 2008 - Wine-Commits - list.winehq.org

Michael Stefaniuc : regedit: Fix the English (NEUTRAL) translation. Rename SUBLANG_ENGLISH_US to SUBLANG_DEFAULT.
by Alexandre Julliard May 29, 2008

May 29, 2008

Module: wine Branch: master Commit: ad17ef70e8031b66977feee36ea956f00bae31ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad17ef70e8031b66977feee36… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 29 01:28:38 2008 +0200 regedit: Fix the English (NEUTRAL) translation. Rename SUBLANG_ENGLISH_US to SUBLANG_DEFAULT. --- programs/regedit/En.rc | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/programs/regedit/En.rc b/programs/regedit/En.rc index 4dc0ca4..385a821 100644 --- a/programs/regedit/En.rc +++ b/programs/regedit/En.rc @@ -26,6 +26,16 @@ STRINGTABLE DISCARDABLE BEGIN ID_FAVORITES_ADDTOFAVORITES "Adds keys to the favourites list" ID_FAVORITES_REMOVEFAVORITE "Removes keys from the favourites list" + /* Just a copy of the English (DEFAULT) strings. */ + ID_REGISTRY_EXIT "Quits the registry editor" + ID_VIEW_STATUSBAR "Shows or hides the status bar" + ID_VIEW_SPLIT "Change position of split between two panes" + ID_VIEW_REFRESH "Refreshes the window" + ID_EDIT_DELETE "Deletes the selection" + ID_EDIT_RENAME "Renames the selection" + ID_EDIT_COPYKEYNAME "Copies the name of the selected key to the clipboard" + ID_EDIT_FIND "Finds a text string in a key, value or data" + ID_EDIT_FINDNEXT "Finds next occurrence of text specified in previous search" END IDR_REGEDIT_MENU MENU DISCARDABLE @@ -85,9 +95,9 @@ BEGIN END END -/* US English Resources */ +/* English Default (US) Resources */ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT /* * Menu

1 0

Austin English : gdi32: Fix a test failure in 2k.
by Alexandre Julliard May 29, 2008

May 29, 2008

Module: wine Branch: master Commit: bde11874885e32635308acdd477dfa416fb273f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bde11874885e32635308acdd4… Author: Austin English <austinenglish(a)gmail.com> Date: Wed May 28 17:04:18 2008 -0500 gdi32: Fix a test failure in 2k. --- dlls/gdi32/tests/bitmap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index f8be7c0..06b1672 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -981,7 +981,8 @@ static void test_bitmap(void) hbmp = CreateBitmap(0x7ffffff, 1, 1, 1, NULL); if (!hbmp) { - ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY, + ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY /* XP */ || + GetLastError() == ERROR_INVALID_PARAMETER /* Win2k */, "expected ERROR_NOT_ENOUGH_MEMORY, got %u\n", GetLastError()); } else

1 0

Alexander Dorofeyev : ddraw: Do not return modes differing only by refresh rate without DDEDM_REFRESHRATES .
by Alexandre Julliard May 29, 2008

May 29, 2008

Module: wine Branch: master Commit: 940ef7a9ff86adbca7cae4f825f5911e41470a81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=940ef7a9ff86adbca7cae4f82… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu May 29 01:13:00 2008 +0300 ddraw: Do not return modes differing only by refresh rate without DDEDM_REFRESHRATES. --- dlls/ddraw/ddraw.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 230533f..ab78c4b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1243,6 +1243,8 @@ IDirectDrawImpl_EnumDisplayModes(IDirectDraw7 *iface, WINED3DFORMAT pixelformat = WINED3DFMT_UNKNOWN; WINED3DDISPLAYMODE mode; DDSURFACEDESC2 callback_sd; + WINED3DDISPLAYMODE *enum_modes = NULL; + unsigned enum_mode_count = 0, enum_mode_array_size = 0; WINED3DFORMAT checkFormatList[] = { @@ -1280,6 +1282,18 @@ IDirectDrawImpl_EnumDisplayModes(IDirectDraw7 *iface, pixelformat = PixelFormat_DD2WineD3D(&DDSD->u4.ddpfPixelFormat); } + if(!(Flags & DDEDM_REFRESHRATES)) + { + enum_mode_array_size = 16; + enum_modes = HeapAlloc(GetProcessHeap(), 0, sizeof(WINED3DDISPLAYMODE) * enum_mode_array_size); + if (!enum_modes) + { + ERR("Out of memory\n"); + LeaveCriticalSection(&ddraw_cs); + return DDERR_OUTOFMEMORY; + } + } + for(fmt = 0; fmt < (sizeof(checkFormatList) / sizeof(checkFormatList[0])); fmt++) { if(pixelformat != WINED3DFMT_UNKNOWN && checkFormatList[fmt] != pixelformat) @@ -1300,6 +1314,28 @@ IDirectDrawImpl_EnumDisplayModes(IDirectDraw7 *iface, if(DDSD->dwFlags & DDSD_HEIGHT && mode.Height != DDSD->dwHeight) continue; } + if(!(Flags & DDEDM_REFRESHRATES)) + { + /* DX docs state EnumDisplayMode should return only unique modes. If DDEDM_REFRESHRATES is not set, refresh + * rate doesn't matter when determining if the mode is unique. So modes only differing in refresh rate have + * to be reduced to a single unique result in such case. + */ + BOOL found = FALSE; + unsigned i; + + for (i = 0; i < enum_mode_count; i++) + { + if(enum_modes[i].Width == mode.Width && enum_modes[i].Height == mode.Height && + enum_modes[i].Format == mode.Format) + { + found = TRUE; + break; + } + } + + if(found) continue; + } + memset(&callback_sd, 0, sizeof(callback_sd)); callback_sd.dwSize = sizeof(callback_sd); callback_sd.u4.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); @@ -1326,13 +1362,38 @@ IDirectDrawImpl_EnumDisplayModes(IDirectDraw7 *iface, if(cb(&callback_sd, Context) == DDENUMRET_CANCEL) { TRACE("Application asked to terminate the enumeration\n"); + HeapFree(GetProcessHeap(), 0, enum_modes); LeaveCriticalSection(&ddraw_cs); return DD_OK; } + + if(!(Flags & DDEDM_REFRESHRATES)) + { + if (enum_mode_count == enum_mode_array_size) + { + WINED3DDISPLAYMODE *new_enum_modes; + + enum_mode_array_size *= 2; + new_enum_modes = HeapReAlloc(GetProcessHeap(), 0, enum_modes, sizeof(WINED3DDISPLAYMODE) * enum_mode_array_size); + + if (!new_enum_modes) + { + ERR("Out of memory\n"); + HeapFree(GetProcessHeap(), 0, enum_modes); + LeaveCriticalSection(&ddraw_cs); + return DDERR_OUTOFMEMORY; + } + + enum_modes = new_enum_modes; + } + + enum_modes[enum_mode_count++] = mode; + } } } TRACE("End of enumeration\n"); + HeapFree(GetProcessHeap(), 0, enum_modes); LeaveCriticalSection(&ddraw_cs); return DD_OK; }

1 0

Maarten Lankhorst : d3d9: Add a test to see whether offscreen surfaces can be locked while a reset occurs .
by Alexandre Julliard May 29, 2008

May 29, 2008

Module: wine Branch: master Commit: 06f65e65d0251abc6cc3e7556e41c2c22a041935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06f65e65d0251abc6cc3e7556… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed May 28 12:14:40 2008 -0700 d3d9: Add a test to see whether offscreen surfaces can be locked while a reset occurs. --- dlls/d3d9/tests/device.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 5b51c40..490593d 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -729,6 +729,7 @@ static void test_reset(void) IDirect3DVertexShader9 *shader; BOOL support_800x600 = FALSE; UINT i; + D3DLOCKED_RECT lockrect; pD3d = pDirect3DCreate9( D3D_SDK_VERSION ); ok(pD3d != NULL, "Failed to create IDirect3D9 object\n"); @@ -923,6 +924,29 @@ static void test_reset(void) ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr); IDirect3DSurface9_Release(surface); + /* Will a sysmem or scratch survive while locked */ + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(pDevice, 16, 16, D3DFMT_R5G6B5, D3DPOOL_SYSTEMMEM, &surface, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateOffscreenPlainSurface returned %s\n", DXGetErrorString9(hr)); + hr = IDirect3DSurface9_LockRect(surface, &lockrect, NULL, D3DLOCK_DISCARD); + ok(hr == D3D_OK, "IDirect3DSurface9_LockRect returned %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); + ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_TestCooperativeLevel(pDevice); + ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr); + IDirect3DSurface9_UnlockRect(surface); + IDirect3DSurface9_Release(surface); + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(pDevice, 16, 16, D3DFMT_R5G6B5, D3DPOOL_SCRATCH, &surface, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateOffscreenPlainSurface returned %s\n", DXGetErrorString9(hr)); + hr = IDirect3DSurface9_LockRect(surface, &lockrect, NULL, D3DLOCK_DISCARD); + ok(hr == D3D_OK, "IDirect3DSurface9_LockRect returned %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); + ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_TestCooperativeLevel(pDevice); + ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr); + IDirect3DSurface9_UnlockRect(surface); + IDirect3DSurface9_Release(surface); + hr = IDirect3DDevice9_CreateTexture(pDevice, 16, 16, 0, 0, D3DFMT_R5G6B5, D3DPOOL_MANAGED, &texture, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture returned %s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_Reset(pDevice, &d3dpp);

1 0

Louis Lenders : wine.inf: Add fake glu32.
by Alexandre Julliard May 29, 2008

May 29, 2008

Module: wine Branch: master Commit: 3175fc5b90b0cd72595f592a2d3208df3b0a975a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3175fc5b90b0cd72595f592a2… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed May 28 17:38:57 2008 +0000 wine.inf: Add fake glu32. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 05e4f7d..694ed94 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2251,6 +2251,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,dsound.dll 11,,dsound.vxd 11,,gdi32.dll +11,,glu32.dll 11,,hhctrl.ocx 11,,imaadp32.acm 11,,imagehlp.dll

1 0

Zachary Goldberg : WWN 347
by Jeremy Newman May 29, 2008

May 29, 2008

Module: website Branch: master Commit: 0d84a019c2a6e9cf3c0906858a178f0ec73d9fd1 URL: http://source.winehq.org/git/website.git/?a=commit;h=0d84a019c2a6e9cf3c0906… Author: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Wed May 28 21:34:53 2008 -0500 WWN 347 --- wwn/wn20080527_347.xml | 6957 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 6957 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=0d84a019c2a6e9cf3c…

1 0

Zachary Goldberg : WWN 347
by Jeremy Newman May 29, 2008

May 29, 2008

Module: website Branch: master Commit: 8a8c8983c4f6824725064e45831eb44c5fd2da38 URL: http://source.winehq.org/git/website.git/?a=commit;h=8a8c8983c4f6824725064e… Author: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Wed May 28 21:00:44 2008 -0500 WWN 347 --- news/2008052801.xml | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/news/2008052801.xml b/news/2008052801.xml new file mode 100644 index 0000000..9c99305 --- /dev/null +++ b/news/2008052801.xml @@ -0,0 +1,7 @@ +<news> + <date>May 28, 2008</date> + <title>Wine Weekly News Issue 347</title> + <body> + <a href="?issue=347">WWN Issue 347</a> was released today. + </body> +</news>

1 0

Jeff Zaroyko : update common responses to include message requesting that the user file a bug report if one does not already exist in bugzilla and the message about debug output on the AppDB
by Chris Morgan May 29, 2008

May 29, 2008

Module: appdb Branch: master Commit: 2503d2ba21fea3203f1e206d374650ae62ec7953 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2503d2ba21fea3203f1e206d… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Thu May 29 10:14:14 2008 +1000 update common responses to include message requesting that the user file a bug report if one does not already exist in bugzilla and the message about debug output on the AppDB --- include/objectManager.php | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index c3d958a..f050160 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -130,8 +130,12 @@ class ObjectManager // initialize the common responses array $this->aCommonResponses = array(); $this->aCommonResponses[] = "Thank you for your submission."; - $this->aCommonResponses[] = "Please move crash/debug output to a bug". - " in Wine's Bugzilla at http://bugs.winehq.org and resubmit."; + $this->aCommonResponses[] = "Please consider filing a bug for the ". + "problem you have with this app, if there are not bugs filed already". + " at http://bugs.winehq.org. If you want some advice or guidance on". + " this, please visit http://forum.winehq.org"; + $this->aCommonResponses[] = "Please do not paste debug output in the AppDB,". + " it belongs only as an attachment on bugzilla."; $this->aCommonResponses[] = "We appreciate your submission but it". " needs to be more detailed before it will be most useful to other users of". " the Application Database.".

1 0

Alexandre Julliard : user32: Check for wraparound in the initial window coordinates.
by Alexandre Julliard May 28, 2008

May 28, 2008

Module: wine Branch: master Commit: a6df5e7e1dd039d53c0be3f98af9088c99ea7203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6df5e7e1dd039d53c0be3f98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 28 21:32:50 2008 +0200 user32: Check for wraparound in the initial window coordinates. --- dlls/user32/tests/win.c | 25 +++++++++++++++++++++++++ dlls/user32/win.c | 3 +++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 33f8831..e60ab13 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4230,6 +4230,31 @@ static void test_CreateWindow(void) ok( rc.bottom == 0, "invalid rect bottom %u\n", rc.bottom ); DestroyWindow(hwnd); + /* we need a parent at 0,0 so that child coordinates match */ + DestroyWindow(parent); + parent = CreateWindowEx(0, "MinMax_WndClass", NULL, WS_POPUP, 0, 0, 100, 100, 0, 0, 0, NULL); + ok(parent != 0, "CreateWindowEx error %d\n", GetLastError()); + + expected_cx = 100; + expected_cy = 0x7fffffff; + SetRect( &expected_rect, 10, 10, 110, 0x7fffffff ); + hwnd = CreateWindowExA(0, "Sizes_WndClass", NULL, WS_CHILD, 10, 10, 100, 0x7fffffff, parent, 0, 0, NULL); + ok( hwnd != 0, "creation failed err %u\n", GetLastError()); + GetClientRect( hwnd, &rc ); + ok( rc.right == 100, "invalid rect right %u\n", rc.right ); + ok( rc.bottom == 0x7fffffff - 10, "invalid rect bottom %u\n", rc.bottom ); + DestroyWindow(hwnd); + + expected_cx = 0x7fffffff; + expected_cy = 0x7fffffff; + SetRect( &expected_rect, 20, 10, 0x7fffffff, 0x7fffffff ); + hwnd = CreateWindowExA(0, "Sizes_WndClass", NULL, WS_CHILD, 20, 10, 0x7fffffff, 0x7fffffff, parent, 0, 0, NULL); + ok( hwnd != 0, "creation failed err %u\n", GetLastError()); + GetClientRect( hwnd, &rc ); + ok( rc.right == 0x7fffffff - 20, "invalid rect right %u\n", rc.right ); + ok( rc.bottom == 0x7fffffff - 10, "invalid rect bottom %u\n", rc.bottom ); + DestroyWindow(hwnd); + /* top level window */ expected_cx = expected_cy = 200000; SetRect( &expected_rect, 0, 0, GetSystemMetrics(SM_CXMAXTRACK), GetSystemMetrics(SM_CYMAXTRACK) ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 71f6b55..1824a52 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1119,6 +1119,9 @@ static HWND WIN_CreateWindowEx( CREATESTRUCTA *cs, LPCWSTR className, UINT flags if (cx < 0) cx = 0; if (cy < 0) cy = 0; SetRect( &rect, cs->x, cs->y, cs->x + cx, cs->y + cy ); + /* check for wraparound */ + if (cs->x + cx < cs->x) rect.right = 0x7fffffff; + if (cs->y + cy < cs->y) rect.bottom = 0x7fffffff; if (!set_window_pos( hwnd, 0, SWP_NOZORDER | SWP_NOACTIVATE, &rect, &rect, NULL )) goto failed; /* send WM_NCCREATE */

1 0

Alexandre Julliard : winex11: XInitThreads is hopeless, remove it again.
by Alexandre Julliard May 28, 2008

May 28, 2008

Module: wine Branch: master Commit: ca34eb1612382819e978f3efe5b01374c2a1d0ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca34eb1612382819e978f3efe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 28 20:56:19 2008 +0200 winex11: XInitThreads is hopeless, remove it again. --- dlls/winex11.drv/x11drv_main.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 3287fea..4ca1bb6 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -484,7 +484,6 @@ sym_not_found: static BOOL process_attach(void) { Display *display; - const char *env; setup_options(); @@ -492,9 +491,6 @@ static BOOL process_attach(void) /* Open display */ - if (!(env = getenv("XMODIFIERS")) || !*env) /* try to avoid the Xlib XIM locking bug */ - if (!XInitThreads()) ERR( "XInitThreads failed, trouble ahead\n" ); - if (!(display = XOpenDisplay( NULL ))) return FALSE; fcntl( ConnectionNumber(display), F_SETFD, 1 ); /* set close on exec flag */

1 0