June 2010 - Wine-Commits - list.winehq.org

Matteo Bruni : d3dx9: Fix get_regname debug function.
by Alexandre Julliard June 1, 2010

June 1, 2010

Module: wine Branch: master Commit: a262fde88c39d1a49fcd193e6372f766886c8d2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a262fde88c39d1a49fcd193e6… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Jun 1 01:27:28 2010 +0200 d3dx9: Fix get_regname debug function. --- dlls/d3dx9_36/asmutils.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/asmutils.c b/dlls/d3dx9_36/asmutils.c index bd6bcea..4fc73a5 100644 --- a/dlls/d3dx9_36/asmutils.c +++ b/dlls/d3dx9_36/asmutils.c @@ -264,13 +264,10 @@ static const char *get_regname(const struct shader_reg *reg, shader_type st) { return wine_dbg_sprintf("v%u", reg->regnum); case BWRITERSPR_CONST: return wine_dbg_sprintf("c%u", reg->regnum); - /* case BWRITERSPR_ADDR: */ + case BWRITERSPR_ADDR: + return wine_dbg_sprintf("a%u", reg->regnum); case BWRITERSPR_TEXTURE: - if(st == ST_VERTEX) { - return wine_dbg_sprintf("a%u", reg->regnum); - } else { - return wine_dbg_sprintf("t%u", reg->regnum); - } + return wine_dbg_sprintf("t%u", reg->regnum); case BWRITERSPR_RASTOUT: switch(reg->regnum) { case BWRITERSRO_POSITION: return "oPos"; @@ -280,9 +277,10 @@ static const char *get_regname(const struct shader_reg *reg, shader_type st) { } case BWRITERSPR_ATTROUT: return wine_dbg_sprintf("oD%u", reg->regnum); - /* case BWRITERSPR_TEXCRDOUT: */ + case BWRITERSPR_TEXCRDOUT: + return wine_dbg_sprintf("oT%u", reg->regnum); case BWRITERSPR_OUTPUT: - return wine_dbg_sprintf("o[T]%u", reg->regnum); + return wine_dbg_sprintf("o%u", reg->regnum); case BWRITERSPR_CONSTINT: return wine_dbg_sprintf("i%u", reg->regnum); case BWRITERSPR_COLOROUT: @@ -305,7 +303,8 @@ static const char *get_regname(const struct shader_reg *reg, shader_type st) { return wine_dbg_sprintf("l%u", reg->regnum); case BWRITERSPR_PREDICATE: return wine_dbg_sprintf("p%u", reg->regnum); - default: return "unknown regname"; + default: + return wine_dbg_sprintf("unknown regname %#x", reg->type); } }

1 0

Alexandre Julliard : comctl32/imagelist: Initialize the mask bits to zero in case the mask bitmap is smaller than the image bitmap .
by Alexandre Julliard June 1, 2010

June 1, 2010

Module: wine Branch: master Commit: 350f0d398275ceec7f17df9c5bab35d10a3b7fd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=350f0d398275ceec7f17df9c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 1 16:26:15 2010 +0200 comctl32/imagelist: Initialize the mask bits to zero in case the mask bitmap is smaller than the image bitmap. --- dlls/comctl32/imagelist.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index f699fb3..a73b423 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -181,7 +181,8 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, mask_info->bmiHeader = info->bmiHeader; mask_info->bmiHeader.biBitCount = 1; mask_info->bmiHeader.biSizeImage = mask_width * height; - if (!(mask_bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto done; + if (!(mask_bits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, info->bmiHeader.biSizeImage ))) + goto done; if (!GetDIBits( hdc, hbmMask, 0, height, mask_bits, mask_info, DIB_RGB_COLORS )) goto done; }

1 0

Alexandre Julliard : services: Start the 32-bit winedevice. exe for 32-bit kernel drivers.
by Alexandre Julliard June 1, 2010

June 1, 2010

Module: wine Branch: master Commit: 3f6f036b4d3f715be83cd40102f476032b44cb83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f6f036b4d3f715be83cd4010… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 1 13:38:21 2010 +0200 services: Start the 32-bit winedevice.exe for 32-bit kernel drivers. --- programs/services/services.c | 33 +++++++++++++++++++++++---------- 1 files changed, 23 insertions(+), 10 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index a5eb2f7..59fe8bc 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -38,6 +38,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(service); HANDLE g_hStartedEvent; struct scmdatabase *active_database; +static const int is_win64 = (sizeof(void *) > sizeof(int)); + static const WCHAR SZ_LOCAL_SYSTEM[] = {'L','o','c','a','l','S','y','s','t','e','m',0}; /* Registry constants */ @@ -548,25 +550,36 @@ static DWORD service_start_process(struct service_entry *service_entry, HANDLE * service_lock_exclusive(service_entry); + size = ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName,NULL,0); + path = HeapAlloc(GetProcessHeap(),0,size*sizeof(WCHAR)); + if (!path) return ERROR_NOT_ENOUGH_SERVER_MEMORY; + ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName,path,size); + if (service_entry->config.dwServiceType == SERVICE_KERNEL_DRIVER) { static const WCHAR winedeviceW[] = {'\\','w','i','n','e','d','e','v','i','c','e','.','e','x','e',' ',0}; - DWORD len = GetSystemDirectoryW( NULL, 0 ) + sizeof(winedeviceW)/sizeof(WCHAR) + strlenW(service_entry->name); + WCHAR system_dir[MAX_PATH]; + DWORD type, len; + GetSystemDirectoryW( system_dir, MAX_PATH ); + if (is_win64) + { + if (!GetBinaryTypeW( path, &type )) + { + HeapFree( GetProcessHeap(), 0, path ); + return GetLastError(); + } + if (type == SCS_32BIT_BINARY) GetSystemWow64DirectoryW( system_dir, MAX_PATH ); + } + + len = strlenW( system_dir ) + sizeof(winedeviceW)/sizeof(WCHAR) + strlenW(service_entry->name); + HeapFree( GetProcessHeap(), 0, path ); if (!(path = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return ERROR_NOT_ENOUGH_SERVER_MEMORY; - GetSystemDirectoryW( path, len ); + lstrcpyW( path, system_dir ); lstrcatW( path, winedeviceW ); lstrcatW( path, service_entry->name ); } - else - { - size = ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName,NULL,0); - path = HeapAlloc(GetProcessHeap(),0,size*sizeof(WCHAR)); - if (!path) - return ERROR_NOT_ENOUGH_SERVER_MEMORY; - ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName,path,size); - } ZeroMemory(&si, sizeof(STARTUPINFOW)); si.cb = sizeof(STARTUPINFOW);

1 0

Alexandre Julliard : winex11: Windows with WS_EX_NOACTIVATE style shouldn' t be on the taskbar.
by Alexandre Julliard June 1, 2010

June 1, 2010

Module: wine Branch: master Commit: 0dd44a3776da2f5a116ac24c8a876bf86517d9ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dd44a3776da2f5a116ac24c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 1 13:37:48 2010 +0200 winex11: Windows with WS_EX_NOACTIVATE style shouldn't be on the taskbar. --- dlls/winex11.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 3999054..7bdf4e1 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1252,7 +1252,7 @@ void update_net_wm_states( Display *display, struct x11drv_win_data *data ) ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); if (ex_style & WS_EX_TOPMOST) new_state |= (1 << NET_WM_STATE_ABOVE); - if (ex_style & WS_EX_TOOLWINDOW) + if (ex_style & (WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE)) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER); if (!(ex_style & WS_EX_APPWINDOW) && GetWindow( data->hwnd, GW_OWNER )) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR);

1 0

Thomas Mullaly : urlmon/tests: Added tests for IUri_GetProperties.
by Alexandre Julliard June 1, 2010

June 1, 2010

Module: wine Branch: master Commit: b0739a346e9e3b6da24353d6873f835e72447789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0739a346e9e3b6da24353d68… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon May 31 14:43:14 2010 -0400 urlmon/tests: Added tests for IUri_GetProperties. --- dlls/urlmon/tests/uri.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 4 ++ 2 files changed, 123 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b0739a346e9e3b6da2435…

1 0

Alexandre Julliard : comctl32/imagelist: Don' t select the mask bitmap into a DC, it may already be selected.
by Alexandre Julliard June 1, 2010

June 1, 2010

Module: wine Branch: master Commit: d81ddde230e998c7709884f83ac1499ad3a53e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d81ddde230e998c7709884f83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 1 16:25:47 2010 +0200 comctl32/imagelist: Don't select the mask bitmap into a DC, it may already be selected. --- dlls/comctl32/imagelist.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index d67672f..f699fb3 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -143,7 +143,6 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, int width, int height, HBITMAP hbmImage, HBITMAP hbmMask ) { BOOL ret = FALSE; - HDC hdcMask = 0; BITMAP bm; BITMAPINFO *info, *mask_info = NULL; DWORD *bits = NULL; @@ -184,8 +183,6 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, mask_info->bmiHeader.biSizeImage = mask_width * height; if (!(mask_bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto done; if (!GetDIBits( hdc, hbmMask, 0, height, mask_bits, mask_info, DIB_RGB_COLORS )) goto done; - hdcMask = CreateCompatibleDC( 0 ); - SelectObject( hdcMask, hbmMask ); } for (n = 0; n < count; n++) @@ -207,8 +204,6 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, bits[i * bm.bmWidth + j] |= 0xff000000; else bits[i * bm.bmWidth + j] = 0; - if (hdcMask) StretchBlt( himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, - hdcMask, n * width, 0, width, height, SRCCOPY ); } else { @@ -222,18 +217,17 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, mask_bits[i * mask_width + j / 8] &= ~(0x80 >> (j % 8)); else mask_bits[i * mask_width + j / 8] |= 0x80 >> (j % 8); - StretchDIBits( himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, - n * width, 0, width, height, mask_bits, mask_info, DIB_RGB_COLORS, SRCCOPY ); } } StretchDIBits( himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, n * width, 0, width, height, bits, info, DIB_RGB_COLORS, SRCCOPY ); - + if (mask_info) + StretchDIBits( himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, + n * width, 0, width, height, mask_bits, mask_info, DIB_RGB_COLORS, SRCCOPY ); } ret = TRUE; done: - if (hdcMask) DeleteDC( hdcMask ); HeapFree( GetProcessHeap(), 0, info ); HeapFree( GetProcessHeap(), 0, mask_info ); HeapFree( GetProcessHeap(), 0, bits );

1 0

Thomas Mullaly : urlmon/tests: Added tests for IUri_HasProperty.
by Alexandre Julliard June 1, 2010

June 1, 2010

Module: wine Branch: master Commit: c7459e83f812b4e9723c54276fd003eaa04450cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7459e83f812b4e9723c54276… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon May 31 15:57:37 2010 -0400 urlmon/tests: Added tests for IUri_HasProperty. --- dlls/urlmon/tests/uri.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 4 ++ 2 files changed, 79 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index bb97258..9e8b32e 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -1284,6 +1284,78 @@ static void test_IUri_GetProperties(void) { } } +static void test_IUri_HasProperty(void) { + IUri *uri = NULL; + HRESULT hr; + DWORD i; + + hr = pCreateUri(http_urlW, 0, 0, &uri); + ok(hr == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + if(SUCCEEDED(hr)) { + hr = IUri_HasProperty(uri, Uri_PROPERTY_RAW_URI, NULL); + ok(hr == E_INVALIDARG, "Error: HasProperty returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); + } + if(uri) IUri_Release(uri); + + for(i = 0; i < sizeof(uri_tests)/sizeof(uri_tests[0]); ++i) { + uri_properties test = uri_tests[i]; + LPWSTR uriW; + uri = NULL; + + uriW = a2w(test.uri); + + hr = pCreateUri(uriW, test.create_flags, 0, &uri); + if(test.create_todo) { + todo_wine { + ok(hr == test.create_expected, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hr, test.create_expected); + } + } else { + ok(hr == test.create_expected, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hr, test.create_expected); + } + + if(SUCCEEDED(hr)) { + DWORD j; + + for(j = 0; j <= Uri_PROPERTY_DWORD_LAST; ++j) { + /* Assign -1, then explicitly test for TRUE or FALSE later. */ + BOOL received = -1; + + hr = IUri_HasProperty(uri, j, &received); + if(test.props_todo) { + todo_wine { + ok(hr == S_OK, "Error: HasProperty returned 0x%08x, expected 0x%08x for property %d on uri_tests[%d].\n", + hr, S_OK, j, i); + } + + /* Check if the property should be true. */ + if(test.props & (1 << j)) { + todo_wine { + ok(received == TRUE, "Error: Expected to have property %d on uri_tests[%d].\n", j, i); + } + } else { + todo_wine { + ok(received == FALSE, "Error: Wasn't expecting to have property %d on uri_tests[%d].\n", j, i); + } + } + } else { + ok(hr == S_OK, "Error: HasProperty returned 0x%08x, expected 0x%08x for property %d on uri_tests[%d].\n", + hr, S_OK, j, i); + + if(test.props & (1 << j)) { + ok(received == TRUE, "Error: Expected to have property %d on uri_tests[%d].\n", j, i); + } else { + ok(received == FALSE, "Error: Wasn't expecting to have property %d on uri_tests[%d].\n", j, i); + } + } + } + } + + if(uri) IUri_Release(uri); + + heap_free(uriW); + } +} + START_TEST(uri) { HMODULE hurlmon; @@ -1318,4 +1390,7 @@ START_TEST(uri) { trace("test IUri_GetProperties...\n"); test_IUri_GetProperties(); + + trace("test IUri_HasProperty...\n"); + test_IUri_HasProperty(); } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 53fbbb4..a46770b 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -147,6 +147,10 @@ static HRESULT WINAPI Uri_HasProperty(IUri *iface, Uri_PROPERTY uriProp, BOOL *p { Uri *This = URI_THIS(iface); FIXME("(%p)->(%d %p)\n", This, uriProp, pfHasProperty); + + if(!pfHasProperty) + return E_INVALIDARG; + return E_NOTIMPL; }

1 0

Wolfram Sang : wined3d: Clarify some comments about Intel cards.
by Alexandre Julliard June 1, 2010

June 1, 2010

Module: wine Branch: master Commit: ddd1c72574607dc1d87b8927d43e7ba78b5bc4c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddd1c72574607dc1d87b8927d… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Mon May 31 16:26:19 2010 +0200 wined3d: Clarify some comments about Intel cards. --- dlls/wined3d/directx.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ba9e551..088cfe0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1730,7 +1730,7 @@ static enum wined3d_pci_device select_card_intel_binary(const struct wined3d_gl_ { if (strstr(gl_renderer, "X3100")) { - /* MacOS calls the card GMA X3100, Google findings also suggest the name GM965 */ + /* MacOS calls the card GMA X3100, otherwise known as GM965/GL960 */ *vidmem = 128; return CARD_INTEL_X3100; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2b048b7..de60cf6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1327,7 +1327,7 @@ enum wined3d_pci_device CARD_INTEL_I915G = 0x2582, CARD_INTEL_I915GM = 0x2592, CARD_INTEL_I945GM = 0x27a2, /* Same as GMA 950? */ - CARD_INTEL_X3100 = 0x2a02, /* Found in Macs. Same as GMA 965? */ + CARD_INTEL_X3100 = 0x2a02, /* Found in Macs. Same as GM965/GL960 */ }; struct wined3d_fbo_ops

1 0

Paul Vriens : regedit: Update the Danish translation and convert to UTF-8.
by Alexandre Julliard June 1, 2010

June 1, 2010

Module: wine Branch: master Commit: 99a92bf255385142fcc66fea016aa75dde9e41c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99a92bf255385142fcc66fea0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 1 13:01:15 2010 +0200 regedit: Update the Danish translation and convert to UTF-8. --- programs/regedit/Da.rc | 144 ++++++++++++++++++++++++----------------------- 1 files changed, 74 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=99a92bf255385142fcc66…

1 0

Paul Vriens : taskmgr: Update the Danish translation and convert to UTF-8.
by Alexandre Julliard June 1, 2010

June 1, 2010

Module: wine Branch: master Commit: b645a0bdba7b63aa9988cf81b49cf1e34f2dbeb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b645a0bdba7b63aa9988cf81b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 1 11:58:33 2010 +0200 taskmgr: Update the Danish translation and convert to UTF-8. --- programs/taskmgr/Da.rc | 217 ++++++++++++++++++++++++++++++++++-------------- 1 files changed, 153 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b645a0bdba7b63aa9988c…

1 0