wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Alexandre Julliard : shell32: Make use of the control panel icon.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: fa29e0f2907bcd04ac75ed91677ac5853738e76f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa29e0f2907bcd04ac75ed916… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 6 14:44:09 2010 +0200 shell32: Make use of the control panel icon. --- dlls/shell32/control.c | 8 ++++---- dlls/shell32/shresdef.h | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 898e0ed..b0d4089 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -475,8 +475,8 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, case IDM_CPANEL_ABOUT: { WCHAR appName[MAX_STRING_LEN]; - HICON icon = LoadImageW((HINSTANCE)GetWindowLongPtrW(hWnd, GWLP_HINSTANCE), - MAKEINTRESOURCEW(IDI_APPICON), IMAGE_ICON, 48, 48, LR_SHARED); + HICON icon = LoadImageW(shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_CONTROL_PANEL), + IMAGE_ICON, 48, 48, LR_SHARED); LoadStringW(shell32_hInstance, IDS_CPANEL_TITLE, appName, sizeof(appName) / sizeof(appName[0])); @@ -627,12 +627,12 @@ static void Control_DoInterface(CPanel* panel, HWND hWnd, HINSTANCE hInst) wc.cbClsExtra = 0; wc.cbWndExtra = sizeof(CPlApplet*); wc.hInstance = panel->hInst = hInst; - wc.hIcon = LoadIconW( hInst, MAKEINTRESOURCEW(IDI_APPICON) ); + wc.hIcon = LoadIconW( shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_CONTROL_PANEL) ); wc.hCursor = LoadCursorW( 0, (LPWSTR)IDC_ARROW ); wc.hbrBackground = GetStockObject(WHITE_BRUSH); wc.lpszMenuName = NULL; wc.lpszClassName = className; - wc.hIconSm = LoadImageW( hInst, MAKEINTRESOURCEW(IDI_APPICON), IMAGE_ICON, + wc.hIconSm = LoadImageW( shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_CONTROL_PANEL), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED); if (!RegisterClassExW(&wc)) return; diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 93fb518..88c93c8 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -178,8 +178,6 @@ #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_MY_DOCUMENTS 235 -#define IDI_APPICON 101 - /* AVI resources, windows shell32 has 14 of them: 150-152 and 160-170 FIXME: Need to add them, but for now just let them use the same: searching.avi

1 0

Joel Holdsworth : shell32: Comitted a Tango icon for the control panel.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 7dfa965d95763ee054570e2a4d270bcb18ce5996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dfa965d95763ee054570e2a4… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Wed May 5 21:54:57 2010 +0100 shell32: Comitted a Tango icon for the control panel. --- dlls/shell32/Makefile.in | 1 + dlls/shell32/control.ico | Bin 0 -> 25214 bytes dlls/shell32/control.svg | 237 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shres.rc | 3 + 4 files changed, 241 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7dfa965d95763ee054570…

1 0

Joel Holdsworth : user32: Fixed some minor glitches in oic_winlogo.ico.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 83d5035bbe038b691dd78918ab2a89a344543a92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83d5035bbe038b691dd78918a… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Wed May 5 19:48:28 2010 +0100 user32: Fixed some minor glitches in oic_winlogo.ico. --- dlls/user32/resources/oic_winlogo.ico | Bin 25214 -> 25214 bytes dlls/user32/resources/oic_winlogo.svg | 222 +++++++++++++++++---------------- 2 files changed, 114 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83d5035bbe038b691dd78…

1 0

Gerald Pfeifer : wined3d: Fix the handling of the blue channel inIWineGDISurfaceImpl_SaveSnapshot. ( take 2).
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: da628001fef259c4533fe940e8da43f7d4177208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da628001fef259c4533fe940e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu May 6 00:10:18 2010 +0200 wined3d: Fix the handling of the blue channel inIWineGDISurfaceImpl_SaveSnapshot. (take 2). --- dlls/wined3d/surface_gdi.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index eec9b84..580c88a 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -341,14 +341,13 @@ const char* filename) fwrite(output, 3 * This->pow2Width, 1, f); } } else { - int red_shift, green_shift, blue_shift, pix_width, alpha_shift; + int red_shift, green_shift, blue_shift, pix_width; pix_width = format_desc->byte_count; red_shift = get_shift(format_desc->red_mask); green_shift = get_shift(format_desc->green_mask); blue_shift = get_shift(format_desc->blue_mask); - alpha_shift = get_shift(format_desc->alpha_mask); for (y = 0; y < This->pow2Height; y++) { const unsigned char *src = This->resource.allocatedMemory + (y * 1 * IWineD3DSurface_GetPitch(iface)); @@ -367,8 +366,8 @@ const char* filename) output[3 * x + 0] = red_shift > 0 ? comp >> red_shift : comp << -red_shift; comp = color & format_desc->green_mask; output[3 * x + 1] = green_shift > 0 ? comp >> green_shift : comp << -green_shift; - comp = color & format_desc->alpha_mask; - output[3 * x + 2] = alpha_shift > 0 ? comp >> alpha_shift : comp << -alpha_shift; + comp = color & format_desc->blue_mask; + output[3 * x + 2] = blue_shift > 0 ? comp >> blue_shift : comp << -blue_shift; } fwrite(output, 3 * This->pow2Width, 1, f); }

1 0

Nikolay Sivov : ole32/ole2: Use W calls for registry access.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 56fdbc226e1f1cfc5ddce26d2c625d86e427e350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56fdbc226e1f1cfc5ddce26d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 6 01:20:30 2010 +0400 ole32/ole2: Use W calls for registry access. --- dlls/ole32/ole2.c | 93 ++++++++++++++++++++++++----------------------------- 1 files changed, 42 insertions(+), 51 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 2e4da53..73a2d2d 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -119,6 +119,13 @@ static const WCHAR OLEDD_DRAGTRACKERCLASS[] = static const WCHAR prop_olemenuW[] = {'P','R','O','P','_','O','L','E','M','e','n','u','D','e','s','c','r','i','p','t','o','r',0}; +static const WCHAR clsidfmtW[] = + {'C','L','S','I','D','\\','{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-', + '%','0','2','x','%','0','2','x','-','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x', + '%','0','2','x','%','0','2','x','}','\\',0}; + +static const WCHAR emptyW[] = { 0 }; + /* * This is the head of the Drop target container. */ @@ -378,13 +385,12 @@ HRESULT WINAPI OleRegGetUserType( DWORD dwFormOfType, LPOLESTR* pszUserType) { - char keyName[60]; + WCHAR keyName[60]; DWORD dwKeyType; DWORD cbData; HKEY clsidKey; LONG hres; - LPSTR buffer; - HRESULT retVal; + /* * Initialize the out parameter. */ @@ -393,17 +399,17 @@ HRESULT WINAPI OleRegGetUserType( /* * Build the key name we're looking for */ - sprintf( keyName, "CLSID\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\", - clsid->Data1, clsid->Data2, clsid->Data3, - clsid->Data4[0], clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], - clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], clsid->Data4[7] ); + sprintfW( keyName, clsidfmtW, + clsid->Data1, clsid->Data2, clsid->Data3, + clsid->Data4[0], clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], + clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], clsid->Data4[7] ); - TRACE("(%s, %d, %p)\n", keyName, dwFormOfType, pszUserType); + TRACE("(%s, %d, %p)\n", debugstr_w(keyName), dwFormOfType, pszUserType); /* * Open the class id Key */ - hres = RegOpenKeyA(HKEY_CLASSES_ROOT, + hres = RegOpenKeyW(HKEY_CLASSES_ROOT, keyName, &clsidKey); @@ -415,8 +421,8 @@ HRESULT WINAPI OleRegGetUserType( */ cbData = 0; - hres = RegQueryValueExA(clsidKey, - "", + hres = RegQueryValueExW(clsidKey, + emptyW, NULL, &dwKeyType, NULL, @@ -431,7 +437,7 @@ HRESULT WINAPI OleRegGetUserType( /* * Allocate a buffer for the registry value. */ - *pszUserType = CoTaskMemAlloc(cbData*2); + *pszUserType = CoTaskMemAlloc(cbData); if (*pszUserType==NULL) { @@ -439,41 +445,24 @@ HRESULT WINAPI OleRegGetUserType( return E_OUTOFMEMORY; } - buffer = HeapAlloc(GetProcessHeap(), 0, cbData); - - if (buffer == NULL) - { - RegCloseKey(clsidKey); - CoTaskMemFree(*pszUserType); - *pszUserType=NULL; - return E_OUTOFMEMORY; - } - - hres = RegQueryValueExA(clsidKey, - "", + hres = RegQueryValueExW(clsidKey, + emptyW, NULL, &dwKeyType, - (LPBYTE) buffer, + (LPBYTE) *pszUserType, &cbData); RegCloseKey(clsidKey); - - if (hres!=ERROR_SUCCESS) + if (hres != ERROR_SUCCESS) { CoTaskMemFree(*pszUserType); - *pszUserType=NULL; + *pszUserType = NULL; - retVal = REGDB_E_READREGDB; - } - else - { - MultiByteToWideChar( CP_ACP, 0, buffer, -1, *pszUserType, cbData /*FIXME*/ ); - retVal = S_OK; + return REGDB_E_READREGDB; } - HeapFree(GetProcessHeap(), 0, buffer); - return retVal; + return S_OK; } /*********************************************************************** @@ -593,7 +582,9 @@ HRESULT WINAPI OleRegGetMiscStatus( DWORD dwAspect, DWORD* pdwStatus) { - char keyName[60]; + static const WCHAR miscstatusW[] = {'M','i','s','c','S','t','a','t','u','s',0}; + static const WCHAR dfmtW[] = {'%','d',0}; + WCHAR keyName[60]; HKEY clsidKey; HKEY miscStatusKey; HKEY aspectKey; @@ -607,17 +598,17 @@ HRESULT WINAPI OleRegGetMiscStatus( /* * Build the key name we're looking for */ - sprintf( keyName, "CLSID\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\", - clsid->Data1, clsid->Data2, clsid->Data3, - clsid->Data4[0], clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], - clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], clsid->Data4[7] ); + sprintfW( keyName, clsidfmtW, + clsid->Data1, clsid->Data2, clsid->Data3, + clsid->Data4[0], clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], + clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], clsid->Data4[7] ); - TRACE("(%s, %d, %p)\n", keyName, dwAspect, pdwStatus); + TRACE("(%s, %d, %p)\n", debugstr_w(keyName), dwAspect, pdwStatus); /* * Open the class id Key */ - result = RegOpenKeyA(HKEY_CLASSES_ROOT, + result = RegOpenKeyW(HKEY_CLASSES_ROOT, keyName, &clsidKey); @@ -627,8 +618,8 @@ HRESULT WINAPI OleRegGetMiscStatus( /* * Get the MiscStatus */ - result = RegOpenKeyA(clsidKey, - "MiscStatus", + result = RegOpenKeyW(clsidKey, + miscstatusW, &miscStatusKey); @@ -646,9 +637,9 @@ HRESULT WINAPI OleRegGetMiscStatus( /* * Open the key specific to the requested aspect. */ - sprintf(keyName, "%d", dwAspect); + sprintfW(keyName, dfmtW, dwAspect); - result = RegOpenKeyA(miscStatusKey, + result = RegOpenKeyW(miscStatusKey, keyName, &aspectKey); @@ -2280,13 +2271,13 @@ static void OLEUTL_ReadRegistryDWORDValue( HKEY regKey, DWORD* pdwValue) { - char buffer[20]; + WCHAR buffer[20]; DWORD cbData = sizeof(buffer); DWORD dwKeyType; LONG lres; - lres = RegQueryValueExA(regKey, - "", + lres = RegQueryValueExW(regKey, + emptyW, NULL, &dwKeyType, (LPBYTE)buffer, @@ -2302,7 +2293,7 @@ static void OLEUTL_ReadRegistryDWORDValue( case REG_EXPAND_SZ: case REG_MULTI_SZ: case REG_SZ: - *pdwValue = (DWORD)strtoul(buffer, NULL, 10); + *pdwValue = (DWORD)strtoulW(buffer, NULL, 10); break; } }

1 0

Nikolay Sivov : comctl32/rebar: Try to center child rectangle only if cyChild height is not zero.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 5eedf51df69219ab44e2878ddacf6e002cdb08dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eedf51df69219ab44e2878dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 6 00:15:05 2010 +0400 comctl32/rebar: Try to center child rectangle only if cyChild height is not zero. --- dlls/comctl32/rebar.c | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index cc06425..cd3abad 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -707,7 +707,7 @@ REBAR_CalcHorzBand (const REBAR_INFO *infoPtr, UINT rstart, UINT rend) /* *** Supports only Horizontal bars. *** */ { REBAR_BAND *lpBand; - UINT i, xoff, yoff; + UINT i, xoff; RECT work; for(i=rstart; i<rend; i++){ @@ -770,12 +770,24 @@ REBAR_CalcHorzBand (const REBAR_INFO *infoPtr, UINT rstart, UINT rend) } /* set initial child window rectangle if there is a child */ - if (lpBand->hwndChild != NULL) { - int cyBand = lpBand->rcBand.bottom - lpBand->rcBand.top; - yoff = (cyBand - lpBand->cyChild) / 2; - SetRect (&lpBand->rcChild, - lpBand->rcBand.left + lpBand->cxHeader, lpBand->rcBand.top + yoff, - lpBand->rcBand.right - REBAR_POST_CHILD, lpBand->rcBand.top + yoff + lpBand->cyChild); + if (lpBand->hwndChild) { + + lpBand->rcChild.left = lpBand->rcBand.left + lpBand->cxHeader; + lpBand->rcChild.right = lpBand->rcBand.right - REBAR_POST_CHILD; + + if (lpBand->cyChild > 0) { + + UINT yoff = (lpBand->rcBand.bottom - lpBand->rcBand.top - lpBand->cyChild) / 2; + + /* center child if height is known */ + lpBand->rcChild.top = lpBand->rcBand.top + yoff; + lpBand->rcChild.bottom = lpBand->rcBand.top + yoff + lpBand->cyChild; + } + else { + lpBand->rcChild.top = lpBand->rcBand.top; + lpBand->rcChild.bottom = lpBand->rcBand.bottom; + } + if ((lpBand->fStyle & RBBS_USECHEVRON) && (lpBand->rcChild.right - lpBand->rcChild.left < lpBand->cxIdeal)) { lpBand->rcChild.right -= CHEVRON_WIDTH;

1 0

Damjan Jovanovic : winemenubuilder: Make desktop files executable.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: ac7a24ba3530264ceae03033e5ac96387fb73e8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac7a24ba3530264ceae03033e… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed May 5 22:53:57 2010 +0200 winemenubuilder: Make desktop files executable. --- programs/winemenubuilder/winemenubuilder.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 201f9ac..4884d7e 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2334,6 +2334,8 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) if (location) { r = !write_desktop_entry(NULL, location, lastEntry, escaped_path, escaped_args, escaped_description, work_dir, icon_name); + if (r == 0) + chmod(location, 0755); HeapFree(GetProcessHeap(), 0, location); } } @@ -2425,6 +2427,8 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link if (location) { r = !write_desktop_entry(NULL, location, lastEntry, "winebrowser", escaped_urlPath, NULL, NULL, NULL); + if (r == 0) + chmod(location, 0755); HeapFree(GetProcessHeap(), 0, location); } }

1 0

Damjan Jovanovic : winex11.drv: Use unicode filenames for WM_DROPFILES.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 538b39c4cf4b20f636b0424536da6354c8991cab URL: http://source.winehq.org/git/wine.git/?a=commit;h=538b39c4cf4b20f636b042453… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed May 5 20:50:04 2010 +0200 winex11.drv: Use unicode filenames for WM_DROPFILES. --- dlls/winex11.drv/xdnd.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index fe36e0c..9d209fc 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -367,7 +367,7 @@ static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len) char *uri; WCHAR *path; - char *out = NULL; + WCHAR *out = NULL; int size = 0; int capacity = 4096; @@ -375,7 +375,7 @@ static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len) int start = 0; int end = 0; - out = HeapAlloc(GetProcessHeap(), 0, capacity); + out = HeapAlloc(GetProcessHeap(), 0, capacity * sizeof(WCHAR)); if (out == NULL) return 0; @@ -403,11 +403,11 @@ static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len) if (pathSize > capacity-size) { capacity = 2*capacity + pathSize; - out = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, out, capacity + 1); + out = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, out, (capacity + 1)*sizeof(WCHAR)); if (out == NULL) goto done; } - WideCharToMultiByte(CP_ACP, 0, path, -1, &out[size], pathSize, 0, 0); + memcpy(&out[size], path, pathSize * sizeof(WCHAR)); size += pathSize; done: HeapFree(GetProcessHeap(), 0, path); @@ -421,17 +421,17 @@ static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len) if (out && end >= len) { DROPFILES *dropFiles; - dropFiles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DROPFILES) + size + 1); + dropFiles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DROPFILES) + (size + 1)*sizeof(WCHAR)); if (dropFiles) { dropFiles->pFiles = sizeof(DROPFILES); dropFiles->pt.x = XDNDxy.x; dropFiles->pt.y = XDNDxy.y; dropFiles->fNC = 0; - dropFiles->fWide = FALSE; + dropFiles->fWide = TRUE; out[size] = '\0'; - memcpy(((char*)dropFiles) + dropFiles->pFiles, out, size + 1); - X11DRV_XDND_InsertXDNDData(property, CF_HDROP, dropFiles, sizeof(DROPFILES) + size + 1); + memcpy(((char*)dropFiles) + dropFiles->pFiles, out, (size + 1)*sizeof(WCHAR)); + X11DRV_XDND_InsertXDNDData(property, CF_HDROP, dropFiles, sizeof(DROPFILES) + (size + 1)*sizeof(WCHAR)); count = 1; } } @@ -508,9 +508,9 @@ static void X11DRV_XDND_SendDropFiles(HWND hwnd) lpDrop->pt.y = XDNDxy.y; TRACE("Sending WM_DROPFILES: hWnd(0x%p) %p(%s)\n", hwnd, - ((char*)lpDrop) + lpDrop->pFiles, ((char*)lpDrop) + lpDrop->pFiles); + ((char*)lpDrop) + lpDrop->pFiles, debugstr_w((WCHAR*)(((char*)lpDrop) + lpDrop->pFiles))); - PostMessageA(hwnd, WM_DROPFILES, (WPARAM)lpDrop, 0L); + PostMessageW(hwnd, WM_DROPFILES, (WPARAM)lpDrop, 0L); } }

1 0

Rico Schüller : d3d10/tests: Add ID3D10Effect:: GetVariableBy*() test.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 89b0c8437516786e8713cfe0fb6786f65f6a1425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89b0c8437516786e8713cfe0f… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed May 5 19:02:02 2010 +0200 d3d10/tests: Add ID3D10Effect::GetVariableBy*() test. --- dlls/d3d10/tests/effect.c | 126 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 126 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index ee96fb9..f37f945 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3441,6 +3441,131 @@ static void test_effect_local_shader(ID3D10Device *device) effect->lpVtbl->Release(effect); } +/* + * test_effect_get_variable_by + */ +#if 0 +cbuffer cb +{ + float f1 : SV_POSITION; + float f2 : COLOR0; +}; +cbuffer cb2 +{ + float f3 : SV_POSITION; + float f4 : COLOR1; +}; +Texture1D tex1 : COLOR2; +Texture1D tex2 : COLOR1; +#endif +static DWORD fx_test_egvb[] = { +0x43425844, 0x63d60ede, 0xf75a09d1, 0x47da5604, 0x7ef6e331, 0x00000001, 0x000001ca, 0x00000001, +0x00000024, 0x30315846, 0x0000019e, 0xfeff1001, 0x00000002, 0x00000004, 0x00000002, 0x00000000, +0x00000000, 0x00000000, 0x00000000, 0x0000008a, 0x00000000, 0x00000002, 0x00000000, 0x00000000, +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x66006263, +0x74616f6c, 0x00000700, 0x00000100, 0x00000000, 0x00000400, 0x00001000, 0x00000400, 0x00090900, +0x00316600, 0x505f5653, 0x5449534f, 0x004e4f49, 0x43003266, 0x524f4c4f, 0x62630030, 0x33660032, +0x00346600, 0x4f4c4f43, 0x54003152, 0x75747865, 0x44316572, 0x00005300, 0x00000200, 0x00000000, +0x00000000, 0x00000000, 0x00000000, 0x00000a00, 0x78657400, 0x4f430031, 0x32524f4c, 0x78657400, +0x00040032, 0x00100000, 0x00000000, 0x00020000, 0xffff0000, 0x0000ffff, 0x00290000, 0x000d0000, +0x002c0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00380000, 0x000d0000, 0x003b0000, +0x00040000, 0x00000000, 0x00000000, 0x00000000, 0x00420000, 0x00100000, 0x00000000, 0x00020000, +0xffff0000, 0x0000ffff, 0x00460000, 0x000d0000, 0x002c0000, 0x00000000, 0x00000000, 0x00000000, +0x00000000, 0x00490000, 0x000d0000, 0x004c0000, 0x00040000, 0x00000000, 0x00000000, 0x00000000, +0x00790000, 0x005d0000, 0x007e0000, 0xffff0000, 0x0000ffff, 0x00850000, 0x005d0000, 0x004c0000, +0xffff0000, 0x0000ffff, 0x00000000, +}; + +static void test_effect_get_variable_by(ID3D10Device *device) +{ + ID3D10Effect *effect; + ID3D10EffectVariable *variable_by_index, *variable, *null_variable; + HRESULT hr; + + hr = create_effect(fx_test_egvb, 0, device, NULL, &effect); + ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + + /* get the null variable */ + null_variable = effect->lpVtbl->GetVariableByIndex(effect, 0xffffffff); + + /* check for invalid arguments */ + variable = effect->lpVtbl->GetVariableByName(effect, NULL); + ok(null_variable == variable, "GetVariableByName got %p, expected %p\n", variable, null_variable); + + variable = effect->lpVtbl->GetVariableBySemantic(effect, NULL); + ok(null_variable == variable, "GetVariableBySemantic got %p, expected %p\n", variable, null_variable); + + variable = effect->lpVtbl->GetVariableByName(effect, "invalid"); + ok(null_variable == variable, "GetVariableByName got %p, expected %p\n", variable, null_variable); + + variable = effect->lpVtbl->GetVariableBySemantic(effect, "invalid"); + ok(null_variable == variable, "GetVariableBySemantic got %p, expected %p\n", variable, null_variable); + + /* variable f1 */ + variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 0); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + + variable = effect->lpVtbl->GetVariableByName(effect, "f1"); + ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); + + variable = effect->lpVtbl->GetVariableBySemantic(effect, "SV_POSITION"); + ok(variable_by_index == variable, "GetVariableBySemantic got %p, expected %p\n", variable, variable_by_index); + + /* variable f2 */ + variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 1); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + + variable = effect->lpVtbl->GetVariableByName(effect, "f2"); + ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); + + variable = effect->lpVtbl->GetVariableBySemantic(effect, "COLOR0"); + ok(variable_by_index == variable, "GetVariableBySemantic got %p, expected %p\n", variable, variable_by_index); + + /* variable f3 */ + variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 2); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + + variable = effect->lpVtbl->GetVariableByName(effect, "f3"); + ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); + + variable = effect->lpVtbl->GetVariableBySemantic(effect, "SV_POSITION"); + ok(variable != null_variable, "GetVariableBySemantic failed %p", variable); + ok(variable != variable_by_index, "GetVariableBySemantic failed %p", variable); + + /* variable f4 */ + variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 3); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + + variable = effect->lpVtbl->GetVariableByName(effect, "f4"); + ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); + + variable = effect->lpVtbl->GetVariableBySemantic(effect, "COLOR1"); + ok(variable_by_index == variable, "GetVariableBySemantic got %p, expected %p\n", variable, variable_by_index); + + /* variable tex1 */ + variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 4); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + + variable = effect->lpVtbl->GetVariableByName(effect, "tex1"); + ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); + + variable = effect->lpVtbl->GetVariableBySemantic(effect, "COLOR2"); + ok(variable_by_index == variable, "GetVariableBySemantic got %p, expected %p\n", variable, variable_by_index); + + /* variable tex2 */ + variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 5); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + + variable = effect->lpVtbl->GetVariableByName(effect, "tex2"); + ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); + + variable = effect->lpVtbl->GetVariableBySemantic(effect, "COLOR1"); + ok(variable != null_variable, "GetVariableBySemantic failed %p", variable); + ok(variable != variable_by_index, "GetVariableBySemantic failed %p", variable); + + effect->lpVtbl->Release(effect); +} + START_TEST(effect) { ID3D10Device *device; @@ -3460,6 +3585,7 @@ START_TEST(effect) test_effect_variable_type_class(device); test_effect_constant_buffer_stride(device); test_effect_local_shader(device); + test_effect_get_variable_by(device); refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left\n", refcount);

1 0

Rico Schüller : d3d10: Add argument check in ID3D10Effect::GetVariableByName().
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: b0b9897f9fcca9c276bf3ffa520b608c5e34dbac URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0b9897f9fcca9c276bf3ffa5… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed May 5 19:01:59 2010 +0200 d3d10: Add argument check in ID3D10Effect::GetVariableByName(). --- dlls/d3d10/effect.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 016e842..9a6c843 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2184,6 +2184,12 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); + if (!name) + { + WARN("Invalid name specified\n"); + return (ID3D10EffectVariable *)&null_variable; + } + for (i = 0; i < This->local_buffer_count; ++i) { struct d3d10_effect_variable *l = &This->local_buffers[i];

1 0

← Newer
1
...
74
75
76
77
78
79
80
...
96
Older →

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 2010