May 2012 - Wine-Commits - list.winehq.org

Jacek Caban : appwiz.cpl: Replace install_wine_gecko with configurable install_addon.
by Alexandre Julliard May 15, 2012

May 15, 2012

Module: wine Branch: master Commit: f25f97d86a5370f84cfb0bfc5b85472dd5d16b00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f25f97d86a5370f84cfb0bfc5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 15 11:48:31 2012 +0200 appwiz.cpl: Replace install_wine_gecko with configurable install_addon. --- dlls/appwiz.cpl/addons.c | 18 ++++++++++-------- dlls/appwiz.cpl/appwiz.c | 2 +- dlls/appwiz.cpl/appwiz.h | 6 +++++- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 8703f97..1cff5c4 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -84,7 +84,7 @@ static const addon_info_t addons_info[] = { } }; -static const addon_info_t *addon = &addons_info[0]; +static const addon_info_t *addon; static HWND install_dialog = NULL; static LPWSTR url = NULL; @@ -553,18 +553,20 @@ static INT_PTR CALLBACK installer_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARA return FALSE; } -BOOL install_wine_gecko(void) +BOOL install_addon(addon_t addon_type) { if(!*ARCH_STRING) return FALSE; + addon = addons_info+addon_type; + /* - * Try to find Gecko .cab file in following order: - * - directory stored in GeckoCabDir value of HKCU/Wine/Software/MSHTML key - * - $datadir/gecko/ - * - $INSTALL_DATADIR/wine/gecko/ - * - /usr/share/wine/gecko/ - * - download from URL stored in GeckoUrl value of HKCU/Wine/Software/MSHTML key + * Try to find addon .msi file in following order: + * - directory stored in $dir_config_key value of HKCU/Wine/Software/$config_key key + * - $datadir/$addon_subdir/ + * - $INSTALL_DATADIR/wine/$addon_subdir/ + * - /usr/share/wine/$addon_subdir/ + * - download from URL stored in $url_config_key value of HKCU/Wine/Software/$config_key key */ if(!install_from_registered_dir() && !install_from_default_dir() diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 1d8f47c..14ace66 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -975,7 +975,7 @@ static LONG start_params(const WCHAR *params) return FALSE; if(!strcmpW(params, install_geckoW)) { - install_wine_gecko(); + install_addon(ADDON_GECKO); return TRUE; } diff --git a/dlls/appwiz.cpl/appwiz.h b/dlls/appwiz.cpl/appwiz.h index d4f9375..6e189fa 100644 --- a/dlls/appwiz.cpl/appwiz.h +++ b/dlls/appwiz.cpl/appwiz.h @@ -16,7 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -BOOL install_wine_gecko(void) DECLSPEC_HIDDEN; +typedef enum { + ADDON_GECKO +} addon_t; + +BOOL install_addon(addon_t) DECLSPEC_HIDDEN; extern HINSTANCE hInst DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winex11: Use the create_pixmap_from_image helper to select DIB pattern brushes.
by Alexandre Julliard May 15, 2012

May 15, 2012

Module: wine Branch: master Commit: bf2ad337b55dbc8498b28ce78708c5ac62107461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf2ad337b55dbc8498b28ce78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 11 15:28:24 2012 +0200 winex11: Use the create_pixmap_from_image helper to select DIB pattern brushes. --- dlls/winex11.drv/brush.c | 47 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index ea41f8a..6574eb8 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -280,6 +280,45 @@ HBITMAP create_brush_bitmap( X11DRV_PDEVICE *physDev, const struct brush_pattern return bitmap; } +static BOOL select_pattern_brush( X11DRV_PDEVICE *physdev, const struct brush_pattern *pattern ) +{ + XVisualInfo vis; + Pixmap pixmap; + const BITMAPINFO *info = pattern->info; + + memset( &vis, 0, sizeof(vis) ); + vis.visual = visual; + vis.visualid = visual->visualid; + + if (physdev->depth > 1 && info->bmiHeader.biBitCount > 1) + { + vis.depth = screen_depth; + vis.red_mask = visual->red_mask; + vis.green_mask = visual->green_mask; + vis.blue_mask = visual->blue_mask; + } + else vis.depth = 1; + + pixmap = create_pixmap_from_image( physdev->dev.hdc, &vis, info, &pattern->bits, pattern->usage ); + if (!pixmap) return FALSE; + + wine_tsx11_lock(); + if (physdev->brush.pixmap) XFreePixmap( gdi_display, physdev->brush.pixmap ); + physdev->brush.pixmap = pixmap; + + if (vis.depth == 1) + { + physdev->brush.fillStyle = FillOpaqueStippled; + physdev->brush.pixel = -1; /* Special case (see DC_SetupGCForBrush) */ + } + else + { + physdev->brush.fillStyle = FillTiled; + physdev->brush.pixel = 0; /* Ignored */ + } + wine_tsx11_unlock(); + return TRUE; +} /*********************************************************************** * SelectBrush (X11DRV.@) @@ -293,18 +332,14 @@ HBRUSH X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_patter { X_PHYSBITMAP *physbitmap; HBITMAP bitmap = pattern->bitmap; - BOOL delete_bitmap = FALSE; if (!bitmap || !(physbitmap = X11DRV_get_phys_bitmap( bitmap ))) { - if (!(bitmap = create_brush_bitmap( physDev, pattern ))) return 0; - physbitmap = X11DRV_get_phys_bitmap( bitmap ); - delete_bitmap = TRUE; + if (!select_pattern_brush( physDev, pattern )) return 0; } - BRUSH_SelectPatternBrush( physDev, bitmap, physbitmap ); + else BRUSH_SelectPatternBrush( physDev, bitmap, physbitmap ); TRACE("BS_PATTERN\n"); physDev->brush.style = BS_PATTERN; - if (delete_bitmap) DeleteObject( bitmap ); return hbrush; }

1 0

Christian Costa : d3drm: Retrieve mesh name at loading time. Implement GetName and SetName.
by Alexandre Julliard May 15, 2012

May 15, 2012

Module: wine Branch: master Commit: c436887483314c14deec51178730db0522413596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c436887483314c14deec51178… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 10 07:52:29 2012 +0200 d3drm: Retrieve mesh name at loading time. Implement GetName and SetName. --- dlls/d3drm/meshbuilder.c | 74 ++++++++++++++++++++++++++++++++++++++------- dlls/d3drm/tests/d3drm.c | 22 +++++++++++++ 2 files changed, 84 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 557a028..c84ccb8 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -48,6 +48,7 @@ typedef struct { IDirect3DRMMeshBuilder2 IDirect3DRMMeshBuilder2_iface; IDirect3DRMMeshBuilder3 IDirect3DRMMeshBuilder3_iface; LONG ref; + char* name; DWORD nb_vertices; D3DVECTOR* pVertices; DWORD nb_normals; @@ -344,6 +345,7 @@ static ULONG WINAPI IDirect3DRMMeshBuilder2Impl_Release(IDirect3DRMMeshBuilder2* if (!ref) { + HeapFree(GetProcessHeap(), 0, This->name); HeapFree(GetProcessHeap(), 0, This->pVertices); HeapFree(GetProcessHeap(), 0, This->pNormals); HeapFree(GetProcessHeap(), 0, This->pFaceData); @@ -408,23 +410,23 @@ static DWORD WINAPI IDirect3DRMMeshBuilder2Impl_GetAppData(IDirect3DRMMeshBuilde } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetName(IDirect3DRMMeshBuilder2* iface, - LPCSTR pName) + LPCSTR name) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - FIXME("(%p)->(%s): stub\n", This, pName); + TRACE("(%p)->(%s)\n", This, debugstr_a(name)); - return E_NOTIMPL; + return IDirect3DRMMeshBuilder3_SetName(&This->IDirect3DRMMeshBuilder3_iface, name); } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetName(IDirect3DRMMeshBuilder2* iface, - LPDWORD lpdwSize, LPSTR lpName) + LPDWORD size, LPSTR name) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - FIXME("(%p)->(%p,%p): stub\n", This, lpdwSize, lpName); + TRACE("(%p)->(%p,%p)\n", This, size, name); - return E_NOTIMPL; + return IDirect3DRMMeshBuilder3_GetName(&This->IDirect3DRMMeshBuilder3_iface, size, name); } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetClassName(IDirect3DRMMeshBuilder2* iface, @@ -1002,23 +1004,48 @@ static DWORD WINAPI IDirect3DRMMeshBuilder3Impl_GetAppData(IDirect3DRMMeshBuilde } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetName(IDirect3DRMMeshBuilder3* iface, - LPCSTR pName) + LPCSTR name) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); + char *string = NULL; - FIXME("(%p)->(%s): stub\n", This, pName); + TRACE("(%p)->(%s)\n", This, debugstr_a(name)); - return E_NOTIMPL; + if (name) + { + string = HeapAlloc(GetProcessHeap(), 0, strlen(name) + 1); + if (!string) return E_OUTOFMEMORY; + strcpy(string, name); + } + HeapFree(GetProcessHeap(), 0, This->name); + This->name = string; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetName(IDirect3DRMMeshBuilder3* iface, - LPDWORD lpdwSize, LPSTR lpName) + LPDWORD size, LPSTR name) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - FIXME("(%p)->(%p,%p): stub\n", This, lpdwSize, lpName); + TRACE("(%p)->(%p,%p)\n", This, size, name); - return E_NOTIMPL; + if (!size) + return E_POINTER; + + if (!This->name) + { + *size = 0; + return D3DRM_OK; + } + + if (*size < (strlen(This->name) + 1)) + return E_INVALIDARG; + + strcpy(name, This->name); + *size = strlen(This->name) + 1; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetClassName(IDirect3DRMMeshBuilder3* iface, @@ -1052,6 +1079,29 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) TRACE("(%p)->(%p)\n", This, pData); + /* Remove previous name */ + HeapFree(GetProcessHeap(), 0, This->name); + This->name = NULL; + hr = IDirectXFileData_GetName(pData, NULL, &size); + if (hr != DXFILE_OK) + return hr; + if (size) + { + This->name = HeapAlloc(GetProcessHeap(), 0, size); + if (!This->name) + return E_OUTOFMEMORY; + + hr = IDirectXFileData_GetName(pData, This->name, &size); + if (hr != DXFILE_OK) + { + HeapFree(GetProcessHeap(), 0, This->name); + This->name = NULL; + return hr; + } + } + + TRACE("Mesh name is '%s'\n", This->name ? This->name : ""); + hr = IDirectXFileData_GetData(pData, NULL, &size, (void**)&ptr); if (hr != DXFILE_OK) goto end; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 64f93cf..8a8968e 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -179,6 +179,8 @@ static void test_MeshBuilder(void) D3DVECTOR v[3]; D3DVECTOR n[3]; DWORD f[8]; + char name[10]; + DWORD size; hr = pDirect3DRMCreate(&pD3DRM); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); @@ -201,6 +203,26 @@ static void test_MeshBuilder(void) hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr); + size = sizeof(name); + hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name); + ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr); + ok(!strcmp(name, "Object"), "Retreived name '%s' instead of 'Object'\n", name); + size = strlen("Object"); /* No space for null character */ + hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name); + ok(hr == E_INVALIDARG, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr); + hr = IDirect3DRMMeshBuilder_SetName(pMeshBuilder, NULL); + ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_SetName returned hr = %x\n", hr); + size = sizeof(name); + hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name); + ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr); + ok(size == 0, "Size should be 0 instead of %u\n", size); + hr = IDirect3DRMMeshBuilder_SetName(pMeshBuilder, ""); + ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_SetName returned hr = %x\n", hr); + size = sizeof(name); + hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name); + ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr); + ok(!strcmp(name, ""), "Retreived name '%s' instead of ''\n", name); + val = IDirect3DRMMeshBuilder_GetVertexCount(pMeshBuilder); ok(val == 4, "Wrong number of vertices %d (must be 4)\n", val);

1 0

Dmitry Timoshkov : gdiplus: Fix the clipping region calculation.
by Alexandre Julliard May 15, 2012

May 15, 2012

Module: wine Branch: master Commit: d0fcc19e7e43f7e9bc6709f7b737e47195c990f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0fcc19e7e43f7e9bc6709f7b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 15 01:35:32 2012 +0900 gdiplus: Fix the clipping region calculation. --- dlls/gdiplus/graphics.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f2c956ea..c6e6a6e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5190,9 +5190,9 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); rectcpy[3].X = rectcpy[0].X = rect->X; - rectcpy[1].Y = rectcpy[0].Y = rect->Y + offsety; + rectcpy[1].Y = rectcpy[0].Y = rect->Y; rectcpy[2].X = rectcpy[1].X = rect->X + rect->Width; - rectcpy[3].Y = rectcpy[2].Y = rect->Y + offsety + rect->Height; + rectcpy[3].Y = rectcpy[2].Y = rect->Y + rect->Height; transform_and_round_points(graphics, corners, rectcpy, 4); scaled_rect.X = 0.0;

1 0

Jacek Caban : appwiz.cpl: Moved package file name to a struct that will allow customization.
by Alexandre Julliard May 15, 2012

May 15, 2012

Module: wine Branch: master Commit: 3e5c4551c40eb0458bd7c02a92e6580d18e12463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e5c4551c40eb0458bd7c02a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 15 11:47:27 2012 +0200 appwiz.cpl: Moved package file name to a struct that will allow customization. --- dlls/appwiz.cpl/addons.c | 80 +++++++++++++++++++++++++++++---------------- 1 files changed, 51 insertions(+), 29 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 4b57cc3..0e731e4 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -64,7 +64,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define GECKO_FILE_NAME "wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi" +typedef struct { + const char *file_name; +} addon_info_t; + +static const addon_info_t addons_info[] = { + { + "wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi" + } +}; + +static const addon_info_t *addon = &addons_info[0]; static const WCHAR mshtml_keyW[] = {'S','o','f','t','w','a','r','e', @@ -157,18 +167,30 @@ static BOOL install_file(const WCHAR *file_name) return TRUE; } -static BOOL install_from_unix_file(const char *file_name) +static BOOL install_from_unix_file(const char *dir, const char *file_name) { LPWSTR dos_file_name; - int fd; + char *file_path; + int fd, len; BOOL ret; static WCHAR * (CDECL *wine_get_dos_file_name)(const char*); static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; - fd = open(file_name, O_RDONLY); + len = strlen(dir); + file_path = heap_alloc(len+strlen(file_name)+2); + if(!file_path) + return FALSE; + + memcpy(file_path, dir, len); + if(len && file_path[len-1] != '/' && file_path[len-1] != '\\') + file_path[len++] = '/'; + strcpy(file_path+len, file_name); + + fd = open(file_path, O_RDONLY); if(fd == -1) { - TRACE("%s not found\n", debugstr_a(file_name)); + TRACE("%s not found\n", debugstr_a(file_path)); + heap_free(file_path); return FALSE; } @@ -178,19 +200,22 @@ static BOOL install_from_unix_file(const char *file_name) wine_get_dos_file_name = (void*)GetProcAddress(GetModuleHandleW(kernel32W), "wine_get_dos_file_name"); if(wine_get_dos_file_name) { /* Wine UNIX mode */ - dos_file_name = wine_get_dos_file_name(file_name); + dos_file_name = wine_get_dos_file_name(file_path); if(!dos_file_name) { - ERR("Could not get dos file name of %s\n", debugstr_a(file_name)); + ERR("Could not get dos file name of %s\n", debugstr_a(file_path)); + heap_free(file_path); return FALSE; } } else { /* Windows mode */ UINT res; WARN("Could not get wine_get_dos_file_name function, calling install_cab directly.\n"); - res = MultiByteToWideChar( CP_ACP, 0, file_name, -1, 0, 0); + res = MultiByteToWideChar( CP_ACP, 0, file_path, -1, 0, 0); dos_file_name = heap_alloc (res*sizeof(WCHAR)); - MultiByteToWideChar( CP_ACP, 0, file_name, -1, dos_file_name, res); + MultiByteToWideChar( CP_ACP, 0, file_path, -1, dos_file_name, res); } + heap_free(file_path); + ret = install_file(dos_file_name); heap_free(dos_file_name); @@ -199,7 +224,7 @@ static BOOL install_from_unix_file(const char *file_name) static BOOL install_from_registered_dir(void) { - char *file_name; + char *package_dir; HKEY hkey; DWORD res, type, size = MAX_PATH; BOOL ret; @@ -209,32 +234,30 @@ static BOOL install_from_registered_dir(void) if(res != ERROR_SUCCESS) return FALSE; - file_name = heap_alloc(size+sizeof(GECKO_FILE_NAME)); - res = RegGetValueA(hkey, NULL, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)file_name, &size); + package_dir = heap_alloc(size); + res = RegGetValueA(hkey, NULL, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)package_dir, &size); if(res == ERROR_MORE_DATA) { - file_name = heap_realloc(file_name, size+sizeof(GECKO_FILE_NAME)); - res = RegGetValueA(hkey, NULL, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)file_name, &size); + package_dir = heap_realloc(package_dir, size); + res = RegGetValueA(hkey, NULL, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)package_dir, &size); } RegCloseKey(hkey); if(res != ERROR_SUCCESS || (type != REG_SZ && type != REG_EXPAND_SZ)) { - heap_free(file_name); + heap_free(package_dir); return FALSE; } - strcat(file_name, GECKO_FILE_NAME); - - TRACE("Trying %s\n", debugstr_a(file_name)); + TRACE("Trying %s/%s\n", debugstr_a(package_dir), debugstr_a(addon->file_name)); - ret = install_from_unix_file(file_name); + ret = install_from_unix_file(package_dir, addon->file_name); - heap_free(file_name); + heap_free(package_dir); return ret; } static BOOL install_from_default_dir(void) { const char *data_dir, *subdir; - char *file_name; + char *package_dir; int len, len2; BOOL ret; @@ -248,19 +271,18 @@ static BOOL install_from_default_dir(void) len = strlen(data_dir); len2 = strlen(subdir); - file_name = heap_alloc(len+len2+sizeof(GECKO_FILE_NAME)); - memcpy(file_name, data_dir, len); - memcpy(file_name+len, subdir, len2); - memcpy(file_name+len+len2, GECKO_FILE_NAME, sizeof(GECKO_FILE_NAME)); + package_dir = heap_alloc(len+len2+1); + memcpy(package_dir, data_dir, len); + memcpy(package_dir+len, subdir, len2+1); - ret = install_from_unix_file(file_name); + ret = install_from_unix_file(package_dir, addon->file_name); - heap_free(file_name); + heap_free(package_dir); if (!ret) - ret = install_from_unix_file(INSTALL_DATADIR "/wine/gecko/" GECKO_FILE_NAME); + ret = install_from_unix_file(INSTALL_DATADIR "/wine/gecko/", addon->file_name); if (!ret && strcmp(INSTALL_DATADIR, "/usr/share")) - ret = install_from_unix_file("/usr/share/wine/gecko/" GECKO_FILE_NAME); + ret = install_from_unix_file("/usr/share/wine/gecko/", addon->file_name); return ret; }

1 0

Alexandre Julliard : winex11: Use the create_pixmap_from_image helper to export XA_PIXMAP clipboard formats .
by Alexandre Julliard May 15, 2012

May 15, 2012

Module: wine Branch: master Commit: e85895e4c5eb46d1579adbf5e175d8b6f186f9bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e85895e4c5eb46d1579adbf5e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 11 15:27:04 2012 +0200 winex11: Use the create_pixmap_from_image helper to export XA_PIXMAP clipboard formats. --- dlls/winex11.drv/clipboard.c | 40 ++++++++++++++++------------------------ 1 files changed, 16 insertions(+), 24 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index ac17bdd..8dc3f0e 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1758,7 +1758,6 @@ static HANDLE X11DRV_CLIPBOARD_ExportString(Display *display, Window requestor, static HANDLE X11DRV_CLIPBOARD_ExportXAPIXMAP(Display *display, Window requestor, Atom aTarget, Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes) { - HDC hdc, memdc; HANDLE hData; unsigned char* lpData; @@ -1770,33 +1769,26 @@ static HANDLE X11DRV_CLIPBOARD_ExportXAPIXMAP(Display *display, Window requestor if (!lpdata->drvData) /* If not already rendered */ { - /* Create a DDB from the DIB */ - - Pixmap pixmap = 0; - X_PHYSBITMAP *physBitmap; - HBITMAP hBmp; + Pixmap pixmap; + XVisualInfo vis; LPBITMAPINFO pbmi; + struct gdi_image_bits bits; + + memset( &vis, 0, sizeof(vis) ); + vis.visual = visual; + vis.depth = screen_depth; + vis.visualid = visual->visualid; + vis.class = visual->class; + vis.red_mask = visual->red_mask; + vis.green_mask = visual->green_mask; + vis.blue_mask = visual->blue_mask; - hdc = GetDC(0); pbmi = GlobalLock( lpdata->hData ); - hBmp = CreateDIBitmap( hdc, &pbmi->bmiHeader, CBM_INIT, - (LPBYTE)pbmi + bitmap_info_size( pbmi, DIB_RGB_COLORS ), - pbmi, DIB_RGB_COLORS ); + bits.ptr = (LPBYTE)pbmi + bitmap_info_size( pbmi, DIB_RGB_COLORS ); + bits.free = NULL; + bits.is_copy = FALSE; + pixmap = create_pixmap_from_image( 0, &vis, pbmi, &bits, DIB_RGB_COLORS ); GlobalUnlock( lpdata->hData ); - - /* make sure it's owned by x11drv */ - memdc = CreateCompatibleDC( hdc ); - SelectObject( memdc, hBmp ); - DeleteDC( memdc ); - - /* clear the physBitmap so that we can steal its pixmap */ - if ((physBitmap = X11DRV_get_phys_bitmap( hBmp ))) - { - pixmap = physBitmap->pixmap; - physBitmap->pixmap = 0; - } - DeleteObject( hBmp ); - ReleaseDC( 0, hdc ); lpdata->drvData = pixmap; }

1 0

Hans Leidekker : msi: Don't hide failure of script custom actions.
by Alexandre Julliard May 15, 2012

May 15, 2012

Module: wine Branch: master Commit: 022915f75b4fdda9fc3f875c74269d137429a19f URL: http://source.winehq.org/git/wine.git/?a=commit;h=022915f75b4fdda9fc3f875c7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 15 09:39:41 2012 +0200 msi: Don't hide failure of script custom actions. --- dlls/msi/custom.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 9e50035..c1aa627 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -957,7 +957,7 @@ static DWORD ACTION_CallScript( const GUID *guid ) { msi_custom_action_info *info; MSIHANDLE hPackage; - UINT r; + UINT r = ERROR_FUNCTION_FAILED; info = find_action_by_guid( guid ); if (!info) @@ -979,13 +979,13 @@ static DWORD ACTION_CallScript( const GUID *guid ) ERR("failed to create handle for %p\n", info->package ); release_custom_action_data( info ); - return S_OK; + return r; } static DWORD WINAPI ScriptThread( LPVOID arg ) { LPGUID guid = arg; - DWORD rc = 0; + DWORD rc; TRACE("custom action (%x) started\n", GetCurrentThreadId() );

1 0

Andrew Eikum : dsound: Compute mix buffer's size more accurately.
by Alexandre Julliard May 15, 2012

May 15, 2012

Module: wine Branch: master Commit: 20356f7458334e777f98ce20e873c8070f78b160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20356f7458334e777f98ce20e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 14 15:20:02 2012 -0500 dsound: Compute mix buffer's size more accurately. --- dlls/dsound/dsound_private.h | 4 +- dlls/dsound/mixer.c | 44 ++++++++--------------------------------- dlls/dsound/primary.c | 8 +----- 3 files changed, 13 insertions(+), 43 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 375abac..26e59ff 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -94,7 +94,8 @@ struct DirectSoundDevice CRITICAL_SECTION mixlock; IDirectSoundBufferImpl *primary; DWORD speaker_config; - LPBYTE tmp_buffer, mix_buffer; + LPBYTE tmp_buffer; + float *mix_buffer; DWORD tmp_buffer_len, mix_buffer_len; DSVOLUMEPAN volpan; @@ -294,7 +295,6 @@ LONG capped_refcount_dec(LONG *ref) DECLSPEC_HIDDEN; HRESULT DSOUND_FullDuplexCreate(REFIID riid, LPDIRECTSOUNDFULLDUPLEX* ppDSFD) DECLSPEC_HIDDEN; /* mixer.c */ -DWORD DSOUND_bufpos_to_mixpos(const DirectSoundDevice* device, DWORD pos) DECLSPEC_HIDDEN; void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len) DECLSPEC_HIDDEN; void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan) DECLSPEC_HIDDEN; void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan) DECLSPEC_HIDDEN; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index a940a85..9d4b35b 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -96,19 +96,6 @@ void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan) TRACE("Vol=%d Pan=%d\n", volpan->lVolume, volpan->lPan); } -/** Convert a primary buffer position to a pointer position for device->mix_buffer - * device: DirectSoundDevice for which to calculate - * pos: Primary buffer position to converts - * Returns: Offset for mix_buffer - */ -DWORD DSOUND_bufpos_to_mixpos(const DirectSoundDevice* device, DWORD pos) -{ - DWORD ret = pos * 32 / device->pwfx->wBitsPerSample; - if (device->pwfx->wBitsPerSample == 32) - ret *= 2; - return ret; -} - /** * Recalculate the size for temporary buffer, and new writelead * Should be called when one of the following things occur: @@ -480,7 +467,7 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWO { INT len = fraglen; BYTE *ibuf, *volbuf; - DWORD oldpos, mixbufpos; + DWORD oldpos; TRACE("sec_mixpos=%d/%d\n", dsb->sec_mixpos, dsb->buflen); TRACE("(%p,%d,%d)\n",dsb,writepos,fraglen); @@ -502,16 +489,7 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWO if (volbuf) ibuf = volbuf; - mixbufpos = DSOUND_bufpos_to_mixpos(dsb->device, writepos); - /* Now mix the temporary buffer into the devices main buffer */ - if ((writepos + len) <= dsb->device->buflen) - dsb->device->mixfunction(ibuf, dsb->device->mix_buffer + mixbufpos, len); - else - { - DWORD todo = dsb->device->buflen - writepos; - dsb->device->mixfunction(ibuf, dsb->device->mix_buffer + mixbufpos, todo); - dsb->device->mixfunction(ibuf + todo, dsb->device->mix_buffer, len - todo); - } + dsb->device->mixfunction(ibuf, dsb->device->mix_buffer, len); /* check for notification positions */ if (dsb->dsbd.dwFlags & DSBCAPS_CTRLPOSITIONNOTIFY && @@ -754,7 +732,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) if (device->priolevel != DSSCL_WRITEPRIMARY) { BOOL recover = FALSE, all_stopped = FALSE; - DWORD playpos, writepos, writelead, maxq, prebuff_max, prebuff_left, size1, size2, mixplaypos, mixplaypos2; + DWORD playpos, writepos, writelead, maxq, prebuff_max, prebuff_left, size1, size2; LPVOID buf1, buf2; int nfiller; @@ -771,9 +749,6 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) playpos,writepos,device->playpos,device->mixpos,device->buflen); assert(device->playpos < device->buflen); - mixplaypos = DSOUND_bufpos_to_mixpos(device, device->playpos); - mixplaypos2 = DSOUND_bufpos_to_mixpos(device, playpos); - /* calc maximum prebuff */ prebuff_max = (device->prebuf * device->fraglen); @@ -794,15 +769,12 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) /* reset mix position to write position */ device->mixpos = writepos; - ZeroMemory(device->mix_buffer, device->mix_buffer_len); ZeroMemory(device->buffer, device->buflen); } else if (playpos < device->playpos) { buf1 = device->buffer + device->playpos; buf2 = device->buffer; size1 = device->buflen - device->playpos; size2 = playpos; - FillMemory(device->mix_buffer + mixplaypos, device->mix_buffer_len - mixplaypos, 0); - FillMemory(device->mix_buffer, mixplaypos2, 0); FillMemory(buf1, size1, nfiller); if (playpos && (!buf2 || !size2)) FIXME("%d: (%d, %d)=>(%d, %d) There should be an additional buffer here!!\n", __LINE__, device->playpos, device->mixpos, playpos, writepos); @@ -812,7 +784,6 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) buf2 = NULL; size1 = playpos - device->playpos; size2 = 0; - FillMemory(device->mix_buffer + mixplaypos, mixplaypos2 - mixplaypos, 0); FillMemory(buf1, size1, nfiller); } device->playpos = playpos; @@ -823,17 +794,20 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) TRACE("prebuff_left = %d, prebuff_max = %dx%d=%d, writelead=%d\n", prebuff_left, device->prebuf, device->fraglen, prebuff_max, writelead); + ZeroMemory(device->mix_buffer, device->mix_buffer_len); + /* do the mixing */ DSOUND_MixToPrimary(device, writepos, maxq, recover, &all_stopped); if (maxq + writepos > device->buflen) { DWORD todo = device->buflen - writepos; - device->normfunction(device->mix_buffer + DSOUND_bufpos_to_mixpos(device, writepos), device->buffer + writepos, todo); - device->normfunction(device->mix_buffer, device->buffer, maxq - todo); + DWORD offs_float = (todo / device->pwfx->nBlockAlign) * device->pwfx->nChannels; + device->normfunction(device->mix_buffer, device->buffer + writepos, todo); + device->normfunction(device->mix_buffer + offs_float, device->buffer, maxq - todo); } else - device->normfunction(device->mix_buffer + DSOUND_bufpos_to_mixpos(device, writepos), device->buffer + writepos, maxq); + device->normfunction(device->mix_buffer, device->buffer + writepos, maxq); /* update the mix position, taking wrap-around into account */ device->mixpos = writepos + maxq; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index ff79a70..6633124 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -159,8 +159,8 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) device->helfrags = device->buflen / device->fraglen; - device->mix_buffer_len = DSOUND_bufpos_to_mixpos(device, device->buflen); - device->mix_buffer = HeapAlloc(GetProcessHeap(), 0, device->mix_buffer_len); + device->mix_buffer_len = ((device->prebuf * device->fraglen) / (device->pwfx->wBitsPerSample / 8)) * sizeof(float); + device->mix_buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, device->mix_buffer_len); if (!device->mix_buffer) return DSERR_OUTOFMEMORY; @@ -512,10 +512,6 @@ opened: WARN("DSOUND_PrimaryOpen(2) failed: %08x\n", err); } - device->mix_buffer_len = DSOUND_bufpos_to_mixpos(device, device->buflen); - device->mix_buffer = HeapReAlloc(GetProcessHeap(), 0, device->mix_buffer, device->mix_buffer_len); - FillMemory(device->mix_buffer, device->mix_buffer_len, 0); - if(device->pwfx->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || (device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && IsEqualGUID(&((WAVEFORMATEXTENSIBLE*)device->pwfx)->SubFormat,

1 0

Francois Gouget : wsock32: Fix the spelling of the XP_BANDWIDTH_ALLOCATION constant.
by Alexandre Julliard May 15, 2012

May 15, 2012

Module: wine Branch: master Commit: dab51e062308260bfefab9f4cd0b899c39ab8c18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dab51e062308260bfefab9f4c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 15 09:46:29 2012 +0200 wsock32: Fix the spelling of the XP_BANDWIDTH_ALLOCATION constant. --- dlls/wsock32/protocol.c | 2 +- include/nspapi.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wsock32/protocol.c b/dlls/wsock32/protocol.c index 85cb54b..9482887 100644 --- a/dlls/wsock32/protocol.c +++ b/dlls/wsock32/protocol.c @@ -83,7 +83,7 @@ static DWORD map_service(DWORD wsaflags) if (wsaflags & XP1_DISCONNECT_DATA) flags |= XP_DISCONNECT_DATA; if (wsaflags & XP1_SUPPORT_BROADCAST) flags |= XP_SUPPORTS_BROADCAST; if (wsaflags & XP1_SUPPORT_MULTIPOINT) flags |= XP_SUPPORTS_MULTICAST; - if (wsaflags & XP1_QOS_SUPPORTED) flags |= XP_BANDWITH_ALLOCATION; + if (wsaflags & XP1_QOS_SUPPORTED) flags |= XP_BANDWIDTH_ALLOCATION; if (wsaflags & XP1_PARTIAL_MESSAGE) flags |= XP_FRAGMENTATION; return flags; } diff --git a/include/nspapi.h b/include/nspapi.h index a62f4d9..dc0e0f5 100644 --- a/include/nspapi.h +++ b/include/nspapi.h @@ -38,7 +38,7 @@ extern "C" { #define XP_DISCONNECT_DATA 0x00000100 #define XP_SUPPORTS_BROADCAST 0x00000200 #define XP_SUPPORTS_MULTICAST 0x00000400 -#define XP_BANDWITH_ALLOCATION 0x00000800 +#define XP_BANDWIDTH_ALLOCATION 0x00000800 #define XP_FRAGMENTATION 0x00001000 #define XP_ENCRYPTS 0x00002000

1 0

Hans Leidekker : msi: Add support for the ProgressAddition progress message subtype.
by Alexandre Julliard May 15, 2012

May 15, 2012

Module: wine Branch: master Commit: 6c7d0993f055fb4b2181d265e12c54b8a8c54568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c7d0993f055fb4b2181d265e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 15 09:40:06 2012 +0200 msi: Add support for the ProgressAddition progress message subtype. --- dlls/msi/dialog.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index a90d379..f4881fd 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -644,11 +644,11 @@ void msi_dialog_handle_event( msi_dialog* dialog, LPCWSTR control, TRACE("progress: func %u val1 %u val2 %u\n", func, val1, val2); + units = val1 / 512; switch (func) { case 0: /* init */ SendMessageW( ctrl->hwnd, PBM_SETRANGE, 0, MAKELPARAM(0,100) ); - units = val1 / 512; if (val2) { ctrl->progress_max = units ? units : 100; @@ -667,7 +667,6 @@ void msi_dialog_handle_event( msi_dialog* dialog, LPCWSTR control, case 1: /* FIXME: not sure what this is supposed to do */ break; case 2: /* move */ - units = val1 / 512; if (ctrl->progress_backwards) { if (units >= ctrl->progress_current) ctrl->progress_current -= units; @@ -680,6 +679,9 @@ void msi_dialog_handle_event( msi_dialog* dialog, LPCWSTR control, } SendMessageW( ctrl->hwnd, PBM_SETPOS, MulDiv(100, ctrl->progress_current, ctrl->progress_max), 0 ); break; + case 3: /* add */ + ctrl->progress_max += units; + break; default: FIXME("Unknown progress message %u\n", func); break;

1 0