July 2011 - Wine-Commits - list.winehq.org

Alexandre Julliard : cmd/tests: Rewrite replace_escaped_spaces to avoid overflows.
by Alexandre Julliard July 6, 2011

July 6, 2011

Module: wine Branch: master Commit: 766dc67043e3e65a729a76014654d3250cc9e76e URL: http://source.winehq.org/git/wine.git/?a=commit;h=766dc67043e3e65a729a76014… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 6 19:51:51 2011 +0200 cmd/tests: Rewrite replace_escaped_spaces to avoid overflows. Spotted by Marcus Meissner. --- programs/cmd/tests/batch.c | 28 +++++++++------------------- 1 files changed, 9 insertions(+), 19 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 3c12fe7..95366da 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -29,29 +29,19 @@ static DWORD workdir_len; static const char* replace_escaped_spaces(const char *data, DWORD size, DWORD *new_size) { static const char escaped_space[] = {'@','s','p','a','c','e','@','\0'}; - const char *a, *b; - char *new_data; - DWORD len_space = sizeof(escaped_space) -1; + char *ptr, *new_data; - a = b = data; - *new_size = 0; + new_data = ptr = HeapAlloc(GetProcessHeap(), 0, size + 1); + memcpy( new_data, data, size ); + new_data[size] = 0; - new_data = HeapAlloc(GetProcessHeap(), 0, size*sizeof(char)); - ok(new_data != NULL, "HeapAlloc failed\n"); - if(!new_data) - return NULL; - - while( (b = strstr(a, escaped_space)) ) + while ((ptr = strstr(ptr, escaped_space))) { - strncpy(new_data + *new_size, a, b-a + 1); - *new_size += b-a + 1; - new_data[*new_size - 1] = ' '; - a = b + len_space; + char *end = ptr + sizeof(escaped_space) - 1; + *ptr++ = ' '; + memmove( ptr, end, strlen(end) + 1 ); } - - strncpy(new_data + *new_size, a, strlen(a) + 1); - *new_size += strlen(a); - + *new_size = strlen(new_data); return new_data; }

1 0

Vincent Povirk : server: Implement QS_HOTKEY.
by Alexandre Julliard July 6, 2011

July 6, 2011

Module: wine Branch: master Commit: 79556aeab740f28b651aac6c439ec713e6f26236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79556aeab740f28b651aac6c4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 26 15:52:17 2011 -0500 server: Implement QS_HOTKEY. --- server/queue.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/server/queue.c b/server/queue.c index 5dd4bf3..03b0e92 100644 --- a/server/queue.c +++ b/server/queue.c @@ -120,6 +120,7 @@ struct msg_queue unsigned int changed_bits; /* changed wakeup bits */ unsigned int changed_mask; /* changed wakeup mask */ int paint_count; /* pending paint messages count */ + int hotkey_count; /* pending hotkey messages count */ int quit_message; /* is there a pending quit message? */ int exit_code; /* exit code of pending quit message */ int cursor_count; /* per-queue cursor show count */ @@ -279,6 +280,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ queue->changed_bits = 0; queue->changed_mask = 0; queue->paint_count = 0; + queue->hotkey_count = 0; queue->quit_message = 0; queue->cursor_count = 0; queue->recv_result = NULL; @@ -600,6 +602,8 @@ static void remove_queue_message( struct msg_queue *queue, struct message *msg, case POST_MESSAGE: if (list_empty( &queue->msg_list[kind] ) && !queue->quit_message) clear_queue_bits( queue, QS_POSTMESSAGE|QS_ALLPOSTMESSAGE ); + if (msg->msg == WM_HOTKEY && --queue->hotkey_count == 0) + clear_queue_bits( queue, QS_HOTKEY ); break; } free_message( msg ); @@ -1358,7 +1362,8 @@ found: msg->data_size = 0; list_add_tail( &hotkey->queue->msg_list[POST_MESSAGE], &msg->entry ); - set_queue_bits( hotkey->queue, QS_POSTMESSAGE|QS_ALLPOSTMESSAGE ); + set_queue_bits( hotkey->queue, QS_POSTMESSAGE|QS_ALLPOSTMESSAGE|QS_HOTKEY ); + hotkey->queue->hotkey_count++; return 1; } @@ -1942,6 +1947,11 @@ void post_message( user_handle_t win, unsigned int message, lparam_t wparam, lpa list_add_tail( &thread->queue->msg_list[POST_MESSAGE], &msg->entry ); set_queue_bits( thread->queue, QS_POSTMESSAGE|QS_ALLPOSTMESSAGE ); + if (message == WM_HOTKEY) + { + set_queue_bits( thread->queue, QS_HOTKEY ); + thread->queue->hotkey_count++; + } } release_object( thread ); } @@ -2150,6 +2160,11 @@ DECL_HANDLER(send_message) case MSG_POSTED: list_add_tail( &recv_queue->msg_list[POST_MESSAGE], &msg->entry ); set_queue_bits( recv_queue, QS_POSTMESSAGE|QS_ALLPOSTMESSAGE ); + if (msg->msg == WM_HOTKEY) + { + set_queue_bits( recv_queue, QS_HOTKEY ); + recv_queue->hotkey_count++; + } break; case MSG_HARDWARE: /* should use send_hardware_message instead */ case MSG_CALLBACK_RESULT: /* cannot send this one */ @@ -2245,6 +2260,11 @@ DECL_HANDLER(get_message) get_posted_message( queue, get_win, req->get_first, req->get_last, req->flags, reply )) return; + if ((filter & QS_HOTKEY) && queue->hotkey_count && + req->get_first <= WM_HOTKEY && req->get_last >= WM_HOTKEY && + get_posted_message( queue, get_win, WM_HOTKEY, WM_HOTKEY, req->flags, reply )) + return; + /* only check for quit messages if not posted messages pending. * note: the quit message isn't filtered */ if (get_quit_message( queue, req->flags, reply ))

1 0

Jacek Caban : widl: Generate class forward declaration for coclasses.
by Alexandre Julliard July 6, 2011

July 6, 2011

Module: wine Branch: master Commit: 9afec542e0aafbc79e8338fcb274483f7c389f6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9afec542e0aafbc79e8338fcb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 6 14:08:16 2011 +0200 widl: Generate class forward declaration for coclasses. --- tools/widl/header.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 4dee484..6e288d4 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1152,6 +1152,9 @@ static void write_coclass(FILE *header, type_t *cocl) fprintf(header, " * %s coclass\n", cocl->name); fprintf(header, " */\n\n"); write_coclass_guid(header, cocl); + fprintf(header, "\n#ifdef __cplusplus\n"); + fprintf(header, "class %s;\n", cocl->name); + fprintf(header, "#endif\n"); fprintf(header, "\n"); }

1 0

Gerald Pfeifer : urlmon: Silence a compiler warning (GCC 4.6).
by Alexandre Julliard July 6, 2011

July 6, 2011

Module: wine Branch: master Commit: 7d60dd7e16bf29762eb1f438d21410c44d81c25e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d60dd7e16bf29762eb1f438d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Jul 5 03:41:35 2011 +0200 urlmon: Silence a compiler warning (GCC 4.6). --- dlls/urlmon/uri.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 6f2897a..33d0eb2 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3785,6 +3785,7 @@ static HRESULT validate_path(const UriBuilder *builder, parse_data *data, DWORD static const WCHAR nullW[] = {0}; ptr = nullW; check_len = FALSE; + expected_len = -1; } component = ptr; @@ -3798,7 +3799,7 @@ static HRESULT validate_path(const UriBuilder *builder, parse_data *data, DWORD if(!valid || (check_len && expected_len != data->path_len)) { TRACE("(%p %p %x): Invalid path component %s.\n", builder, data, flags, - debugstr_wn(component, check_len ? expected_len : -1) ); + debugstr_wn(component, expected_len) ); return INET_E_INVALID_URL; }

1 0

Matteo Bruni : d3d9/tests: Fix alpha component in the unbound sampler tests .
by Alexandre Julliard July 6, 2011

July 6, 2011

Module: wine Branch: master Commit: 8d39a85e180c5cd72dedca4fe9ffe160c35fe2d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d39a85e180c5cd72dedca4fe… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 30 15:00:35 2011 +0200 d3d9/tests: Fix alpha component in the unbound sampler tests. Spotted by Sean Sube. --- dlls/d3d9/tests/visual.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 5328447..0496896 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -235,6 +235,7 @@ static void lighting_test(IDirect3DDevice9 *device) DWORD color; D3DMATERIAL9 material, old_material; DWORD cop, carg; + DWORD old_colorwrite; float mat[16] = { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, @@ -297,6 +298,8 @@ static void lighting_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with %08x\n", hr); + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_COLORWRITEENABLE, &old_colorwrite); + ok(hr == D3D_OK, "IDirect3DDevice9_GetRenderState failed with %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_RED | D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_BLUE); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with %08x\n", hr); @@ -420,6 +423,8 @@ static void lighting_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_COLORWRITEENABLE, old_colorwrite); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with %08x\n", hr); hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, carg); ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState returned %08x\n", hr); hr = IDirect3DDevice9_SetMaterial(device, &old_material); @@ -8759,7 +8764,7 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_GetRenderTargetData(device, surf1, readback); ok(SUCCEEDED(hr), "GetRenderTargetData failed, hr %#x.\n", hr); color = getPixelColorFromSurface(readback, 8, 8); - ok(color_match(color, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00), 0), + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00), 0), "Expected color 0xff00ff00, got 0x%08x.\n", color); hr = IDirect3DDevice9_GetRenderTargetData(device, surf2, readback); ok(SUCCEEDED(hr), "GetRenderTargetData failed, hr %#x.\n", hr); @@ -12112,7 +12117,7 @@ static void unbound_sampler_test(IDirect3DDevice9 *device) } color = getPixelColorFromSurface(rt, 32, 32); - todo_wine ok(color == 0x56000000, "Unbound sampler color is %#x.\n", color); + todo_wine ok(color == 0xff000000, "Unbound sampler color is %#x.\n", color); hr = IDirect3DDevice9_SetRenderTarget(device, 0, old_rt); ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderTarget failed, hr %#x.\n", hr);

1 0

Nikolay Sivov : comctl32/tests: Simplify a workaround for old module versions, add basic PSM_ADDPAGE test.
by Alexandre Julliard July 6, 2011

July 6, 2011

Module: wine Branch: master Commit: a3ff177d7d668169ab389221aa0fdf582c09cd45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3ff177d7d668169ab389221a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 6 13:49:14 2011 +0400 comctl32/tests: Simplify a workaround for old module versions, add basic PSM_ADDPAGE test. --- dlls/comctl32/tests/propsheet.c | 111 ++++++++++++++++++++++++++------------ 1 files changed, 76 insertions(+), 35 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 42cb4c8..c6e3e9f 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -102,7 +102,7 @@ static void test_title(void) hpsp[0] = CreatePropertySheetPageA(&psp); memset(&psh, 0, sizeof(psh)); - psh.dwSize = sizeof(psh); + psh.dwSize = CCSIZEOF_STRUCT(PROPSHEETHEADERA, pfnCallback); psh.dwFlags = PSH_MODELESS | PSH_USECALLBACK; psh.pszCaption = "test caption"; psh.nPages = 1; @@ -111,12 +111,8 @@ static void test_title(void) psh.pfnCallback = sheet_callback; hdlg = (HWND)PropertySheetA(&psh); - if (hdlg == INVALID_HANDLE_VALUE) - { - win_skip("comctl32 4.70 needs dwSize adjustment\n"); - psh.dwSize = sizeof(psh) - sizeof(HBITMAP) - sizeof(HPALETTE) - sizeof(HBITMAP); - hdlg = (HWND)PropertySheetA(&psh); - } + ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle value %p\n", hdlg); + DestroyWindow(hdlg); } @@ -139,7 +135,7 @@ static void test_nopage(void) hpsp[0] = CreatePropertySheetPageA(&psp); memset(&psh, 0, sizeof(psh)); - psh.dwSize = sizeof(psh); + psh.dwSize = CCSIZEOF_STRUCT(PROPSHEETHEADERA, pfnCallback); psh.dwFlags = PSH_MODELESS | PSH_USECALLBACK; psh.pszCaption = "test caption"; psh.nPages = 1; @@ -148,12 +144,8 @@ static void test_nopage(void) psh.pfnCallback = sheet_callback; hdlg = (HWND)PropertySheetA(&psh); - if (hdlg == INVALID_HANDLE_VALUE) - { - win_skip("comctl32 4.70 needs dwSize adjustment\n"); - psh.dwSize = sizeof(psh) - sizeof(HBITMAP) - sizeof(HPALETTE) - sizeof(HBITMAP); - hdlg = (HWND)PropertySheetA(&psh); - } + ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle value %p\n", hdlg); + ShowWindow(hdlg,SW_NORMAL); SendMessage(hdlg, PSM_REMOVEPAGE, 0, 0); RedrawWindow(hdlg,NULL,NULL,RDW_UPDATENOW|RDW_ERASENOW); @@ -292,19 +284,14 @@ static void test_wiznavigation(void) /* set up the property sheet dialog */ memset(&psh, 0, sizeof(psh)); - psh.dwSize = sizeof(psh); + psh.dwSize = CCSIZEOF_STRUCT(PROPSHEETHEADERA, pfnCallback); psh.dwFlags = PSH_MODELESS | PSH_WIZARD; psh.pszCaption = "A Wizard"; psh.nPages = 4; psh.hwndParent = GetDesktopWindow(); U3(psh).phpage = hpsp; hdlg = (HWND)PropertySheetA(&psh); - if (hdlg == INVALID_HANDLE_VALUE) - { - win_skip("comctl32 4.70 needs dwSize adjustment\n"); - psh.dwSize = sizeof(psh) - sizeof(HBITMAP) - sizeof(HPALETTE) - sizeof(HBITMAP); - hdlg = (HWND)PropertySheetA(&psh); - } + ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle %p\n", hdlg); ok(active_page == 0, "Active page should be 0. Is: %d\n", active_page); @@ -395,7 +382,7 @@ static void test_buttons(void) hpsp[0] = CreatePropertySheetPageA(&psp); memset(&psh, 0, sizeof(psh)); - psh.dwSize = sizeof(psh); + psh.dwSize = CCSIZEOF_STRUCT(PROPSHEETHEADERA, pfnCallback); psh.dwFlags = PSH_MODELESS | PSH_USECALLBACK; psh.pszCaption = "test caption"; psh.nPages = 1; @@ -404,12 +391,7 @@ static void test_buttons(void) psh.pfnCallback = sheet_callback; hdlg = (HWND)PropertySheetA(&psh); - if (hdlg == INVALID_HANDLE_VALUE) - { - win_skip("comctl32 4.70 needs dwSize adjustment\n"); - psh.dwSize = sizeof(psh) - sizeof(HBITMAP) - sizeof(HPALETTE) - sizeof(HBITMAP); - hdlg = (HWND)PropertySheetA(&psh); - } + ok(hdlg != INVALID_HANDLE_VALUE, "got null handle\n"); /* OK button */ button = GetDlgItem(hdlg, IDOK); @@ -710,7 +692,7 @@ static void test_messages(void) hpsp[0] = CreatePropertySheetPageA(&psp); memset(&psh, 0, sizeof(psh)); - psh.dwSize = sizeof(psh); + psh.dwSize = CCSIZEOF_STRUCT(PROPSHEETHEADERA, pfnCallback); psh.dwFlags = PSH_NOAPPLYNOW | PSH_WIZARD | PSH_USECALLBACK | PSH_MODELESS | PSH_USEICONID; psh.pszCaption = "test caption"; @@ -720,12 +702,8 @@ static void test_messages(void) psh.pfnCallback = sheet_callback_messages; hdlg = (HWND)PropertySheetA(&psh); - if (hdlg == INVALID_HANDLE_VALUE) - { - win_skip("comctl32 4.70 needs dwSize adjustment\n"); - psh.dwSize = sizeof(psh) - sizeof(HBITMAP) - sizeof(HPALETTE) - sizeof(HBITMAP); - hdlg = (HWND)PropertySheetA(&psh); - } + ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle %p\n", hdlg); + ShowWindow(hdlg,SW_NORMAL); ok_sequence(sequences, PROPSHEET_SEQ_INDEX, property_sheet_seq, "property sheet with custom window proc", TRUE); @@ -733,6 +711,68 @@ static void test_messages(void) DestroyWindow(hdlg); } +static void test_PSM_ADDPAGE(void) +{ + HPROPSHEETPAGE hpsp[3]; + PROPSHEETPAGEA psp; + PROPSHEETHEADERA psh; + HWND hdlg, tab; + BOOL ret; + DWORD r; + + memset(&psp, 0, sizeof(psp)); + psp.dwSize = sizeof(psp); + psp.dwFlags = 0; + psp.hInstance = GetModuleHandleA(NULL); + U(psp).pszTemplate = MAKEINTRESOURCE(IDD_PROP_PAGE_MESSAGE_TEST); + U2(psp).pszIcon = NULL; + psp.pfnDlgProc = page_dlg_proc_messages; + psp.lParam = 0; + + /* two page with the same data */ + hpsp[0] = CreatePropertySheetPageA(&psp); + hpsp[1] = CreatePropertySheetPageA(&psp); + hpsp[2] = CreatePropertySheetPageA(&psp); + + memset(&psh, 0, sizeof(psh)); + psh.dwSize = sizeof(psh); + psh.dwFlags = PSH_MODELESS; + psh.pszCaption = "test caption"; + psh.nPages = 1; + psh.hwndParent = GetDesktopWindow(); + U3(psh).phpage = hpsp; + + hdlg = (HWND)PropertySheetA(&psh); + ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle %p\n", hdlg); + + /* add pages one by one */ + ret = SendMessageA(hdlg, PSM_ADDPAGE, 0, (LPARAM)hpsp[1]); + ok(ret == TRUE, "got %d\n", ret); + + /* try with null and invalid value */ + ret = SendMessageA(hdlg, PSM_ADDPAGE, 0, 0); + ok(ret == FALSE, "got %d\n", ret); + +if (0) +{ + /* crashes on native */ + ret = SendMessageA(hdlg, PSM_ADDPAGE, 0, (LPARAM)INVALID_HANDLE_VALUE); +} + /* check item count */ + tab = (HWND)SendMessageA(hdlg, PSM_GETTABCONTROL, 0, 0); + + r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); + ok(r == 2, "got %d\n", r); + + ret = SendMessageA(hdlg, PSM_ADDPAGE, 0, (LPARAM)hpsp[2]); + ok(ret == TRUE, "got %d\n", ret); + + r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); + ok(r == 3, "got %d\n", r); + + DestroyWindow(hdlg); +} + START_TEST(propsheet) { test_title(); @@ -742,4 +782,5 @@ START_TEST(propsheet) test_buttons(); test_custom_default_button(); test_messages(); + test_PSM_ADDPAGE(); }

1 0

Matteo Bruni : wined3d: Make dummy textures black.
by Alexandre Julliard July 6, 2011

July 6, 2011

Module: wine Branch: master Commit: 9d3cc8b012ea6cb9c05a6cf5d58529a5aab00084 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d3cc8b012ea6cb9c05a6cf5d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 30 15:01:07 2011 +0200 wined3d: Make dummy textures black. --- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/device.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0496896..16047bf 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12117,7 +12117,7 @@ static void unbound_sampler_test(IDirect3DDevice9 *device) } color = getPixelColorFromSurface(rt, 32, 32); - todo_wine ok(color == 0xff000000, "Unbound sampler color is %#x.\n", color); + ok(color == 0xff000000, "Unbound sampler color is %#x.\n", color); hr = IDirect3DDevice9_SetRenderTarget(device, 0, old_rt); ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderTarget failed, hr %#x.\n", hr); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a7e578a..bc9c716 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -958,11 +958,10 @@ static void create_dummy_textures(struct wined3d_device *device) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; unsigned int i; - /* Under DirectX you can have texture stage operations even if no texture is - bound, whereas opengl will only do texture operations when a valid texture is - bound. We emulate this by creating dummy textures and binding them to each - texture stage, but disable all stages by default. Hence if a stage is enabled - then the default texture will kick in until replaced by a SetTexture call */ + /* Under DirectX you can sample even if no texture is bound, whereas + * OpenGL will only allow that when a valid texture is bound. + * We emulate this by creating dummy textures and binding them + * to each texture stage when the currently set D3D texture is NULL. */ ENTER_GL(); if (gl_info->supported[APPLE_CLIENT_STORAGE]) @@ -974,7 +973,7 @@ static void create_dummy_textures(struct wined3d_device *device) for (i = 0; i < gl_info->limits.textures; ++i) { - GLubyte white = 255; + DWORD color = 0x000000ff; /* Make appropriate texture active */ GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i)); @@ -990,7 +989,7 @@ static void create_dummy_textures(struct wined3d_device *device) glBindTexture(GL_TEXTURE_2D, device->dummyTextureName[i]); checkGLcall("glBindTexture"); - glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, 1, 1, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, &white); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, &color); checkGLcall("glTexImage2D"); }

1 0

Marcus Meissner : widl: Decrease is_object_interface after usage.
by Alexandre Julliard July 6, 2011

July 6, 2011

Module: wine Branch: master Commit: 28e92027b18ee9ba48725fe153a527942f02aecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=28e92027b18ee9ba48725fe15… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Jul 6 16:00:31 2011 +0200 widl: Decrease is_object_interface after usage. --- tools/widl/header.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 6e288d4..7569995 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1267,7 +1267,7 @@ static void write_header_stmts(FILE *header, const statement_list_t *stmts, cons write_header_stmts(header, type_iface_get_stmts(iface), iface, FALSE); write_rpc_interface_end(header, iface); } - if (is_object(iface)) is_object_interface++; + if (is_object(iface)) is_object_interface--; } else if (type_get_type(stmt->u.type) == TYPE_COCLASS) write_coclass(header, stmt->u.type);

1 0

Michael Stefaniuc : d3d9: COM cleanup for the IDirect3DVertexBuffer9 iface.
by Alexandre Julliard July 6, 2011

July 6, 2011

Module: wine Branch: master Commit: 17eccaffbfa2d0be1b7c0f3d91cf14761366876d URL: http://source.winehq.org/git/wine.git/?a=commit;h=17eccaffbfa2d0be1b7c0f3d9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 6 13:29:02 2011 +0200 d3d9: COM cleanup for the IDirect3DVertexBuffer9 iface. --- dlls/d3d9/buffer.c | 42 ++++++++++++++++++++++++++---------------- dlls/d3d9/d3d9_private.h | 6 ++---- dlls/d3d9/device.c | 2 +- 3 files changed, 29 insertions(+), 21 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 11fdab4..84ee9a1 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static inline IDirect3DVertexBuffer9Impl *impl_from_IDirect3DVertexBuffer9(IDirect3DVertexBuffer9 *iface) { - return CONTAINING_RECORD(iface, IDirect3DVertexBuffer9Impl, lpVtbl); + return CONTAINING_RECORD(iface, IDirect3DVertexBuffer9Impl, IDirect3DVertexBuffer9_iface); } static HRESULT WINAPI d3d9_vertexbuffer_QueryInterface(IDirect3DVertexBuffer9 *iface, REFIID riid, void **object) @@ -50,7 +50,7 @@ static HRESULT WINAPI d3d9_vertexbuffer_QueryInterface(IDirect3DVertexBuffer9 *i static ULONG WINAPI d3d9_vertexbuffer_AddRef(IDirect3DVertexBuffer9 *iface) { - IDirect3DVertexBuffer9Impl *buffer = (IDirect3DVertexBuffer9Impl *)iface; + IDirect3DVertexBuffer9Impl *buffer = impl_from_IDirect3DVertexBuffer9(iface); ULONG refcount = InterlockedIncrement(&buffer->ref); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -68,7 +68,7 @@ static ULONG WINAPI d3d9_vertexbuffer_AddRef(IDirect3DVertexBuffer9 *iface) static ULONG WINAPI d3d9_vertexbuffer_Release(IDirect3DVertexBuffer9 *iface) { - IDirect3DVertexBuffer9Impl *buffer = (IDirect3DVertexBuffer9Impl *)iface; + IDirect3DVertexBuffer9Impl *buffer = impl_from_IDirect3DVertexBuffer9(iface); ULONG refcount = InterlockedDecrement(&buffer->ref); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -88,11 +88,14 @@ static ULONG WINAPI d3d9_vertexbuffer_Release(IDirect3DVertexBuffer9 *iface) return refcount; } -static HRESULT WINAPI d3d9_vertexbuffer_GetDevice(IDirect3DVertexBuffer9 *iface, IDirect3DDevice9 **device) +static HRESULT WINAPI d3d9_vertexbuffer_GetDevice(IDirect3DVertexBuffer9 *iface, + IDirect3DDevice9 **device) { + IDirect3DVertexBuffer9Impl *buffer = impl_from_IDirect3DVertexBuffer9(iface); + TRACE("iface %p, device %p.\n", iface, device); - *device = (IDirect3DDevice9 *)((IDirect3DVertexBuffer9Impl *)iface)->parentDevice; + *device = (IDirect3DDevice9 *)buffer->parentDevice; IDirect3DDevice9_AddRef(*device); TRACE("Returning device %p.\n", *device); @@ -154,12 +157,13 @@ static HRESULT WINAPI d3d9_vertexbuffer_FreePrivateData(IDirect3DVertexBuffer9 * static DWORD WINAPI d3d9_vertexbuffer_SetPriority(IDirect3DVertexBuffer9 *iface, DWORD priority) { + IDirect3DVertexBuffer9Impl *buffer = impl_from_IDirect3DVertexBuffer9(iface); DWORD previous; TRACE("iface %p, priority %u.\n", iface, priority); wined3d_mutex_lock(); - previous = wined3d_buffer_set_priority(((IDirect3DVertexBuffer9Impl *)iface)->wineD3DVertexBuffer, priority); + previous = wined3d_buffer_set_priority(buffer->wineD3DVertexBuffer, priority); wined3d_mutex_unlock(); return previous; @@ -167,12 +171,13 @@ static DWORD WINAPI d3d9_vertexbuffer_SetPriority(IDirect3DVertexBuffer9 *iface, static DWORD WINAPI d3d9_vertexbuffer_GetPriority(IDirect3DVertexBuffer9 *iface) { + IDirect3DVertexBuffer9Impl *buffer = impl_from_IDirect3DVertexBuffer9(iface); DWORD priority; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - priority = wined3d_buffer_get_priority(((IDirect3DVertexBuffer9Impl *)iface)->wineD3DVertexBuffer); + priority = wined3d_buffer_get_priority(buffer->wineD3DVertexBuffer); wined3d_mutex_unlock(); return priority; @@ -180,10 +185,12 @@ static DWORD WINAPI d3d9_vertexbuffer_GetPriority(IDirect3DVertexBuffer9 *iface) static void WINAPI d3d9_vertexbuffer_PreLoad(IDirect3DVertexBuffer9 *iface) { + IDirect3DVertexBuffer9Impl *buffer = impl_from_IDirect3DVertexBuffer9(iface); + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_buffer_preload(((IDirect3DVertexBuffer9Impl *)iface)->wineD3DVertexBuffer); + wined3d_buffer_preload(buffer->wineD3DVertexBuffer); wined3d_mutex_unlock(); } @@ -194,17 +201,17 @@ static D3DRESOURCETYPE WINAPI d3d9_vertexbuffer_GetType(IDirect3DVertexBuffer9 * return D3DRTYPE_VERTEXBUFFER; } -static HRESULT WINAPI d3d9_vertexbuffer_Lock(IDirect3DVertexBuffer9 *iface, - UINT offset, UINT size, void **data, DWORD flags) +static HRESULT WINAPI d3d9_vertexbuffer_Lock(IDirect3DVertexBuffer9 *iface, UINT offset, UINT size, + void **data, DWORD flags) { + IDirect3DVertexBuffer9Impl *buffer = impl_from_IDirect3DVertexBuffer9(iface); HRESULT hr; TRACE("iface %p, offset %u, size %u, data %p, flags %#x.\n", iface, offset, size, data, flags); wined3d_mutex_lock(); - hr = wined3d_buffer_map(((IDirect3DVertexBuffer9Impl *)iface)->wineD3DVertexBuffer, - offset, size, (BYTE **)data, flags); + hr = wined3d_buffer_map(buffer->wineD3DVertexBuffer, offset, size, (BYTE **)data, flags); wined3d_mutex_unlock(); return hr; @@ -212,18 +219,21 @@ static HRESULT WINAPI d3d9_vertexbuffer_Lock(IDirect3DVertexBuffer9 *iface, static HRESULT WINAPI d3d9_vertexbuffer_Unlock(IDirect3DVertexBuffer9 *iface) { + IDirect3DVertexBuffer9Impl *buffer = impl_from_IDirect3DVertexBuffer9(iface); + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_buffer_unmap(((IDirect3DVertexBuffer9Impl *)iface)->wineD3DVertexBuffer); + wined3d_buffer_unmap(buffer->wineD3DVertexBuffer); wined3d_mutex_unlock(); return D3D_OK; } -static HRESULT WINAPI d3d9_vertexbuffer_GetDesc(IDirect3DVertexBuffer9 *iface, D3DVERTEXBUFFER_DESC *desc) +static HRESULT WINAPI d3d9_vertexbuffer_GetDesc(IDirect3DVertexBuffer9 *iface, + D3DVERTEXBUFFER_DESC *desc) { - IDirect3DVertexBuffer9Impl *buffer = (IDirect3DVertexBuffer9Impl *)iface; + IDirect3DVertexBuffer9Impl *buffer = impl_from_IDirect3DVertexBuffer9(iface); struct wined3d_resource_desc wined3d_desc; struct wined3d_resource *wined3d_resource; @@ -280,7 +290,7 @@ HRESULT vertexbuffer_init(IDirect3DVertexBuffer9Impl *buffer, IDirect3DDevice9Im { HRESULT hr; - buffer->lpVtbl = &d3d9_vertexbuffer_vtbl; + buffer->IDirect3DVertexBuffer9_iface.lpVtbl = &d3d9_vertexbuffer_vtbl; buffer->ref = 1; buffer->fvf = fvf; diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 9cb33c8..fb6e7e6 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -251,10 +251,8 @@ HRESULT surface_init(IDirect3DSurface9Impl *surface, IDirect3DDevice9Impl *devic */ typedef struct IDirect3DVertexBuffer9Impl { - /* IUnknown fields */ - const IDirect3DVertexBuffer9Vtbl *lpVtbl; - LONG ref; - + IDirect3DVertexBuffer9 IDirect3DVertexBuffer9_iface; + LONG ref; struct wined3d_buffer *wineD3DVertexBuffer; IDirect3DDevice9Ex *parentDevice; DWORD fvf; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 924d43e..0f33a27 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -853,7 +853,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexBuffer(IDirect3DDevice9Ex } TRACE("Created vertex buffer %p.\n", object); - *buffer = (IDirect3DVertexBuffer9 *)object; + *buffer = &object->IDirect3DVertexBuffer9_iface; return D3D_OK; }

1 0

Michael Stefaniuc : d3d9: Use unsafe_impl_from_IDirect3DVertexShader9 for an app provided iface.
by Alexandre Julliard July 6, 2011

July 6, 2011

Module: wine Branch: master Commit: f12cbfb509a830f713ae145248fc9a379ffea903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f12cbfb509a830f713ae14524… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 6 13:20:37 2011 +0200 d3d9: Use unsafe_impl_from_IDirect3DVertexShader9 for an app provided iface. --- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 3 ++- dlls/d3d9/shader.c | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index db059bf..78e497f 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -416,6 +416,7 @@ typedef struct IDirect3DVertexShader9Impl { HRESULT vertexshader_init(IDirect3DVertexShader9Impl *shader, IDirect3DDevice9Impl *device, const DWORD *byte_code) DECLSPEC_HIDDEN; +IDirect3DVertexShader9Impl *unsafe_impl_from_IDirect3DVertexShader9(IDirect3DVertexShader9 *iface) DECLSPEC_HIDDEN; #define D3D9_MAX_VERTEX_SHADER_CONSTANTF 256 #define D3D9_MAX_SIMULTANEOUS_RENDERTARGETS 4 diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ed5abd4..46f71ca 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2298,13 +2298,14 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShader(IDirect3DDevice9Ex *i IDirect3DVertexShader9 *shader) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); + IDirect3DVertexShader9Impl *shader_obj = unsafe_impl_from_IDirect3DVertexShader9(shader); HRESULT hr; TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); hr = wined3d_device_set_vertex_shader(This->wined3d_device, - shader ? ((IDirect3DVertexShader9Impl *)shader)->wined3d_shader : NULL); + shader_obj ? shader_obj->wined3d_shader : NULL); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/shader.c b/dlls/d3d9/shader.c index 31ccfaa..a063b0c 100644 --- a/dlls/d3d9/shader.c +++ b/dlls/d3d9/shader.c @@ -23,6 +23,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); +static inline IDirect3DVertexShader9Impl *impl_from_IDirect3DVertexShader9(IDirect3DVertexShader9 *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DVertexShader9Impl, lpVtbl); +} + static HRESULT WINAPI d3d9_vertexshader_QueryInterface(IDirect3DVertexShader9 *iface, REFIID riid, void **object) { TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); @@ -151,6 +156,15 @@ HRESULT vertexshader_init(IDirect3DVertexShader9Impl *shader, IDirect3DDevice9Im return D3D_OK; } +IDirect3DVertexShader9Impl *unsafe_impl_from_IDirect3DVertexShader9(IDirect3DVertexShader9 *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d9_vertexshader_vtbl); + + return impl_from_IDirect3DVertexShader9(iface); +} + static inline IDirect3DPixelShader9Impl *impl_from_IDirect3DPixelShader9(IDirect3DPixelShader9 *iface) { return CONTAINING_RECORD(iface, IDirect3DPixelShader9Impl, IDirect3DPixelShader9_iface);

1 0