wine-commits May 2006

wine-commits@winehq.org

3 participants
863 discussions

Juan Lang : crypt32: Implement CryptBinaryToStringA and CryptStringToBinaryA.
by Alexandre Julliard 31 May '06

31 May '06

Module: wine Branch: refs/heads/master Commit: 23791c2510e8d06c9bc1b1323e070eb6b3cc39ff URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=23791c2510e8d06c9bc1b13… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed May 31 00:31:10 2006 -0700 crypt32: Implement CryptBinaryToStringA and CryptStringToBinaryA. Implement CryptBinaryToStringA and CryptStringToBinaryA based on Kai Blin's base64 encoder/decoder. --- dlls/crypt32/Makefile.in | 1 dlls/crypt32/base64.c | 579 ++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/crypt32.spec | 4 dlls/crypt32/tests/.gitignore | 1 dlls/crypt32/tests/Makefile.in | 1 dlls/crypt32/tests/base64.c | 456 ++++++++++++++++++++++++++++++++ include/wincrypt.h | 29 ++ 7 files changed, 1071 insertions(+), 0 deletions(-) create mode 100644 dlls/crypt32/base64.c create mode 100644 dlls/crypt32/tests/base64.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=23791c2510e8d06c9bc…

1 0

Mike McCormack : wineconsole: Store the font as a DWORD_PTR.
by Alexandre Julliard 31 May '06

31 May '06

Module: wine Branch: refs/heads/master Commit: 61a0799b88e38d48c257dc10386916fefcc54842 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=61a0799b88e38d48c257dc1… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed May 31 16:28:16 2006 +0900 wineconsole: Store the font as a DWORD_PTR. --- programs/wineconsole/dialog.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c index 169f4e1..73a0987 100644 --- a/programs/wineconsole/dialog.c +++ b/programs/wineconsole/dialog.c @@ -150,12 +150,12 @@ static LRESULT WINAPI WCUSER_FontPreview switch (msg) { case WM_CREATE: - SetWindowLong(hWnd, 0, 0); + SetWindowLongPtr(hWnd, 0, 0); break; case WM_GETFONT: - return GetWindowLong(hWnd, 0); + return GetWindowLongPtr(hWnd, 0); case WM_SETFONT: - SetWindowLong(hWnd, 0, wParam); + SetWindowLongPtr(hWnd, 0, wParam); if (LOWORD(lParam)) { InvalidateRect(hWnd, NULL, TRUE); @@ -164,7 +164,7 @@ static LRESULT WINAPI WCUSER_FontPreview break; case WM_DESTROY: { - HFONT hFont = (HFONT)GetWindowLong(hWnd, 0L); + HFONT hFont = (HFONT)GetWindowLongPtr(hWnd, 0L); if (hFont) DeleteObject(hFont); } break; @@ -182,7 +182,7 @@ static LRESULT WINAPI WCUSER_FontPreview font_idx = SendDlgItemMessage(di->hDlg, IDC_FNT_LIST_FONT, LB_GETCURSEL, 0L, 0L); size_idx = SendDlgItemMessage(di->hDlg, IDC_FNT_LIST_SIZE, LB_GETCURSEL, 0L, 0L); - hFont = (HFONT)GetWindowLong(hWnd, 0L); + hFont = (HFONT)GetWindowLongPtr(hWnd, 0L); if (hFont) { WCHAR buf1[256]; @@ -440,7 +440,7 @@ static BOOL select_font(struct dialog_i config.cell_height, di->font[size_idx].height); hOldFont = (HFONT)SendDlgItemMessage(di->hDlg, IDC_FNT_PREVIEW, WM_GETFONT, 0L, 0L); - SendDlgItemMessage(di->hDlg, IDC_FNT_PREVIEW, WM_SETFONT, (DWORD)hFont, TRUE); + SendDlgItemMessage(di->hDlg, IDC_FNT_PREVIEW, WM_SETFONT, (WPARAM)hFont, TRUE); if (hOldFont) DeleteObject(hOldFont); LoadString(GetModuleHandle(NULL), IDS_FNT_DISPLAY, fmt, sizeof(fmt) / sizeof(WCHAR)); @@ -764,7 +764,7 @@ BOOL WCUSER_GetProperties(struct inner_d wndclass.style = 0; wndclass.lpfnWndProc = WCUSER_FontPreviewProc; wndclass.cbClsExtra = 0; - wndclass.cbWndExtra = 4; /* for hFont */ + wndclass.cbWndExtra = sizeof (DWORD_PTR); /* for hFont */ wndclass.hInstance = GetModuleHandle(NULL); wndclass.hIcon = 0; wndclass.hCursor = LoadCursor(0, IDC_ARROW);

1 0

Mike McCormack : wineconsole: Use a Get/SetWindowLongPtr to store a pointer .
by Alexandre Julliard 31 May '06

31 May '06

Module: wine Branch: refs/heads/master Commit: 899840c964ae0f725ce05204a87bb38b9a756d3a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=899840c964ae0f725ce0520… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed May 31 16:27:39 2006 +0900 wineconsole: Use a Get/SetWindowLongPtr to store a pointer. --- programs/wineconsole/user.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index db3dd95..9053055 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -871,7 +871,7 @@ static LRESULT WCUSER_Create(HWND hWnd, HMENU hSysMenu; data = lpcs->lpCreateParams; - SetWindowLong(hWnd, 0L, (DWORD)data); + SetWindowLongPtr(hWnd, 0L, (DWORD_PTR)data); PRIVATE(data)->hWnd = hWnd; hSysMenu = GetSystemMenu(hWnd, FALSE); @@ -1081,7 +1081,7 @@ static void WCUSER_GenerateMouseInput */ static LRESULT CALLBACK WCUSER_Proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - struct inner_data* data = (struct inner_data*)GetWindowLong(hWnd, 0); + struct inner_data* data = (struct inner_data*)GetWindowLongPtr(hWnd, 0); switch (uMsg) { @@ -1400,7 +1400,7 @@ enum init_return WCUSER_InitBackend(stru wndclass.style = CS_DBLCLKS; wndclass.lpfnWndProc = WCUSER_Proc; wndclass.cbClsExtra = 0; - wndclass.cbWndExtra = sizeof(DWORD); + wndclass.cbWndExtra = sizeof(DWORD_PTR); wndclass.hInstance = GetModuleHandle(NULL); wndclass.hIcon = LoadIcon(0, IDI_WINLOGO); wndclass.hCursor = LoadCursor(0, IDC_ARROW);

1 0

Mike McCormack : wordpad: Use GetWindowLongPtr to get the HINSTANCE.
by Alexandre Julliard 31 May '06

31 May '06

Module: wine Branch: refs/heads/master Commit: 74a03d254152ecba2b8697c52273eb866685b7e9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=74a03d254152ecba2b8697c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed May 31 16:18:01 2006 +0900 wordpad: Use GetWindowLongPtr to get the HINSTANCE. --- programs/wordpad/wordpad.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 8022ef6..7392b9c 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -74,7 +74,7 @@ void AddSeparator(HWND hwndToolBar) static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) { HWND hEditorWnd, hToolBarWnd, hReBarWnd; - HINSTANCE hInstance = (HINSTANCE)GetWindowLong(hWnd, GWL_HINSTANCE); + HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE); HANDLE hDLL; TBADDBITMAP ab; int nStdBitmaps = 0;

1 0

Jacek Caban : urlmon: Added text/html filter.
by Alexandre Julliard 31 May '06

31 May '06

Module: wine Branch: refs/heads/master Commit: 796cf1713d2c9cb5778ff05fe1035da2e62703a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=796cf1713d2c9cb5778ff05… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 30 20:06:02 2006 +0200 urlmon: Added text/html filter. --- dlls/urlmon/tests/misc.c | 18 +++++++++++++++++- dlls/urlmon/urlmon_main.c | 23 ++++++++++++++++++++++- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 0a1da4a..cbd5a4a 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -350,6 +350,14 @@ static BYTE data3[] = {0,0,0}; static BYTE data4[] = {'t','e','s',0xfa,'t',' ','d','a','t','a','\n',0,0}; static BYTE data5[] = {0xa,0xa,0xa,'x',32,'x',0}; static BYTE data6[] = {0xfa,0xfa,0xfa,0xfa,'\n','\r','\t','x','x','x',1}; +static BYTE data7[] = "<html>blahblah"; +static BYTE data8[] = {'t','e','s',0xfa,'t',' ','<','h','t','m','l','>','d','a','t','a','\n',0,0}; +static BYTE data9[] = {'t','e',0,'s',0xfa,'t',' ','<','h','t','m','l','>','d','a','t','a','\n',0,0}; +static BYTE data10[] = "<HtmL>blahblah"; +static BYTE data11[] = "blah<HTML>blahblah"; +static BYTE data12[] = "blah<HTMLblahblah"; +static BYTE data13[] = "blahHTML>blahblah"; +static BYTE data14[] = "blah<HTMblahblah"; static const struct { BYTE *data; @@ -361,7 +369,15 @@ static const struct { {data3, sizeof(data3), mimeAppOctetStream}, {data4, sizeof(data4), mimeAppOctetStream}, {data5, sizeof(data5), mimeTextPlain}, - {data6, sizeof(data6), mimeTextPlain} + {data6, sizeof(data6), mimeTextPlain}, + {data7, sizeof(data7), mimeTextHtml}, + {data8, sizeof(data8), mimeTextHtml}, + {data9, sizeof(data9), mimeTextHtml}, + {data10, sizeof(data10), mimeTextHtml}, + {data11, sizeof(data11), mimeTextHtml}, + {data12, sizeof(data12), mimeTextHtml}, + {data13, sizeof(data13), mimeTextPlain}, + {data14, sizeof(data14), mimeTextPlain} }; static void test_FindMimeFromData(void) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 1c6bde5..b121a3c 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -28,7 +28,6 @@ #include "winreg.h" #define NO_SHLWAPI_REG #include "shlwapi.h" - #include "wine/debug.h" #include "wine/unicode.h" @@ -397,6 +396,26 @@ void WINAPI ReleaseBindInfo(BINDINFO* pb * * Determines the Multipurpose Internet Mail Extensions (MIME) type from the data provided. */ +static BOOL text_html_filter(LPVOID buf, DWORD size) +{ + const char *b = buf; + int i; + + if(size < 5) + return FALSE; + + for(i=0; i < size-5; i++) { + if(b[i] == '<' + && (b[i+1] == 'h' || b[i+1] == 'H') + && (b[i+2] == 't' || b[i+2] == 'T') + && (b[i+3] == 'm' || b[i+3] == 'M') + && (b[i+4] == 'l' || b[i+4] == 'L')) + return TRUE; + } + + return FALSE; +} + static BOOL text_plain_filter(LPVOID buf, DWORD size) { UCHAR *ptr; @@ -448,6 +467,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC LPCWSTR ret = NULL; int i = 0; + static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; static const WCHAR wszTextPlain[] = {'t','e','x','t','/','p','l','a','i','n','\0'}; static const WCHAR wszAppOctetStream[] = {'a','p','p','l','i','c','a','t','i','o','n','/', 'o','c','t','e','t','-','s','t','r','e','a','m','\0'}; @@ -456,6 +476,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC LPCWSTR mime; BOOL (*filter)(LPVOID,DWORD); } mime_filters[] = { + {wszTextHtml, text_html_filter}, {wszTextPlain, text_plain_filter}, {wszAppOctetStream, application_octet_stream_filter} };

1 0

Jacek Caban : urlmon: Use filters mechanism in FindMimeFromData.
by Alexandre Julliard 31 May '06

31 May '06

Module: wine Branch: refs/heads/master Commit: c73c3362c6a28ccf3d81b1cec4b942d78babc22c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c73c3362c6a28ccf3d81b1c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 30 20:05:31 2006 +0200 urlmon: Use filters mechanism in FindMimeFromData. --- dlls/urlmon/urlmon_main.c | 43 +++++++++++++++++++++++++++++++++---------- 1 files changed, 33 insertions(+), 10 deletions(-) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 0cd57bc..1c6bde5 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -397,6 +397,23 @@ void WINAPI ReleaseBindInfo(BINDINFO* pb * * Determines the Multipurpose Internet Mail Extensions (MIME) type from the data provided. */ +static BOOL text_plain_filter(LPVOID buf, DWORD size) +{ + UCHAR *ptr; + + for(ptr = buf; ptr < (UCHAR*)buf+size-1; ptr++) { + if(*ptr < 0x20 && *ptr != '\n' && *ptr != '\r' && *ptr != '\t') + return FALSE; + } + + return TRUE; +} + +static BOOL application_octet_stream_filter(LPVOID buf, DWORD size) +{ + return TRUE; +} + HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer, DWORD cbSize, LPCWSTR pwzMimeProposed, DWORD dwMimeFlags, LPWSTR* ppwzMimeOut, DWORD dwReserved) @@ -427,23 +444,29 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC } if(pBuffer) { - UCHAR *ptr = pBuffer; DWORD len; - LPCWSTR ret; + LPCWSTR ret = NULL; + int i = 0; - static const WCHAR wszAppOctetStream[] = {'a','p','p','l','i','c','a','t','i','o','n','/', - 'o','c','t','e','t','-','s','t','r','e','a','m','\0'}; static const WCHAR wszTextPlain[] = {'t','e','x','t','/','p','l','a','i','n','\0'}; + static const WCHAR wszAppOctetStream[] = {'a','p','p','l','i','c','a','t','i','o','n','/', + 'o','c','t','e','t','-','s','t','r','e','a','m','\0'}; + + static const struct { + LPCWSTR mime; + BOOL (*filter)(LPVOID,DWORD); + } mime_filters[] = { + {wszTextPlain, text_plain_filter}, + {wszAppOctetStream, application_octet_stream_filter} + }; if(!cbSize) return E_FAIL; - ret = wszTextPlain; - for(ptr = pBuffer; ptr < (UCHAR*)pBuffer+cbSize-1; ptr++) { - if(*ptr < 0x20 && *ptr != '\n' && *ptr != '\r' && *ptr != '\t') { - ret = wszAppOctetStream; - break; - } + while(!ret) { + if(mime_filters[i].filter(pBuffer, cbSize)) + ret = mime_filters[i].mime; + i++; } len = strlenW(ret)+1;

1 0

Troy Rollo : ole32: Use STGM_WRITE when opening child storage to delete its children.
by Alexandre Julliard 31 May '06

31 May '06

Module: wine Branch: refs/heads/master Commit: bdbc482651bebc944947528f48b11ce5238f9954 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bdbc482651bebc944947528… Author: Troy Rollo <wine(a)troy.rollo.name> Date: Wed May 31 12:35:53 2006 +1000 ole32: Use STGM_WRITE when opening child storage to delete its children. --- dlls/ole32/storage32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index d5e70e5..4232edf 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1867,7 +1867,7 @@ static HRESULT deleteStorageProperty( (IStorage*)parentStorage, propertyToDelete.name, 0, - STGM_SHARE_EXCLUSIVE, + STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &childStorage);

1 0

Robert Reif : winmm: Always check for open and close enents in wave test.
by Alexandre Julliard 31 May '06

31 May '06

Module: wine Branch: refs/heads/master Commit: 2b3247a4243eaa5a75448ab446a37af4b7e952f4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2b3247a4243eaa5a75448ab… Author: Robert Reif <reif(a)earthlink.net> Date: Tue May 30 18:14:18 2006 -0400 winmm: Always check for open and close enents in wave test. Always check for open and close events. Send WM_APP message to thread to terminate it rather than TerminateThread. Fix CreateThread/waveOutOpen race by waiting for background thread to run before waveOutOpen is called. Add more non-hardware supported formats. There is a bug in wave mapper GetPosition when multiple headers are used and this helps trigger it. --- dlls/winmm/tests/wave.c | 35 ++++++++++++++++++++++------------- dlls/winmm/tests/winmm_test.h | 3 +++ 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index f2972f0..3019472 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -535,14 +535,20 @@ static DWORD WINAPI callback_thread(LPVO { MSG msg; + SetEvent((HANDLE)lpParameter); + while (GetMessage(&msg, 0, 0, 0)) { UINT message = msg.message; /* for some reason XP sends a WM_USER message before WOM_OPEN */ ok (message == WOM_OPEN || message == WOM_DONE || - message == WOM_CLOSE || message == WM_USER, + message == WOM_CLOSE || message == WM_USER || message == WM_APP, "GetMessage returned unexpected message: %u\n", message); if (message == WOM_OPEN || message == WOM_DONE || message == WOM_CLOSE) SetEvent((HANDLE)lpParameter); + else if (message == WM_APP) { + SetEvent((HANDLE)lpParameter); + return 0; + } } return 0; @@ -556,7 +562,7 @@ static void wave_out_test_deviceOut(int { HWAVEOUT wout; HANDLE hevent; - WAVEHDR *frags; + WAVEHDR *frags = 0; MMRESULT rc; DWORD volume; WORD nChannels = pwfx->nChannels; @@ -568,7 +574,8 @@ static void wave_out_test_deviceOut(int DWORD callback = 0; DWORD callback_instance = 0; HANDLE thread = 0; - BYTE * buffer; + DWORD thread_id; + char * buffer; DWORD length; DWORD frag_length; int i, j; @@ -585,9 +592,10 @@ static void wave_out_test_deviceOut(int callback = (DWORD)callback_func; callback_instance = (DWORD)hevent; } else if ((flags & CALLBACK_TYPEMASK) == CALLBACK_THREAD) { - DWORD thread_id; thread = CreateThread(NULL, 0, callback_thread, hevent, 0, &thread_id); if (thread) { + /* make sure thread is running */ + WaitForSingleObject(hevent,INFINITE); callback = thread_id; callback_instance = 0; } else { @@ -636,12 +644,10 @@ static void wave_out_test_deviceOut(int pwfx->wBitsPerSample,pwfx->nChannels, flags & WAVE_FORMAT_DIRECT ? "flags=WAVE_FORMAT_DIRECT" : flags & WAVE_MAPPED ? "flags=WAVE_MAPPED" : "", mmsys_error(rc)); - if (rc!=MMSYSERR_NOERROR) { - if ((flags & CALLBACK_TYPEMASK) == CALLBACK_THREAD) - TerminateThread(thread, 0); - CloseHandle(hevent); - return; - } + if (rc!=MMSYSERR_NOERROR) + goto EXIT; + + WaitForSingleObject(hevent,INFINITE); ok(pwfx->nChannels==nChannels && pwfx->wBitsPerSample==wBitsPerSample && @@ -699,7 +705,6 @@ static void wave_out_test_deviceOut(int rc=waveOutSetVolume(wout,0x20002000); ok(has_volume ? rc==MMSYSERR_NOERROR : rc==MMSYSERR_NOTSUPPORTED, "waveOutSetVolume(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); - WaitForSingleObject(hevent,INFINITE); rc=waveOutSetVolume(wout,volume); ok(has_volume ? rc==MMSYSERR_NOERROR : rc==MMSYSERR_NOTSUPPORTED, @@ -779,8 +784,12 @@ static void wave_out_test_deviceOut(int rc=waveOutClose(wout); ok(rc==MMSYSERR_NOERROR,"waveOutClose(%s): rc=%s\n",dev_name(device), wave_out_error(rc)); - if ((flags & CALLBACK_TYPEMASK) == CALLBACK_THREAD) - TerminateThread(thread, 0); + WaitForSingleObject(hevent,INFINITE); +EXIT: + if ((flags & CALLBACK_TYPEMASK) == CALLBACK_THREAD) { + PostThreadMessage(thread_id, WM_APP, 0, 0); + WaitForSingleObject(hevent,INFINITE); + } CloseHandle(hevent); free(frags); } diff --git a/dlls/winmm/tests/winmm_test.h b/dlls/winmm/tests/winmm_test.h index e6c0242..177dc2e 100644 --- a/dlls/winmm/tests/winmm_test.h +++ b/dlls/winmm/tests/winmm_test.h @@ -43,6 +43,9 @@ static const unsigned int win_formats[][ {WAVE_FORMAT_1S08, 11025, 8, 2}, {WAVE_FORMAT_1M16, 11025, 16, 1}, {WAVE_FORMAT_1S16, 11025, 16, 2}, + {0, 12000, 8, 1}, + {0, 12000, 8, 2}, + {0, 12000, 16, 1}, {0, 12000, 16, 2}, {0, 16000, 8, 1}, {0, 16000, 8, 2},

1 0

Michael Stefaniuc : dnsapi: Fixed missing lock release on error path.
by Alexandre Julliard 31 May '06

31 May '06

Module: wine Branch: refs/heads/master Commit: 15c0db3623669af14c09fa1e41d565c289b9df5a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=15c0db3623669af14c09fa1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 30 23:39:30 2006 +0200 dnsapi: Fixed missing lock release on error path. --- dlls/dnsapi/query.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index f1b31f7..9bdd706 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -628,7 +628,10 @@ #ifdef HAVE_RESOLV _res.options |= dns_map_options( options ); if (servers && (ret = dns_set_serverlist( servers ))) + { + UNLOCK_RESOLVER(); return ret; + } ret = dns_do_query( name, type, options, result );

1 0

Stefan Dösinger : d3d8: Backport of the d3d9 swapchain test to d3d8.
by Alexandre Julliard 31 May '06

31 May '06

Module: wine Branch: refs/heads/master Commit: 6311d44488404c42d6dc2bf75bd9ff341bc034e2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6311d44488404c42d6dc2bf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 30 23:30:21 2006 +0200 d3d8: Backport of the d3d9 swapchain test to d3d8. --- dlls/d3d8/tests/device.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 117 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 9a1259d..5a5ac79 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -37,6 +37,122 @@ #define CHECK_CALL(r,c,d,rc) \ trace("%s failed: %s\n", c, DXGetErrorString8(r)); \ } +void test_swapchain(void) +{ + HRESULT hr; + HWND hwnd = NULL; + IDirect3D8 *pD3d = NULL; + IDirect3DDevice8 *pDevice = NULL; + IDirect3DSwapChain8 *swapchain1 = NULL; + IDirect3DSwapChain8 *swapchain2 = NULL; + IDirect3DSwapChain8 *swapchain3 = NULL; + IDirect3DSurface8 *backbuffer = NULL; + D3DPRESENT_PARAMETERS d3dpp; + D3DDISPLAYMODE d3ddm; + + pD3d = pDirect3DCreate8( D3D_SDK_VERSION ); + ok(pD3d != NULL, "Failed to create IDirect3D8 object\n"); + hwnd = CreateWindow( "static", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + ok(hwnd != NULL, "Failed to create window\n"); + if (!pD3d || !hwnd) goto cleanup; + + IDirect3D8_GetAdapterDisplayMode( pD3d, D3DADAPTER_DEFAULT, &d3ddm ); + ZeroMemory( &d3dpp, sizeof(d3dpp) ); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.BackBufferFormat = d3ddm.Format; + d3dpp.BackBufferCount = 0; + + hr = IDirect3D8_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); + ok(SUCCEEDED(hr), "Failed to create IDirect3D8Device (%s)\n", DXGetErrorString8(hr)); + if (FAILED(hr)) goto cleanup; + + /* Check if the back buffer count was modified */ + ok(d3dpp.BackBufferCount == 1, "The back buffer count in the presentparams struct is %d\n", d3dpp.BackBufferCount); + + /* Create a bunch of swapchains */ + d3dpp.BackBufferCount = 0; + hr = IDirect3DDevice8_CreateAdditionalSwapChain(pDevice, &d3dpp, &swapchain1); + ok(SUCCEEDED(hr), "Failed to create a swapchain (%s)\n", DXGetErrorString8(hr)); + ok(d3dpp.BackBufferCount == 1, "The back buffer count in the presentparams struct is %d\n", d3dpp.BackBufferCount); + + d3dpp.BackBufferCount = 1; + hr = IDirect3DDevice8_CreateAdditionalSwapChain(pDevice, &d3dpp, &swapchain2); + ok(SUCCEEDED(hr), "Failed to create a swapchain (%s)\n", DXGetErrorString8(hr)); + + /* Unsupported by wine for now */ + d3dpp.BackBufferCount = 2; + hr = IDirect3DDevice8_CreateAdditionalSwapChain(pDevice, &d3dpp, &swapchain3); + todo_wine ok(SUCCEEDED(hr), "Failed to create a swapchain (%s)\n", DXGetErrorString8(hr)); + if(SUCCEEDED(hr)) { + /* Swapchain 3, created with backbuffercount 2 */ + backbuffer = (void *) 0xdeadbeef; + hr = IDirect3DSwapChain8_GetBackBuffer(swapchain3, 0, 0, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get the 1st back buffer (%s)\n", DXGetErrorString8(hr)); + ok(backbuffer != NULL && backbuffer != (void *) 0xdeadbeef, "The back buffer is %p\n", backbuffer); + if(backbuffer && backbuffer != (void *) 0xdeadbeef) IDirect3DSurface8_Release(backbuffer); + + backbuffer = (void *) 0xdeadbeef; + hr = IDirect3DSwapChain8_GetBackBuffer(swapchain3, 1, 0, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get the 2nd back buffer (%s)\n", DXGetErrorString8(hr)); + ok(backbuffer != NULL && backbuffer != (void *) 0xdeadbeef, "The back buffer is %p\n", backbuffer); + if(backbuffer && backbuffer != (void *) 0xdeadbeef) IDirect3DSurface8_Release(backbuffer); + + backbuffer = (void *) 0xdeadbeef; + hr = IDirect3DSwapChain8_GetBackBuffer(swapchain3, 2, 0, &backbuffer); + ok(hr == D3DERR_INVALIDCALL, "GetBackBuffer returned %s\n", DXGetErrorString8(hr)); + ok(backbuffer == (void *) 0xdeadbeef, "The back buffer pointer was modified (%p)\n", backbuffer); + if(backbuffer && backbuffer != (void *) 0xdeadbeef) IDirect3DSurface8_Release(backbuffer); + + backbuffer = (void *) 0xdeadbeef; + hr = IDirect3DSwapChain8_GetBackBuffer(swapchain3, 3, 0, &backbuffer); + ok(FAILED(hr), "Failed to get the back buffer (%s)\n", DXGetErrorString8(hr)); + ok(backbuffer == (void *) 0xdeadbeef, "The back buffer pointer was modified (%p)\n", backbuffer); + if(backbuffer && backbuffer != (void *) 0xdeadbeef) IDirect3DSurface8_Release(backbuffer); + } + + /* Check the back buffers of the swapchains */ + /* Swapchain 1, created with backbuffercount 0 */ + hr = IDirect3DSwapChain8_GetBackBuffer(swapchain1, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get the back buffer (%s)\n", DXGetErrorString8(hr)); + ok(backbuffer != NULL, "The back buffer is NULL (%s)\n", DXGetErrorString8(hr)); + if(backbuffer) IDirect3DSurface8_Release(backbuffer); + + backbuffer = (void *) 0xdeadbeef; + hr = IDirect3DSwapChain8_GetBackBuffer(swapchain1, 1, 0, &backbuffer); + ok(FAILED(hr), "Failed to get the back buffer (%s)\n", DXGetErrorString8(hr)); + ok(backbuffer == (void *) 0xdeadbeef, "The back buffer pointer was modified (%p)\n", backbuffer); + if(backbuffer && backbuffer != (void *) 0xdeadbeef) IDirect3DSurface8_Release(backbuffer); + + /* Swapchain 2 - created with backbuffercount 1 */ + backbuffer = (void *) 0xdeadbeef; + hr = IDirect3DSwapChain8_GetBackBuffer(swapchain2, 0, 0, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get the back buffer (%s)\n", DXGetErrorString8(hr)); + ok(backbuffer != NULL && backbuffer != (void *) 0xdeadbeef, "The back buffer is %p\n", backbuffer); + if(backbuffer && backbuffer != (void *) 0xdeadbeef) IDirect3DSurface8_Release(backbuffer); + + backbuffer = (void *) 0xdeadbeef; + hr = IDirect3DSwapChain8_GetBackBuffer(swapchain2, 1, 0, &backbuffer); + ok(hr == D3DERR_INVALIDCALL, "GetBackBuffer returned %s\n", DXGetErrorString8(hr)); + ok(backbuffer == (void *) 0xdeadbeef, "The back buffer pointer was modified (%p)\n", backbuffer); + if(backbuffer && backbuffer != (void *) 0xdeadbeef) IDirect3DSurface8_Release(backbuffer); + + backbuffer = (void *) 0xdeadbeef; + hr = IDirect3DSwapChain8_GetBackBuffer(swapchain2, 2, 0, &backbuffer); + ok(FAILED(hr), "Failed to get the back buffer (%s)\n", DXGetErrorString8(hr)); + ok(backbuffer == (void *) 0xdeadbeef, "The back buffer pointer was modified (%p)\n", backbuffer); + if(backbuffer && backbuffer != (void *) 0xdeadbeef) IDirect3DSurface8_Release(backbuffer); + + cleanup: + if(swapchain1) IDirect3DSwapChain8_Release(swapchain1); + if(swapchain2) IDirect3DSwapChain8_Release(swapchain2); + if(swapchain3) IDirect3DSwapChain8_Release(swapchain3); + if(pDevice) IDirect3DDevice8_Release(pDevice); + if(pD3d) IDirect3DDevice8_Release(pD3d); + DestroyWindow( hwnd ); +} + void test_refcount(void) { HRESULT hr; @@ -189,5 +305,6 @@ START_TEST(device) if (pDirect3DCreate8) { test_refcount(); + test_swapchain(); } }

1 0

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 May 2006