April 2010 - Wine-commits - list.winehq.org

Tag wine-1.1.42 : Alexandre Julliard : Release 1.1.42
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: refs/tags/wine-1.1.42 Tag: 3d830f6f8f4b984fb23a4dccaac4953e44b53186 URL: http://source.winehq.org/git/wine.git/?a=tag;h=3d830f6f8f4b984fb23a4dccaac4… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 2 19:43:46 2010 +0200 Release 1.1.42

1 0

Alexandre Julliard : Release 1.1.42.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: bb5f5c26adf1e9ce744d20a6c04a568f31da855d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb5f5c26adf1e9ce744d20a6c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 2 19:43:45 2010 +0200 Release 1.1.42. --- ANNOUNCE | 1072 +++++++++++++++++++++++++++++++++++-------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 625 insertions(+), 467 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb5f5c26adf1e9ce744d2…

1 0

Louis Lenders : wine.inf: Add another .Net Framework key.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: 3ded06b2281d9dcf98203bd41ec9b59f62f27491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ded06b2281d9dcf98203bd41… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Apr 2 14:05:19 2010 +0200 wine.inf: Add another .Net Framework key. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 8f53088..a0c5b35 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -480,6 +480,7 @@ HKCU,%Desktop%,"MenuShowDelay",2,"400" [DotNet] HKLM,Software\Microsoft\.NETFramework\policy\v1.0 +HKLM,Software\Microsoft\.NETFramework\policy\v1.1 HKLM,Software\Microsoft\.NETFramework\policy\v2.0 HKLM,Software\Microsoft\.NETFramework\policy\v3.0 HKLM,Software\Microsoft\NET Framework Setup\NDP\v1.1.4322,Install,0x10003,1

1 0

Alexandre Julliard : shlwapi: Fix SHCreateWorkerWindowA for 64-bit.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: 86860cc976558d8318b90f0918dbd18e7318f21b URL: http://source.winehq.org/git/wine.git/?a=commit;h=86860cc976558d8318b90f091… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 2 15:05:58 2010 +0200 shlwapi: Fix SHCreateWorkerWindowA for 64-bit. --- dlls/shlwapi/ordinal.c | 12 ++++++------ dlls/shlwapi/tests/ordinal.c | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index a72dba3..332bdb6 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -2595,27 +2595,27 @@ HRESULT WINAPI IUnknown_GetSite(LPUNKNOWN lpUnknown, REFIID iid, PVOID *lppSite) * dwExStyle [I] Extra style flags * dwStyle [I] Style flags * hMenu [I] Window menu - * msg_result [I] New DWLP_MSGRESULT value + * wnd_extra [I] Window extra bytes value * * RETURNS * Success: The window handle of the newly created window. * Failure: 0. */ HWND WINAPI SHCreateWorkerWindowA(LONG wndProc, HWND hWndParent, DWORD dwExStyle, - DWORD dwStyle, HMENU hMenu, LONG msg_result) + DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra) { static const char szClass[] = "WorkerA"; WNDCLASSA wc; HWND hWnd; - TRACE("(0x%08x, %p, 0x%08x, 0x%08x, %p, 0x%08x)\n", - wndProc, hWndParent, dwExStyle, dwStyle, hMenu, msg_result); + TRACE("(0x%08x, %p, 0x%08x, 0x%08x, %p, 0x%08lx)\n", + wndProc, hWndParent, dwExStyle, dwStyle, hMenu, wnd_extra); /* Create Window class */ wc.style = 0; wc.lpfnWndProc = DefWindowProcA; wc.cbClsExtra = 0; - wc.cbWndExtra = 4; + wc.cbWndExtra = sizeof(LONG_PTR); wc.hInstance = shlwapi_hInstance; wc.hIcon = NULL; wc.hCursor = LoadCursorA(NULL, (LPSTR)IDC_ARROW); @@ -2629,7 +2629,7 @@ HWND WINAPI SHCreateWorkerWindowA(LONG wndProc, HWND hWndParent, DWORD dwExStyle hWndParent, hMenu, shlwapi_hInstance, 0); if (hWnd) { - SetWindowLongPtrW(hWnd, DWLP_MSGRESULT, msg_result); + SetWindowLongPtrW(hWnd, 0, wnd_extra); if (wndProc) SetWindowLongPtrA(hWnd, GWLP_WNDPROC, wndProc); } diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 1c25f12..0d6e165 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -55,7 +55,7 @@ static DWORD (WINAPI *pSHGetObjectCompatFlags)(IUnknown*, const CLSID*); static BOOL (WINAPI *pGUIDFromStringA)(LPSTR, CLSID *); static HRESULT (WINAPI *pIUnknown_QueryServiceExec)(IUnknown*, REFIID, const GUID*, DWORD, DWORD, VARIANT*, VARIANT*); static HRESULT (WINAPI *pIUnknown_ProfferService)(IUnknown*, REFGUID, IServiceProvider*, DWORD*); -static HWND (WINAPI *pSHCreateWorkerWindowA)(LONG, HWND, DWORD, DWORD, HMENU, LONG); +static HWND (WINAPI *pSHCreateWorkerWindowA)(LONG, HWND, DWORD, DWORD, HMENU, LONG_PTR); static HMODULE hmlang; static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); @@ -2318,7 +2318,7 @@ static void test_SHCreateWorkerWindowA(void) WNDCLASSA cliA; char classA[20]; HWND hwnd; - LONG ret; + LONG_PTR ret; BOOL res; if (is_win2k_and_lower) @@ -2333,8 +2333,8 @@ static void test_SHCreateWorkerWindowA(void) GetClassName(hwnd, classA, 20); ok(lstrcmpA(classA, "WorkerA") == 0, "expected WorkerA class, got %s\n", classA); - ret = GetWindowLongA(hwnd, DWLP_MSGRESULT); - ok(ret == 0, "got %d\n", ret); + ret = GetWindowLongPtrA(hwnd, 0); + ok(ret == 0, "got %ld\n", ret); /* class info */ memset(&cliA, 0, sizeof(cliA)); @@ -2342,30 +2342,30 @@ static void test_SHCreateWorkerWindowA(void) ok(res, "failed to get class info\n"); ok(cliA.style == 0, "got 0x%08x\n", cliA.style); ok(cliA.cbClsExtra == 0, "got %d\n", cliA.cbClsExtra); - ok(cliA.cbWndExtra == 4, "got %d\n", cliA.cbWndExtra); + ok(cliA.cbWndExtra == sizeof(LONG_PTR), "got %d\n", cliA.cbWndExtra); ok(cliA.lpszMenuName == 0, "got %s\n", cliA.lpszMenuName); DestroyWindow(hwnd); - /* set DWLP_MSGRESULT */ + /* set extra bytes */ hwnd = pSHCreateWorkerWindowA(0, NULL, 0, 0, 0, 0xdeadbeef); ok(hwnd != 0, "expected window\n"); GetClassName(hwnd, classA, 20); ok(lstrcmpA(classA, "WorkerA") == 0, "expected WorkerA class, got %s\n", classA); - ret = GetWindowLongA(hwnd, DWLP_MSGRESULT); - ok(ret == 0xdeadbeef, "got %d\n", ret); + ret = GetWindowLongPtrA(hwnd, 0); + ok(ret == 0xdeadbeef, "got %ld\n", ret); /* test exstyle */ ret = GetWindowLongA(hwnd, GWL_EXSTYLE); - ok(ret == WS_EX_WINDOWEDGE, "0x%08x\n", ret); + ok(ret == WS_EX_WINDOWEDGE, "0x%08lx\n", ret); DestroyWindow(hwnd); hwnd = pSHCreateWorkerWindowA(0, NULL, WS_EX_TOOLWINDOW, 0, 0, 0); ret = GetWindowLongA(hwnd, GWL_EXSTYLE); - ok(ret == (WS_EX_WINDOWEDGE|WS_EX_TOOLWINDOW), "0x%08x\n", ret); + ok(ret == (WS_EX_WINDOWEDGE|WS_EX_TOOLWINDOW), "0x%08lx\n", ret); DestroyWindow(hwnd); }

1 0

Alexandre Julliard : user32/tests: Use the correct type for the bits pointer in CreateDIBSection calls.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: 1f1d9e7b02617e40e2014ac76edd7e4f0d9aed0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f1d9e7b02617e40e2014ac76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 2 15:40:55 2010 +0200 user32/tests: Use the correct type for the bits pointer in CreateDIBSection calls. --- dlls/user32/tests/cursoricon.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 11d11cf..8534875 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -963,7 +963,7 @@ static HICON create_test_icon(HDC hdc, int width, int height, int bpp, { ICONINFO iconInfo; BITMAPINFO bitmapInfo; - UINT32 *buffer = NULL; + void *buffer = NULL; UINT32 mask = maskvalue ? 0xFFFFFFFF : 0x00000000; memset(&bitmapInfo, 0, sizeof(bitmapInfo)); @@ -982,7 +982,7 @@ static HICON create_test_icon(HDC hdc, int width, int height, int bpp, iconInfo.hbmMask = CreateBitmap( width, height, 1, 1, &mask ); if(!iconInfo.hbmMask) return NULL; - iconInfo.hbmColor = CreateDIBSection(hdc, &bitmapInfo, DIB_RGB_COLORS, (void**)&buffer, NULL, 0); + iconInfo.hbmColor = CreateDIBSection(hdc, &bitmapInfo, DIB_RGB_COLORS, &buffer, NULL, 0); if(!iconInfo.hbmColor || !buffer) { DeleteObject(iconInfo.hbmMask); @@ -1074,7 +1074,7 @@ static void test_DrawIcon(void) HDC hdcDst = NULL; HBITMAP bmpDst = NULL; HBITMAP bmpOld = NULL; - UINT32 *bits = 0; + void *bits = 0; hdcDst = CreateCompatibleDC(0); ok(hdcDst != 0, "CreateCompatibleDC(0) failed to return a valid DC\n"); @@ -1096,7 +1096,7 @@ static void test_DrawIcon(void) bitmapInfo.bmiHeader.biCompression = BI_RGB; bitmapInfo.bmiHeader.biSizeImage = sizeof(UINT32); - bmpDst = CreateDIBSection(hdcDst, &bitmapInfo, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + bmpDst = CreateDIBSection(hdcDst, &bitmapInfo, DIB_RGB_COLORS, &bits, NULL, 0); ok (bmpDst && bits, "CreateDIBSection failed to return a valid bitmap and buffer\n"); if (!bmpDst || !bits) goto cleanup; @@ -1158,7 +1158,7 @@ static void test_DrawIconEx(void) HDC hdcDst = NULL; HBITMAP bmpDst = NULL; HBITMAP bmpOld = NULL; - UINT32 bits = 0; + void *bits = 0; hdcDst = CreateCompatibleDC(0); ok(hdcDst != 0, "CreateCompatibleDC(0) failed to return a valid DC\n"); @@ -1179,7 +1179,7 @@ static void test_DrawIconEx(void) bitmapInfo.bmiHeader.biPlanes = 1; bitmapInfo.bmiHeader.biCompression = BI_RGB; bitmapInfo.bmiHeader.biSizeImage = sizeof(UINT32); - bmpDst = CreateDIBSection(hdcDst, &bitmapInfo, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + bmpDst = CreateDIBSection(hdcDst, &bitmapInfo, DIB_RGB_COLORS, &bits, NULL, 0); ok (bmpDst && bits, "CreateDIBSection failed to return a valid bitmap and buffer\n"); if (!bmpDst || !bits) goto cleanup; @@ -1310,7 +1310,7 @@ static void test_DrawState(void) HDC hdcDst = NULL; HBITMAP bmpDst = NULL; HBITMAP bmpOld = NULL; - UINT32 bits = 0; + void *bits = 0; hdcDst = CreateCompatibleDC(0); ok(hdcDst != 0, "CreateCompatibleDC(0) failed to return a valid DC\n"); @@ -1331,7 +1331,7 @@ static void test_DrawState(void) bitmapInfo.bmiHeader.biPlanes = 1; bitmapInfo.bmiHeader.biCompression = BI_RGB; bitmapInfo.bmiHeader.biSizeImage = sizeof(UINT32); - bmpDst = CreateDIBSection(hdcDst, &bitmapInfo, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + bmpDst = CreateDIBSection(hdcDst, &bitmapInfo, DIB_RGB_COLORS, &bits, NULL, 0); ok (bmpDst && bits, "CreateDIBSection failed to return a valid bitmap and buffer\n"); if (!bmpDst || !bits) goto cleanup;

1 0

Alexandre Julliard : mshtml/tests: Don't crash when Gecko is missing.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: bc12cad5704c33f27785e8fd8bb761a039888a3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc12cad5704c33f27785e8fd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 2 16:30:06 2010 +0200 mshtml/tests: Don't crash when Gecko is missing. --- dlls/mshtml/tests/script.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 4ac7ba6..56d83ef 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -1056,6 +1056,7 @@ static IHTMLDocument2 *create_document(void) hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IHTMLDocument2, (void**)&doc); ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + if (hres != S_OK) return NULL; hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument5, (void**)&doc5); if(FAILED(hres)) {

1 0

Vincent Povirk : gdiplus: Implement GdipFlush.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: ade25060296a1498c50f48a230a3b0e79a136121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ade25060296a1498c50f48a23… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 2 09:19:13 2010 -0500 gdiplus: Implement GdipFlush. --- dlls/gdiplus/graphics.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3d5a961..18dae2d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2957,8 +2957,6 @@ GpStatus WINGDIPAPI GdipFillRegion(GpGraphics* graphics, GpBrush* brush, GpStatus WINGDIPAPI GdipFlush(GpGraphics *graphics, GpFlushIntention intention) { - static int calls; - TRACE("(%p,%u)\n", graphics, intention); if(!graphics) @@ -2967,10 +2965,12 @@ GpStatus WINGDIPAPI GdipFlush(GpGraphics *graphics, GpFlushIntention intention) if(graphics->busy) return ObjectBusy; - if(!(calls++)) - FIXME("not implemented\n"); + /* We have no internal operation queue, so there's no need to clear it. */ - return NotImplemented; + if (graphics->hdc) + GdiFlush(); + + return Ok; } /*****************************************************************************

1 0

Hans Leidekker : msi: Implement the UnregisterProgIdInfo standard action.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: 3bdfa1f6248ebc86c5d734f53aa220b3cf4c2bae URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bdfa1f6248ebc86c5d734f53… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 2 10:38:57 2010 +0200 msi: Implement the UnregisterProgIdInfo standard action. --- dlls/msi/action.c | 12 ------------ dlls/msi/classes.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/msi/font.c | 5 ----- dlls/msi/msipriv.h | 4 ++++ 4 files changed, 40 insertions(+), 18 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 2b729ec..4f1be9a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -124,8 +124,6 @@ static const WCHAR szPublishComponents[] = {'P','u','b','l','i','s','h','C','o','m','p','o','n','e','n','t','s',0}; static const WCHAR szRegisterComPlus[] = {'R','e','g','i','s','t','e','r','C','o','m','P','l','u','s',0}; -static const WCHAR szRegisterFonts[] = - {'R','e','g','i','s','t','e','r','F','o','n','t','s',0}; static const WCHAR szRegisterUser[] = {'R','e','g','i','s','t','e','r','U','s','e','r',0}; static const WCHAR szRemoveEnvironmentStrings[] = @@ -162,12 +160,8 @@ static const WCHAR szUnregisterComPlus[] = {'U','n','r','e','g','i','s','t','e','r','C','o','m','P','l','u','s',0}; static const WCHAR szUnregisterExtensionInfo[] = {'U','n','r','e','g','i','s','t','e','r','E','x','t','e','n','s','i','o','n','I','n','f','o',0}; -static const WCHAR szUnregisterFonts[] = - {'U','n','r','e','g','i','s','t','e','r','F','o','n','t','s',0}; static const WCHAR szUnregisterMIMEInfo[] = {'U','n','r','e','g','i','s','t','e','r','M','I','M','E','I','n','f','o',0}; -static const WCHAR szUnregisterProgIdInfo[] = - {'U','n','r','e','g','i','s','t','e','r','P','r','o','g','I','d','I','n','f','o',0}; static const WCHAR szUnregisterTypeLibraries[] = {'U','n','r','e','g','i','s','t','e','r','T','y','p','e','L','i','b','r','a','r','i','e','s',0}; static const WCHAR szValidateProductID[] = @@ -6967,12 +6961,6 @@ static UINT ACTION_UnregisterMIMEInfo( MSIPACKAGE *package ) return msi_unimplemented_action_stub( package, "UnregisterMIMEInfo", table ); } -static UINT ACTION_UnregisterProgIdInfo( MSIPACKAGE *package ) -{ - static const WCHAR table[] = { 'P','r','o','g','I','d',0 }; - return msi_unimplemented_action_stub( package, "UnregisterProgIdInfo", table ); -} - typedef UINT (*STANDARDACTIONHANDLER)(MSIPACKAGE*); static const struct diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index 7d4f1a0..d6e8808 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -25,7 +25,7 @@ * RegisterExtensionInfo * RegisterMIMEInfo * UnRegisterClassInfo - * UnRegisterProgIdInfo (TODO) + * UnRegisterProgIdInfo * UnRegisterExtensionInfo (TODO) * UnRegisterMIMEInfo (TODO) */ @@ -1105,6 +1105,41 @@ UINT ACTION_RegisterProgIdInfo(MSIPACKAGE *package) return ERROR_SUCCESS; } +UINT ACTION_UnregisterProgIdInfo( MSIPACKAGE *package ) +{ + MSIPROGID *progid; + MSIRECORD *uirow; + LONG res; + + load_classes_and_such( package ); + + LIST_FOR_EACH_ENTRY( progid, &package->progids, MSIPROGID, entry ) + { + /* check if this progid is to be removed */ + if (progid->Class && !progid->Class->Installed) + progid->InstallMe = FALSE; + + if (progid->InstallMe) + { + TRACE("progid %s not scheduled to be removed\n", debugstr_w(progid->ProgID)); + continue; + } + + TRACE("Unregistering progid %s\n", debugstr_w(progid->ProgID)); + + res = RegDeleteTreeW( HKEY_CLASSES_ROOT, progid->ProgID ); + if (res != ERROR_SUCCESS) + WARN("Failed to delete progid key %d\n", res); + + uirow = MSI_CreateRecord( 1 ); + MSI_RecordSetStringW( uirow, 1, progid->ProgID ); + ui_actiondata( package, szUnregisterProgIdInfo, uirow ); + msiobj_release( &uirow->hdr ); + } + + return ERROR_SUCCESS; +} + static UINT register_verb(MSIPACKAGE *package, LPCWSTR progid, MSICOMPONENT* component, const MSIEXTENSION* extension, MSIVERB* verb, INT* Sequence ) diff --git a/dlls/msi/font.c b/dlls/msi/font.c index 1b2c3c7..1d99a4c 100644 --- a/dlls/msi/font.c +++ b/dlls/msi/font.c @@ -64,11 +64,6 @@ typedef struct _tagTT_NAME_RECORD { #define SWAPWORD(x) MAKEWORD(HIBYTE(x), LOBYTE(x)) #define SWAPLONG(x) MAKELONG(SWAPWORD(HIWORD(x)), SWAPWORD(LOWORD(x))) -static const WCHAR szRegisterFonts[] = - {'R','e','g','i','s','t','e','r','F','o','n','t','s',0}; -static const WCHAR szUnregisterFonts[] = - {'U','n','r','e','g','i','s','t','e','r','F','o','n','t','s',0}; - static const WCHAR regfont1[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index d5a81a4..e81237c 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -964,6 +964,7 @@ extern UINT ACTION_RegisterMIMEInfo(MSIPACKAGE *package); extern UINT ACTION_RegisterFonts(MSIPACKAGE *package); extern UINT ACTION_UnregisterClassInfo(MSIPACKAGE *package); extern UINT ACTION_UnregisterFonts(MSIPACKAGE *package); +extern UINT ACTION_UnregisterProgIdInfo(MSIPACKAGE *package); /* Helpers */ extern DWORD deformat_string(MSIPACKAGE *package, LPCWSTR ptr, WCHAR** data ); @@ -1086,6 +1087,9 @@ static const WCHAR szAppSearch[] = {'A','p','p','S','e','a','r','c','h',0}; static const WCHAR szMoveFiles[] = {'M','o','v','e','F','i','l','e','s',0}; static const WCHAR szCCPSearch[] = {'C','C','P','S','e','a','r','c','h',0}; static const WCHAR szUnregisterClassInfo[] = {'U','n','r','e','g','i','s','t','e','r','C','l','a','s','s','I','n','f','o',0}; +static const WCHAR szUnregisterProgIdInfo[] = {'U','n','r','e','g','i','s','t','e','r','P','r','o','g','I','d','I','n','f','o',0}; +static const WCHAR szRegisterFonts[] = {'R','e','g','i','s','t','e','r','F','o','n','t','s',0}; +static const WCHAR szUnregisterFonts[] = {'U','n','r','e','g','i','s','t','e','r','F','o','n','t','s',0}; static const WCHAR szCLSID[] = {'C','L','S','I','D',0}; static const WCHAR szProgID[] = {'P','r','o','g','I','D',0}; static const WCHAR szVIProgID[] = {'V','e','r','s','i','o','n','I','n','d','e','p','e','n','d','e','n','t','P','r','o','g','I','D',0};

1 0

Hans Leidekker : msi: Implement the UnregisterExtensionInfo standard action .
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: 17d7effd2af347da27e6cbcd322318add60a1c6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=17d7effd2af347da27e6cbcd3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 2 10:39:20 2010 +0200 msi: Implement the UnregisterExtensionInfo standard action. --- dlls/msi/action.c | 8 ---- dlls/msi/classes.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++----- dlls/msi/msipriv.h | 2 + 3 files changed, 105 insertions(+), 19 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 4f1be9a..25cd4fc 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -158,8 +158,6 @@ static const WCHAR szUnpublishFeatures[] = {'U','n','p','u','b','l','i','s','h','F','e','a','t','u','r','e','s',0}; static const WCHAR szUnregisterComPlus[] = {'U','n','r','e','g','i','s','t','e','r','C','o','m','P','l','u','s',0}; -static const WCHAR szUnregisterExtensionInfo[] = - {'U','n','r','e','g','i','s','t','e','r','E','x','t','e','n','s','i','o','n','I','n','f','o',0}; static const WCHAR szUnregisterMIMEInfo[] = {'U','n','r','e','g','i','s','t','e','r','M','I','M','E','I','n','f','o',0}; static const WCHAR szUnregisterTypeLibraries[] = @@ -6949,12 +6947,6 @@ static UINT ACTION_RemoveExistingProducts( MSIPACKAGE *package ) return msi_unimplemented_action_stub( package, "RemoveExistingProducts", table ); } -static UINT ACTION_UnregisterExtensionInfo( MSIPACKAGE *package ) -{ - static const WCHAR table[] = { 'E','x','t','e','n','s','i','o','n',0 }; - return msi_unimplemented_action_stub( package, "UnregisterExtensionInfo", table ); -} - static UINT ACTION_UnregisterMIMEInfo( MSIPACKAGE *package ) { static const WCHAR table[] = { 'M','I','M','E',0 }; diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index d6e8808..744acfb 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -24,10 +24,10 @@ * RegisterProgIdInfo * RegisterExtensionInfo * RegisterMIMEInfo - * UnRegisterClassInfo - * UnRegisterProgIdInfo - * UnRegisterExtensionInfo (TODO) - * UnRegisterMIMEInfo (TODO) + * UnregisterClassInfo + * UnregisterProgIdInfo + * UnregisterExtensionInfo + * UnregisterMIMEInfo (TODO) */ #include <stdarg.h> @@ -747,6 +747,13 @@ static void mark_mime_for_install( MSIMIME *mime ) mime->InstallMe = TRUE; } +static void mark_mime_for_uninstall( MSIMIME *mime ) +{ + if (!mime) + return; + mime->InstallMe = FALSE; +} + static UINT register_appid(const MSIAPPID *appid, LPCWSTR app ) { static const WCHAR szRemoteServerName[] = @@ -1221,10 +1228,11 @@ UINT ACTION_RegisterExtensionInfo(MSIPACKAGE *package) { static const WCHAR szContentType[] = {'C','o','n','t','e','n','t',' ','T','y','p','e',0 }; - HKEY hkey; + HKEY hkey = NULL; MSIEXTENSION *ext; MSIRECORD *uirow; BOOL install_on_demand = TRUE; + LONG res; load_classes_and_such(package); @@ -1270,12 +1278,16 @@ UINT ACTION_RegisterExtensionInfo(MSIPACKAGE *package) mark_mime_for_install(ext->Mime); - extension = msi_alloc( (lstrlenW( ext->Extension ) + 2)*sizeof(WCHAR) ); - extension[0] = '.'; - lstrcpyW(extension+1,ext->Extension); - - RegCreateKeyW(HKEY_CLASSES_ROOT,extension,&hkey); - msi_free( extension ); + extension = msi_alloc( (strlenW( ext->Extension ) + 2) * sizeof(WCHAR) ); + if (extension) + { + extension[0] = '.'; + strcpyW( extension + 1, ext->Extension ); + res = RegCreateKeyW( HKEY_CLASSES_ROOT, extension, &hkey ); + msi_free( extension ); + if (res != ERROR_SUCCESS) + WARN("Failed to create extension key %d\n", res); + } if (ext->Mime) msi_reg_set_val_str( hkey, szContentType, ext->Mime->ContentType ); @@ -1325,6 +1337,86 @@ UINT ACTION_RegisterExtensionInfo(MSIPACKAGE *package) return ERROR_SUCCESS; } +UINT ACTION_UnregisterExtensionInfo( MSIPACKAGE *package ) +{ + MSIEXTENSION *ext; + MSIRECORD *uirow; + LONG res; + + load_classes_and_such( package ); + + LIST_FOR_EACH_ENTRY( ext, &package->extensions, MSIEXTENSION, entry ) + { + LPWSTR extension; + MSIFEATURE *feature; + + if (!ext->Component) + continue; + + feature = ext->Feature; + if (!feature) + continue; + + if (feature->ActionRequest != INSTALLSTATE_ABSENT) + { + TRACE("Feature %s not scheduled for removal, skipping unregistration of extension %s\n", + debugstr_w(feature->Feature), debugstr_w(ext->Extension)); + continue; + } + + TRACE("Unregistering extension %s\n", debugstr_w(ext->Extension)); + + ext->Installed = FALSE; + + if (ext->ProgID && !list_empty( &ext->verbs )) + mark_progid_for_uninstall( package, ext->ProgID ); + + mark_mime_for_uninstall( ext->Mime ); + + extension = msi_alloc( (strlenW( ext->Extension ) + 2) * sizeof(WCHAR) ); + if (extension) + { + extension[0] = '.'; + strcpyW( extension + 1, ext->Extension ); + res = RegDeleteTreeW( HKEY_CLASSES_ROOT, extension ); + msi_free( extension ); + if (res != ERROR_SUCCESS) + WARN("Failed to delete extension key %d\n", res); + } + + if (ext->ProgID || ext->ProgIDText) + { + static const WCHAR shellW[] = {'\\','s','h','e','l','l',0}; + LPCWSTR progid; + LPWSTR progid_shell; + + if (ext->ProgID) + progid = ext->ProgID->ProgID; + else + progid = ext->ProgIDText; + + progid_shell = msi_alloc( (strlenW( progid ) + strlenW( shellW ) + 1) * sizeof(WCHAR) ); + if (progid_shell) + { + strcpyW( progid_shell, progid ); + strcatW( progid_shell, shellW ); + res = RegDeleteTreeW( HKEY_CLASSES_ROOT, progid_shell ); + msi_free( progid_shell ); + if (res != ERROR_SUCCESS) + WARN("Failed to delete shell key %d\n", res); + RegDeleteKeyW( HKEY_CLASSES_ROOT, progid ); + } + } + + uirow = MSI_CreateRecord( 1 ); + MSI_RecordSetStringW( uirow, 1, ext->Extension ); + ui_actiondata( package, szUnregisterExtensionInfo, uirow ); + msiobj_release( &uirow->hdr ); + } + + return ERROR_SUCCESS; +} + UINT ACTION_RegisterMIMEInfo(MSIPACKAGE *package) { static const WCHAR szExten[] = diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index e81237c..7ab1c87 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -963,6 +963,7 @@ extern UINT ACTION_RegisterExtensionInfo(MSIPACKAGE *package); extern UINT ACTION_RegisterMIMEInfo(MSIPACKAGE *package); extern UINT ACTION_RegisterFonts(MSIPACKAGE *package); extern UINT ACTION_UnregisterClassInfo(MSIPACKAGE *package); +extern UINT ACTION_UnregisterExtensionInfo(MSIPACKAGE *package); extern UINT ACTION_UnregisterFonts(MSIPACKAGE *package); extern UINT ACTION_UnregisterProgIdInfo(MSIPACKAGE *package); @@ -1087,6 +1088,7 @@ static const WCHAR szAppSearch[] = {'A','p','p','S','e','a','r','c','h',0}; static const WCHAR szMoveFiles[] = {'M','o','v','e','F','i','l','e','s',0}; static const WCHAR szCCPSearch[] = {'C','C','P','S','e','a','r','c','h',0}; static const WCHAR szUnregisterClassInfo[] = {'U','n','r','e','g','i','s','t','e','r','C','l','a','s','s','I','n','f','o',0}; +static const WCHAR szUnregisterExtensionInfo[] = {'U','n','r','e','g','i','s','t','e','r','E','x','t','e','n','s','i','o','n','I','n','f','o',0}; static const WCHAR szUnregisterProgIdInfo[] = {'U','n','r','e','g','i','s','t','e','r','P','r','o','g','I','d','I','n','f','o',0}; static const WCHAR szRegisterFonts[] = {'R','e','g','i','s','t','e','r','F','o','n','t','s',0}; static const WCHAR szUnregisterFonts[] = {'U','n','r','e','g','i','s','t','e','r','F','o','n','t','s',0};

1 0

Hans Leidekker : msi: Add tests for registering and unregistering extension info.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: a7ef96f97f61711263d329fbebd47fb9f23f3860 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7ef96f97f61711263d329fbe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 2 10:39:44 2010 +0200 msi: Add tests for registering and unregistering extension info. --- dlls/msi/tests/install.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 107 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 35cd64a..1438bf8 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1745,6 +1745,60 @@ static const CHAR rci_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const CHAR rei_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "extension.txt\textension\textension.txt\t1000\t\t\t8192\t1\n"; + +static const CHAR rei_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "extension\t\t\textension feature\t1\t2\tMSITESTDIR\t0\n"; + +static const CHAR rei_feature_comp_dat[] = "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "extension\textension\n"; + +static const CHAR rei_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "extension\t{9A3060D4-60BA-4A82-AB55-9FB148AD013C}\tMSITESTDIR\t0\t\textension.txt\n"; + +static const CHAR rei_extension_dat[] = "Extension\tComponent_\tProgId_\tMIME_\tFeature_\n" + "s255\ts72\tS255\tS64\ts38\n" + "Extension\tExtension\tComponent_\n" + "extension\textension\tProg.Id.1\t\textension\n"; + +static const CHAR rei_verb_dat[] = "Extension_\tVerb\tSequence\tCommand\tArgument\n" + "s255\ts32\tI2\tL255\tL255\n" + "Verb\tExtension_\tVerb\n" + "extension\tOpen\t1\t&Open\t/argument\n"; + +static const CHAR rei_progid_dat[] = "ProgId\tProgId_Parent\tClass_\tDescription\tIcon_\tIconIndex\n" + "s255\tS255\tS38\tL255\tS72\tI2\n" + "ProgId\tProgId\n" + "Prog.Id.1\t\t\tdescription\t\t\n"; + +static const CHAR rei_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "LaunchConditions\t\t100\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" + "RemoveFiles\t\t1700\n" + "InstallFiles\t\t2000\n" + "UnregisterExtensionInfo\t\t3000\n" + "RegisterExtensionInfo\t\t4000\n" + "RegisterProduct\t\t5000\n" + "PublishFeatures\t\t5100\n" + "PublishProduct\t\t5200\n" + "InstallFinalize\t\t6000\n"; + typedef struct _msi_table { const CHAR *filename; @@ -2677,6 +2731,21 @@ static const msi_table rci_tables[] = ADD_TABLE(property) }; +static const msi_table rei_tables[] = +{ + ADD_TABLE(directory), + ADD_TABLE(rei_component), + ADD_TABLE(rei_feature), + ADD_TABLE(rei_feature_comp), + ADD_TABLE(rei_file), + ADD_TABLE(rei_extension), + ADD_TABLE(rei_verb), + ADD_TABLE(rei_progid), + ADD_TABLE(rei_install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -9038,6 +9107,43 @@ static void test_register_class_info(void) delete_test_files(); } +static void test_register_extension_info(void) +{ + UINT r; + LONG res; + HKEY hkey; + + create_test_files(); + create_file("msitest\\extension.txt", 1000); + create_database(msifile, rei_tables, sizeof(rei_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, ".extension", &hkey); + ok(res == ERROR_SUCCESS, "key not created\n"); + RegCloseKey(hkey); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Prog.Id.1\\shell\\Open\\command", &hkey); + ok(res == ERROR_SUCCESS, "key not created\n"); + RegCloseKey(hkey); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, ".extension", &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Prog.Id.1", &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); + + ok(!delete_pf("msitest\\extension.txt", TRUE), "file not removed\n"); + ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + delete_test_files(); +} + START_TEST(install) { DWORD len; @@ -9146,6 +9252,7 @@ START_TEST(install) test_remove_ini_values(); test_remove_env_strings(); test_register_class_info(); + test_register_extension_info(); DeleteFileA(log_file);

1 0