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

Alexandre Julliard : winex11: Fix X11DRV_CLIPBOARD_ReadProperty to read data in larger chunks and to properly null-terminate the buffer .
by Alexandre Julliard March 26, 2008

March 26, 2008

Module: wine Branch: master Commit: a71998d0a60fb3c67aefe1938cc794f8263a7591 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a71998d0a60fb3c67aefe1938… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 26 12:14:41 2008 +0100 winex11: Fix X11DRV_CLIPBOARD_ReadProperty to read data in larger chunks and to properly null-terminate the buffer. --- dlls/winex11.drv/clipboard.c | 87 +++++++++++++++++------------------------ 1 files changed, 36 insertions(+), 51 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 0dba308..2996857 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -72,6 +72,7 @@ # include <unistd.h> #endif #include <fcntl.h> +#include <limits.h> #include <time.h> #include <assert.h> @@ -2006,71 +2007,55 @@ static BOOL X11DRV_CLIPBOARD_ReadProperty(Window w, Atom prop, Display *display = thread_display(); Atom atype = AnyPropertyType; int aformat; - unsigned long total, nitems, remain, val_cnt; - long reqlen, bwc; - unsigned char* val; - unsigned char* buffer; + unsigned long pos = 0, nitems, remain, count; + unsigned char *val = NULL, *buffer; if (prop == None) return FALSE; - TRACE("Reading property %d from X window %d\n", - (unsigned int)prop, (unsigned int)w); + TRACE("Reading property %lu from X window %lx\n", prop, w); - /* - * First request a zero length in order to figure out the request size. - */ - wine_tsx11_lock(); - if(XGetWindowProperty(display,w,prop,0,0,False, AnyPropertyType, - &atype, &aformat, &nitems, &remain, &buffer) != Success) - { - wine_tsx11_unlock(); - WARN("Failed to get property size\n"); - return FALSE; - } - - /* Free zero length return data if any */ - if (buffer) + for (;;) { - XFree(buffer); - buffer = NULL; - } - - bwc = aformat/8; - reqlen = remain * bwc; - - TRACE("Retrieving %ld bytes\n", reqlen); - - val = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, reqlen); + wine_tsx11_lock(); + if (XGetWindowProperty(display, w, prop, pos, INT_MAX / 4, False, + AnyPropertyType, &atype, &aformat, &nitems, &remain, &buffer) != Success) + { + wine_tsx11_unlock(); + WARN("Failed to read property\n"); + HeapFree( GetProcessHeap(), 0, val ); + return FALSE; + } - /* Read property in 4K blocks */ - for (total = 0, val_cnt = 0; remain;) - { - if (XGetWindowProperty(display, w, prop, (total / 4), 4096, False, - AnyPropertyType, &atype, &aformat, &nitems, &remain, &buffer) != Success) - { - wine_tsx11_unlock(); - WARN("Failed to read property\n"); - HeapFree(GetProcessHeap(), 0, val); - return FALSE; - } + count = nitems * (aformat / 8); + if (!val) *data = HeapAlloc( GetProcessHeap(), 0, pos * sizeof(int) + count + 1 ); + else *data = HeapReAlloc( GetProcessHeap(), 0, val, pos * sizeof(int) + count + 1 ); - bwc = aformat/8; - memcpy(&val[val_cnt], buffer, nitems * bwc); - val_cnt += nitems * bwc; - total += nitems*bwc; - XFree(buffer); + if (!*data) + { + XFree( buffer ); + wine_tsx11_unlock(); + HeapFree( GetProcessHeap(), 0, val ); + return FALSE; + } + val = *data; + memcpy( (int *)val + pos, buffer, count ); + XFree( buffer ); + wine_tsx11_unlock(); + if (!remain) + { + *datasize = pos * sizeof(int) + count; + val[*datasize] = 0; + break; + } + pos += count / sizeof(int); } /* Delete the property on the window now that we are done * This will send a PropertyNotify event to the selection owner. */ + wine_tsx11_lock(); XDeleteProperty(display, w, prop); - wine_tsx11_unlock(); - - *data = val; - *datasize = total; - return TRUE; }

1 0

Lei Zhang : user32: Tweak how the edit control handles WM_GETDLGCODE.
by Alexandre Julliard March 26, 2008

March 26, 2008

Module: wine Branch: master Commit: 41ea8f0e8a6fab93fa08da16ecc24260dbad327c URL: http://source.winehq.org/git/wine.git/?a=commit;h=41ea8f0e8a6fab93fa08da16e… Author: Lei Zhang <thestig(a)google.com> Date: Tue Mar 25 19:09:38 2008 -0700 user32: Tweak how the edit control handles WM_GETDLGCODE. --- dlls/user32/edit.c | 33 +++++++++++++----- dlls/user32/tests/edit.c | 76 +++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/resource.rc | 10 +++++ 3 files changed, 110 insertions(+), 9 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index b1a0007..0ff4e7c 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -795,21 +795,36 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, result = DLGC_HASSETSEL | DLGC_WANTCHARS | DLGC_WANTARROWS; if (es->style & ES_MULTILINE) - { result |= DLGC_WANTALLKEYS; - break; - } if (lParam && (((LPMSG)lParam)->message == WM_KEYDOWN)) { int vk = (int)((LPMSG)lParam)->wParam; - if (es->hwndListBox && (vk == VK_RETURN || vk == VK_ESCAPE)) - { - if (SendMessageW(GetParent(hwnd), CB_GETDROPPEDSTATE, 0, 0)) - result |= DLGC_WANTMESSAGE; - } - } + if (es->hwndListBox) + { + if (vk == VK_RETURN || vk == VK_ESCAPE) + if (SendMessageW(GetParent(hwnd), CB_GETDROPPEDSTATE, 0, 0)) + result |= DLGC_WANTMESSAGE; + } + else + { + switch (vk) + { + case VK_RETURN: + SendMessageW(GetParent(hwnd), WM_COMMAND, IDOK, (LPARAM)GetDlgItem(GetParent(hwnd), IDOK)); + break; + case VK_ESCAPE: + SendMessageW(GetParent(hwnd), WM_CLOSE, 0, 0); + break; + case VK_TAB: + SendMessageW(GetParent(hwnd), WM_NEXTDLGCTL, (GetKeyState(VK_SHIFT) & 0x8000), 0); + break; + default: + break; + } + } + } break; case WM_IME_CHAR: diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index fae1bd1..05e6741 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -37,6 +37,70 @@ struct edit_notify { static struct edit_notify notifications; +static INT_PTR CALLBACK bug_11841_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_INITDIALOG: + { + SetFocus(GetDlgItem(hdlg, 1000)); + switch (lparam) + { + case 0: + PostMessage(GetDlgItem(hdlg, 1000), WM_KEYDOWN, 0x1b, 0x10001); + break; + case 1: + PostMessage(GetDlgItem(hdlg, 1000), WM_KEYDOWN, 0xd, 0x1c0001); + break; + case 2: + PostMessage(GetDlgItem(hdlg, 1000), WM_KEYDOWN, 0x9, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0xdeadbeef); + break; + default: + break; + } + break; + } + + case WM_COMMAND: + if (HIWORD(wparam) != BN_CLICKED) + break; + + switch (LOWORD(wparam)) + { + case IDOK: + EndDialog(hdlg, 111); + break; + + case IDCANCEL: + EndDialog(hdlg, 222); + break; + + default: + break; + } + break; + + case WM_USER: + if (wparam != 0xdeadbeef || lparam != 0xdeadbeef) + break; + if (GetFocus() == GetDlgItem(hdlg, IDOK)) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + case WM_CLOSE: + EndDialog(hdlg, 333); + break; + + default: + break; + } + + return FALSE; +} + static HINSTANCE hinst; static HWND hwndET2; static const char szEditTest2Class[] = "EditTest2Class"; @@ -1134,6 +1198,17 @@ static void test_undo(void) DestroyWindow (hwEdit); } +static void test_bug_11841(void) +{ + int r; + r = DialogBoxParam(hinst, "BUG_11841_DIALOG", NULL, (DLGPROC)bug_11841_proc, 0); + ok(333 == r, "Expected %d, got %d\n", 333, r); + r = DialogBoxParam(hinst, "BUG_11841_DIALOG", NULL, (DLGPROC)bug_11841_proc, 1); + ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParam(hinst, "BUG_11841_DIALOG", NULL, (DLGPROC)bug_11841_proc, 2); + ok(444 == r, "Expected %d, got %d\n", 444, r); +} + static BOOL RegisterWindowClasses (void) { WNDCLASSA test2; @@ -1202,6 +1277,7 @@ START_TEST(edit) test_text_position(); test_espassword(); test_undo(); + test_bug_11841(); UnregisterWindowClasses(); } diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index f01c6f5..a68857f 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -98,6 +98,16 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14 END +BUG_11841_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Bug 11841 Test" +FONT 8, "MS Shell Dlg" +{ + PUSHBUTTON "Ok", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL | ES_READONLY +} + /* @makedep: test_mono.bmp */ 100 BITMAP test_mono.bmp

1 0

Aurimas Fischer : fonts: Where possible use references to Latin glyphs in Latin-Extended glyphs.
by Alexandre Julliard March 26, 2008

March 26, 2008

Module: wine Branch: master Commit: a1bc05e4c0eb017eda7636343af80d18b1f64d6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1bc05e4c0eb017eda7636343… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Tue Mar 25 13:12:28 2008 +0200 fonts: Where possible use references to Latin glyphs in Latin-Extended glyphs. --- fonts/tahomabd.sfd | 1847 ++++++++-------------------------------------------- fonts/tahomabd.ttf | Bin 66372 -> 62316 bytes 2 files changed, 258 insertions(+), 1589 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1bc05e4c0eb017eda763…

1 0

Anatoly Lyutin : comctl32: Add HotTrackingColor into COMCTL32_SysColor structure.
by Alexandre Julliard March 26, 2008

March 26, 2008

Module: wine Branch: master Commit: d8ab4af5266f4ce8bfbed3ca3f99ad086b70d2c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8ab4af5266f4ce8bfbed3ca3… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Tue Mar 25 19:15:59 2008 +0300 comctl32: Add HotTrackingColor into COMCTL32_SysColor structure. --- dlls/comctl32/comctl32.h | 1 + dlls/comctl32/commctrl.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index 5e74a16..51320e6 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -128,6 +128,7 @@ typedef struct COLORREF clrBtnFace; /* COLOR_BTNFACE */ COLORREF clrHighlight; /* COLOR_HIGHLIGHT */ COLORREF clrHighlightText; /* COLOR_HIGHLIGHTTEXT */ + COLORREF clrHotTrackingColor; /* COLOR_HOTLIGHT */ COLORREF clr3dHilight; /* COLOR_3DHILIGHT */ COLORREF clr3dShadow; /* COLOR_3DSHADOW */ COLORREF clr3dDkShadow; /* COLOR_3DDKSHADOW */ diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 0e90197..554eb4d 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1425,6 +1425,7 @@ COMCTL32_RefreshSysColors(void) comctl32_color.clrBtnFace = GetSysColor (COLOR_BTNFACE); comctl32_color.clrHighlight = GetSysColor (COLOR_HIGHLIGHT); comctl32_color.clrHighlightText = GetSysColor (COLOR_HIGHLIGHTTEXT); + comctl32_color.clrHotTrackingColor = GetSysColor (COLOR_HOTLIGHT); comctl32_color.clr3dHilight = GetSysColor (COLOR_3DHILIGHT); comctl32_color.clr3dShadow = GetSysColor (COLOR_3DSHADOW); comctl32_color.clr3dDkShadow = GetSysColor (COLOR_3DDKSHADOW);

1 0

Alistair Leslie-Hughes : msxml3: Correct SAXXMLReader_create.
by Alexandre Julliard March 26, 2008

March 26, 2008

Module: wine Branch: master Commit: b478ec00278e6cc56be695bf3639bd376f9de114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b478ec00278e6cc56be695bf3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 26 14:40:01 2008 +1100 msxml3: Correct SAXXMLReader_create. --- dlls/msxml3/saxreader.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index d3bbbd9..4bece7f 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -362,7 +362,10 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) reader->lpVtbl = &saxreader_vtbl; reader->ref = 1; + *ppObj = &reader->lpVtbl; + TRACE("returning iface %p\n", *ppObj); + return S_OK; }

1 0

Dmitry Timoshkov : d3d9: Make the visual test pass on GeForce Go 7600.
by Alexandre Julliard March 26, 2008

March 26, 2008

Module: wine Branch: master Commit: 5c93f092c8b9c99d3599a74a3e1562e99199a687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c93f092c8b9c99d3599a74a3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Mar 26 15:15:41 2008 +0800 d3d9: Make the visual test pass on GeForce Go 7600. --- dlls/d3d9/tests/visual.c | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b117f22..1e8d9c3 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5642,6 +5642,7 @@ static void shademode_test(IDirect3DDevice9 *device) /* Render a quad and try all of the different fixed function shading models. */ HRESULT hr; DWORD color0, color1; + BYTE r, g, b; DWORD shademode = D3DSHADE_FLAT; DWORD primtype = D3DPT_TRIANGLESTRIP; LPVOID data = NULL; @@ -5736,14 +5737,31 @@ static void shademode_test(IDirect3DDevice9 *device) break; case D3DSHADE_GOURAUD: /* Should be an interpolated blend */ - ok(color0 == 0x000dca28, "GOURAUD shading has color0 %08x, expected 0x000dca28\n", color0); - ok(color1 == 0x000d45c7, "GOURAUD shading has color1 %08x, expected 0x000d45c7\n", color1); + + r = (color0 & 0x00ff0000) >> 16; + g = (color0 & 0x0000ff00) >> 8; + b = (color0 & 0x000000ff); + ok(r >= 0x0d && r <= 0x0e && g == 0xca && b >= 0x27 && b <= 0x28, + "GOURAUD shading has color0 %08x, expected 0x000dca28\n", color0); + r = (color1 & 0x00ff0000) >> 16; + g = (color1 & 0x0000ff00) >> 8; + b = (color1 & 0x000000ff); + ok(r == 0x0d && g >= 0x44 && g <= 0x45 && b >= 0xc7 && b <= 0xc8, + "GOURAUD shading has color1 %08x, expected 0x000d45c7\n", color1); shademode = D3DSHADE_PHONG; break; case D3DSHADE_PHONG: /* Should be the same as GOURAUD, since no hardware implements this */ - ok(color0 == 0x000dca28, "PHONG shading has color0 %08x, expected 0x000dca28\n", color0); - ok(color1 == 0x000d45c7, "PHONG shading has color1 %08x, expected 0x000d45c7\n", color1); + r = (color0 & 0x00ff0000) >> 16; + g = (color0 & 0x0000ff00) >> 8; + b = (color0 & 0x000000ff); + ok(r >= 0x0d && r <= 0x0e && g == 0xca && b >= 0x27 && b <= 0x28, + "PHONG shading has color0 %08x, expected 0x000dca28\n", color0); + r = (color1 & 0x00ff0000) >> 16; + g = (color1 & 0x0000ff00) >> 8; + b = (color1 & 0x000000ff); + ok(r == 0x0d && g >= 0x44 && g <= 0x45 && b >= 0xc7 && b <= 0xc8, + "PHONG shading has color1 %08x, expected 0x000d45c7\n", color1); break; } }

1 0

Dmitry Timoshkov : kernel32: Make the test compatible with win9x.
by Alexandre Julliard March 26, 2008

March 26, 2008

Module: wine Branch: master Commit: fed582de5c5f4f2c17075700e91da43a22f18d57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fed582de5c5f4f2c17075700e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Mar 26 12:25:25 2008 +0800 kernel32: Make the test compatible with win9x. --- dlls/kernel32/tests/codepage.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 201603f..6f15826 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -152,13 +152,7 @@ static void test_overlapped_buffers(void) char buf[256]; int ret; - SetLastError(0xdeadbeef); - lstrcpyW((WCHAR *)(buf + 1), strW); - if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - skip("lstrcypW is not implemented\n"); - return; - } + memcpy((WCHAR *)(buf + 1), strW, sizeof(strW)); ret = WideCharToMultiByte(CP_ACP, 0, (WCHAR *)(buf + 1), -1, buf, sizeof(buf), NULL, NULL); ok(ret == sizeof(strA), "unexpected ret %d\n", ret); ok(!memcmp(buf, strA, sizeof(strA)), "conversion failed: %s\n", buf);

1 0

Michael Stefaniuc : comdlg32: Add the Romanian translation.
by Alexandre Julliard March 26, 2008

March 26, 2008

Module: wine Branch: master Commit: 241aff1203237c20fd0ffe9c94f1acd50f33a52e URL: http://source.winehq.org/git/wine.git/?a=commit;h=241aff1203237c20fd0ffe9c9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 26 00:18:07 2008 +0100 comdlg32: Add the Romanian translation. --- dlls/comdlg32/cdlg_Ro.rc | 480 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/comdlg32/rsrc.rc | 1 + 2 files changed, 481 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=241aff1203237c20fd0ff…

1 0

Michael Stefaniuc : comdlg32: Small typo fix in the German translation.
by Alexandre Julliard March 26, 2008

March 26, 2008

Module: wine Branch: master Commit: e4d332b601b001f2c17865821cb1c20f422ab685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4d332b601b001f2c17865821… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 26 00:18:20 2008 +0100 comdlg32: Small typo fix in the German translation. --- dlls/comdlg32/cdlg_De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/cdlg_De.rc b/dlls/comdlg32/cdlg_De.rc index ed4ba97..0071588 100644 --- a/dlls/comdlg32/cdlg_De.rc +++ b/dlls/comdlg32/cdlg_De.rc @@ -74,7 +74,7 @@ FONT 8, "MS Shell Dlg" { LTEXT "Drucker:", 1088, 6, 6, 40, 9 LTEXT "", 1089, 60, 6, 150, 9 - GROUPBOX "Druckbereicht", 1072, 6, 30, 160, 65, BS_GROUPBOX + GROUPBOX "Druckbereich", 1072, 6, 30, 160, 65, BS_GROUPBOX RADIOBUTTON "&Alles", rad1, 16, 45, 60, 12 RADIOBUTTON "A&uswahl", rad2, 16, 60, 60, 12 RADIOBUTTON "&Seiten", rad3, 16, 75, 60, 12

1 0

Andrew Talbot : winecoreaudio.drv: Assign to structs instead of using memcpy.
by Alexandre Julliard March 26, 2008

March 26, 2008

Module: wine Branch: master Commit: 11f198df0bb54fbf918d025a4dcadb91602a2a05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11f198df0bb54fbf918d025a4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Mar 25 22:22:16 2008 +0000 winecoreaudio.drv: Assign to structs instead of using memcpy. --- dlls/winecoreaudio.drv/audio.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 33a5c4f..90d664f 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -855,12 +855,12 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) } wwo->state = WINE_WS_STOPPED; - + wwo->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); - - memcpy(&wwo->waveDesc, lpDesc, sizeof(WAVEOPENDESC)); + + wwo->waveDesc = *lpDesc; memcpy(&wwo->format, lpDesc->lpFormat, sizeof(PCMWAVEFORMAT)); - + if (wwo->format.wBitsPerSample == 0) { WARN("Resetting zeroed wBitsPerSample\n"); wwo->format.wBitsPerSample = 8 * @@ -1450,7 +1450,7 @@ static DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc) * DirectSound clients. However, it only does this if we respond * successfully to the DRV_QUERYDSOUNDDESC message. It's enough to fill in * the driver and device names of the description output parameter. */ - memcpy(desc, &(WOutDev[wDevID].cadev->ds_desc), sizeof(DSDRIVERDESC)); + *desc = WOutDev[wDevID].cadev->ds_desc; return MMSYSERR_NOERROR; } @@ -1837,7 +1837,7 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwi->state = WINE_WS_STOPPED; wwi->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); - memcpy(&wwi->waveDesc, lpDesc, sizeof(WAVEOPENDESC)); + wwi->waveDesc = *lpDesc; memcpy(&wwi->format, lpDesc->lpFormat, sizeof(PCMWAVEFORMAT)); if (wwi->format.wBitsPerSample == 0)

1 0