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

Gerald Pfeifer : wrc: Remove variable type which is not really used from rsrcid_to_token.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 3aa6cff4ceece9c4f7b482b64ab1710fdcad74af URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aa6cff4ceece9c4f7b482b64… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed May 5 00:24:35 2010 +0200 wrc: Remove variable type which is not really used from rsrcid_to_token. --- tools/wrc/parser.y | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-) diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index 28d4bc9..a62bccf 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -2865,7 +2865,6 @@ clean: static int rsrcid_to_token(int lookahead) { int token; - const char *type = "?"; /* Get a token if we don't have one yet */ if(lookahead == YYEMPTY) @@ -2886,64 +2885,49 @@ static int rsrcid_to_token(int lookahead) switch(yylval.num) { case WRC_RT_CURSOR: - type = "CURSOR"; token = tCURSOR; break; case WRC_RT_ICON: - type = "ICON"; token = tICON; break; case WRC_RT_BITMAP: - type = "BITMAP"; token = tBITMAP; break; case WRC_RT_FONT: - type = "FONT"; token = tFONT; break; case WRC_RT_FONTDIR: - type = "FONTDIR"; token = tFONTDIR; break; case WRC_RT_RCDATA: - type = "RCDATA"; token = tRCDATA; break; case WRC_RT_MESSAGETABLE: - type = "MESSAGETABLE"; token = tMESSAGETABLE; break; case WRC_RT_DLGINIT: - type = "DLGINIT"; token = tDLGINIT; break; case WRC_RT_ACCELERATOR: - type = "ACCELERATOR"; token = tACCELERATORS; break; case WRC_RT_MENU: - type = "MENU"; token = tMENU; break; case WRC_RT_DIALOG: - type = "DIALOG"; token = tDIALOG; break; case WRC_RT_VERSION: - type = "VERSION"; token = tVERSIONINFO; break; case WRC_RT_TOOLBAR: - type = "TOOLBAR"; token = tTOOLBAR; break; case WRC_RT_HTML: - type = "HTML"; token = tHTML; break; case WRC_RT_STRING: - type = "STRINGTABLE"; break; case WRC_RT_ANICURSOR:

1 0

Gerald Pfeifer : kernel32/tests: Remove variable len which is not really used from test_CommandLine.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 978b4898e5314bae66747c5ca3286fc3b41e4930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=978b4898e5314bae66747c5ca… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed May 5 00:24:09 2010 +0200 kernel32/tests: Remove variable len which is not really used from test_CommandLine. --- dlls/kernel32/tests/process.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 7b5ac75..806c468 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -794,7 +794,6 @@ static void test_CommandLine(void) char buffer2[MAX_PATH]; PROCESS_INFORMATION info; STARTUPINFOA startup; - DWORD len; BOOL ret; memset(&startup, 0, sizeof(startup)); @@ -873,7 +872,7 @@ static void test_CommandLine(void) assert(DeleteFileA(resfile) != 0); get_file_name(resfile); - len = GetFullPathNameA(selfname, MAX_PATH, fullpath, &lpFilePart); + GetFullPathNameA(selfname, MAX_PATH, fullpath, &lpFilePart); assert ( lpFilePart != 0); *(lpFilePart -1 ) = 0; p = strrchr(fullpath, '\\'); @@ -895,7 +894,7 @@ static void test_CommandLine(void) /* Using AppName */ get_file_name(resfile); - len = GetFullPathNameA(selfname, MAX_PATH, fullpath, &lpFilePart); + GetFullPathNameA(selfname, MAX_PATH, fullpath, &lpFilePart); assert ( lpFilePart != 0); *(lpFilePart -1 ) = 0; p = strrchr(fullpath, '\\');

1 0

Alexandre Julliard : shdocvw: Support setting an icon on the main iexplore window.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 8182520f135723337abc1eb649c14a5803c55d2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8182520f135723337abc1eb64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 5 11:00:19 2010 +0200 shdocvw: Support setting an icon on the main iexplore window. --- dlls/shdocvw/iexplore.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index d65810f..9c14cfc 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -37,6 +37,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +#define IDI_APPICON 101 + static const WCHAR szIEWinFrame[] = { 'I','E','F','r','a','m','e',0 }; static LRESULT iewnd_OnCreate(HWND hwnd, LPCREATESTRUCTW lpcs) @@ -85,7 +87,7 @@ ie_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) void register_iewindow_class(void) { - WNDCLASSW wc; + WNDCLASSEXW wc; memset(&wc, 0, sizeof wc); wc.style = 0; @@ -93,13 +95,15 @@ void register_iewindow_class(void) wc.cbClsExtra = 0; wc.cbWndExtra = sizeof(InternetExplorer*); wc.hInstance = shdocvw_hinstance; - wc.hIcon = 0; - wc.hCursor = LoadCursorW(0, MAKEINTRESOURCEW(IDI_APPLICATION)); + wc.hIcon = LoadIconW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDI_APPICON)); + wc.hIconSm = LoadImageW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDI_APPICON), IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED); + wc.hCursor = LoadCursorW(0, MAKEINTRESOURCEW(IDC_ARROW)); wc.hbrBackground = 0; wc.lpszClassName = szIEWinFrame; wc.lpszMenuName = NULL; - RegisterClassW(&wc); + RegisterClassExW(&wc); } void unregister_iewindow_class(void)

1 0

Alexandre Julliard : shell32: Load the application icon for the control panel window.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 3f5136ce3a1d60d7a532b36bbf8c57959a910f6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f5136ce3a1d60d7a532b36bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 5 11:00:38 2010 +0200 shell32: Load the application icon for the control panel window. --- dlls/shell32/control.c | 12 ++++++++---- dlls/shell32/shresdef.h | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 730f8a6..898e0ed 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -475,10 +475,12 @@ 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); LoadStringW(shell32_hInstance, IDS_CPANEL_TITLE, appName, sizeof(appName) / sizeof(appName[0])); - ShellAboutW(hWnd, appName, NULL, NULL); + ShellAboutW(hWnd, appName, NULL, icon); return 0; } @@ -612,7 +614,7 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, static void Control_DoInterface(CPanel* panel, HWND hWnd, HINSTANCE hInst) { - WNDCLASSW wc; + WNDCLASSEXW wc; MSG msg; WCHAR appName[MAX_STRING_LEN]; const WCHAR className[] = {'S','h','e','l','l','_','C','o','n','t','r','o', @@ -625,13 +627,15 @@ static void Control_DoInterface(CPanel* panel, HWND hWnd, HINSTANCE hInst) wc.cbClsExtra = 0; wc.cbWndExtra = sizeof(CPlApplet*); wc.hInstance = panel->hInst = hInst; - wc.hIcon = 0; + wc.hIcon = LoadIconW( hInst, MAKEINTRESOURCEW(IDI_APPICON) ); 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, + GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED); - if (!RegisterClassW(&wc)) return; + if (!RegisterClassExW(&wc)) return; CreateWindowExW(0, wc.lpszClassName, appName, WS_OVERLAPPEDWINDOW | WS_VISIBLE, diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 88c93c8..93fb518 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -178,6 +178,8 @@ #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

Alexandre Julliard : comctl32: Add support for alpha blending in ImageList_DrawIndirect.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 599531b7d9459196dfa6931c718b7f6ca426ee49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=599531b7d9459196dfa6931c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 5 12:47:24 2010 +0200 comctl32: Add support for alpha blending in ImageList_DrawIndirect. --- dlls/comctl32/imagelist.c | 35 ++++++++++++++++++++++++++++++----- 1 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 83b563c..63f0ea0 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1088,6 +1088,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) HBITMAP hImageBmp, hOldImageBmp, hBlendMaskBmp; BOOL bIsTransparent, bBlend, bResult = FALSE, bMask; HIMAGELIST himl; + HBRUSH hOldBrush; POINT pt; if (!pimldp || !(himl = pimldp->himl)) return FALSE; @@ -1138,12 +1139,38 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) oldImageFg = SetTextColor( hImageDC, RGB( 0, 0, 0 ) ); oldImageBk = SetBkColor( hImageDC, RGB( 0xff, 0xff, 0xff ) ); + if (fState & ILS_ALPHA) + { + BLENDFUNCTION func; + COLORREF colour; + + func.BlendOp = AC_SRC_OVER; + func.BlendFlags = 0; + func.SourceConstantAlpha = pimldp->Frame; + func.AlphaFormat = AC_SRC_ALPHA; + if (bIsTransparent) + { + bResult = GdiAlphaBlend( pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy, + hImageListDC, pt.x, pt.y, cx, cy, func ); + goto end; + } + colour = pimldp->rgbBk; + if (colour == CLR_DEFAULT) colour = himl->clrBk; + if (colour == CLR_NONE) colour = GetBkColor( pimldp->hdcDst ); + + hOldBrush = SelectObject (hImageDC, CreateSolidBrush (colour)); + PatBlt( hImageDC, 0, 0, cx, cy, PATCOPY ); + GdiAlphaBlend( hImageDC, 0, 0, cx, cy, hImageListDC, pt.x, pt.y, cx, cy, func ); + DeleteObject (SelectObject (hImageDC, hOldBrush)); + bResult = BitBlt( pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy, hImageDC, 0, 0, SRCCOPY ); + goto end; + } + /* * Draw the initial image */ if( bMask ) { if (himl->hbmMask) { - HBRUSH hOldBrush; hOldBrush = SelectObject (hImageDC, CreateSolidBrush (GetTextColor(pimldp->hdcDst))); PatBlt( hImageDC, 0, 0, cx, cy, PATCOPY ); BitBlt(hImageDC, 0, 0, cx, cy, hMaskListDC, pt.x, pt.y, SRCPAINT); @@ -1155,14 +1182,13 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) goto end; } } else { - HBRUSH hOldBrush = SelectObject (hImageDC, GetStockObject(BLACK_BRUSH)); + hOldBrush = SelectObject (hImageDC, GetStockObject(BLACK_BRUSH)); PatBlt( hImageDC, 0, 0, cx, cy, PATCOPY); SelectObject(hImageDC, hOldBrush); } } else { /* blend the image with the needed solid background */ COLORREF colour = RGB(0,0,0); - HBRUSH hOldBrush; if( !bIsTransparent ) { @@ -1187,7 +1213,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) /* Time for blending, if required */ if (bBlend) { - HBRUSH hBlendBrush, hOldBrush; + HBRUSH hBlendBrush; COLORREF clrBlend = pimldp->rgbFg; HDC hBlendMaskDC = hImageListDC; HBITMAP hOldBitmap; @@ -1231,7 +1257,6 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) if (fState & ILS_SATURATE) FIXME("ILS_SATURATE: unimplemented!\n"); if (fState & ILS_GLOW) FIXME("ILS_GLOW: unimplemented!\n"); if (fState & ILS_SHADOW) FIXME("ILS_SHADOW: unimplemented!\n"); - if (fState & ILS_ALPHA) FIXME("ILS_ALPHA: unimplemented!\n"); if (fStyle & ILD_PRESERVEALPHA) FIXME("ILD_PRESERVEALPHA: unimplemented!\n"); if (fStyle & ILD_SCALE) FIXME("ILD_SCALE: unimplemented!\n");

1 0

Piotr Caban : msvcrt: Added _get_osplatform implementation.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 3f4eded5d4842880ee895f00f7e865e30f018482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f4eded5d4842880ee895f00f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 5 13:36:58 2010 +0200 msvcrt: Added _get_osplatform implementation. --- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcrt/data.c | 17 +++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/tests/data.c | 9 +++++++-- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index f3d74c8..92db3f0 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -472,7 +472,7 @@ @ cdecl _get_heap_handle() msvcrt._get_heap_handle @ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle -@ stub _get_osplatform +@ cdecl _get_osplatform(ptr) msvcrt._get_osplatform @ stub _get_osver @ stub _get_output_format @ stub _get_pgmptr @@ -811,7 +811,7 @@ @ cdecl _onexit(ptr) msvcrt._onexit @ varargs _open(str long) msvcrt._open @ cdecl _open_osfhandle(long long) msvcrt._open_osfhandle -@ stub _osplatform +@ extern _osplatform msvcrt._osplatform @ extern _osver msvcrt._osver @ stub _outp @ stub _outpd diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index c91980d..54dda1c 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -39,6 +39,7 @@ unsigned int MSVCRT_osmajor = 0;/* FIXME: */ unsigned int MSVCRT_osminor = 0;/* FIXME: */ unsigned int MSVCRT_osmode = 0;/* FIXME: */ unsigned int MSVCRT__osver = 0; +unsigned int MSVCRT__osplatform = 0; unsigned int MSVCRT_osversion = 0; /* FIXME: */ unsigned int MSVCRT__winmajor = 0; unsigned int MSVCRT__winminor = 0; @@ -228,6 +229,21 @@ char*** CDECL __p___initenv(void) { return &MSVCRT___initenv; } */ MSVCRT_wchar_t*** CDECL __p___winitenv(void) { return &MSVCRT___winitenv; } +/********************************************************************* + * _get_osplatform (MSVCRT.@) + */ +int CDECL MSVCRT__get_osplatform(int *ret) +{ + if(!ret) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + *ret = MSVCRT__osplatform; + return 0; +} + /* INTERNAL: Create a wide string from an ascii string */ MSVCRT_wchar_t *msvcrt_wstrdupa(const char *str) { @@ -279,6 +295,7 @@ void msvcrt_init_args(void) MSVCRT__winmajor = osvi.dwMajorVersion; MSVCRT__winminor = osvi.dwMinorVersion; MSVCRT__osver = osvi.dwBuildNumber; + MSVCRT__osplatform = osvi.dwPlatformId; MSVCRT_osversion = MSVCRT__winver; MSVCRT_osmajor = MSVCRT__winmajor; MSVCRT_osminor = MSVCRT__winminor; diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f35fdfd..6e581df 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -431,7 +431,7 @@ # stub _get_fmode @ cdecl _get_heap_handle() @ cdecl _get_osfhandle(long) -# stub _get_osplatform +@ cdecl _get_osplatform(ptr) MSVCRT__get_osplatform # stub _get_osver # stub _get_output_format # stub _get_pgmptr @@ -759,7 +759,7 @@ @ cdecl _onexit(ptr) MSVCRT__onexit @ varargs _open(str long) MSVCRT__open @ cdecl _open_osfhandle(long long) -# stub _osplatform +@ extern _osplatform MSVCRT__osplatform @ extern _osver MSVCRT__osver @ stub _outp #(long long) @ stub _outpd #(long long) diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index a27ca27..7061124 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -74,7 +74,8 @@ static void test_initvar( HMODULE hmsvcrt ) int *pp_winmajor = (int*)GetProcAddress(hmsvcrt, "_winmajor"); int *pp_winminor = (int*)GetProcAddress(hmsvcrt, "_winminor"); int *pp_osver = (int*)GetProcAddress(hmsvcrt, "_osver"); - unsigned int winver, winmajor, winminor, osver; + int *pp_osplatform = (int*)GetProcAddress(hmsvcrt, "_osplatform"); + unsigned int winver, winmajor, winminor, osver, osplatform; if( !( pp_winmajor && pp_winminor && pp_winver)) { win_skip("_winver variables are not available\n"); @@ -91,16 +92,20 @@ static void test_initvar( HMODULE hmsvcrt ) ok( winver == ((osvi.dwMajorVersion << 8) | osvi.dwMinorVersion), "Wrong value for _winver %02x expected %02x\n", winver, ((osvi.dwMajorVersion << 8) | osvi.dwMinorVersion)); - if( !pp_osver) { + if( !pp_osver || !pp_osplatform ) { win_skip("_osver variables are not available\n"); return; } osver = *pp_osver; + osplatform = *pp_osplatform; ok( osver == (osvi.dwBuildNumber & 0xffff) || ((osvi.dwBuildNumber >> 24) == osvi.dwMajorVersion && ((osvi.dwBuildNumber >> 16) & 0xff) == osvi.dwMinorVersion), /* 95/98/ME */ "Wrong value for _osver %04x expected %04x\n", osver, osvi.dwBuildNumber); + ok(osplatform == osvi.dwPlatformId, + "Wrong value for _osplatform %x exprected %x\n", + osplatform, osvi.dwPlatformId); } START_TEST(data)

1 0

Henri Verbeet : wined3d: Setup the FBO for the correct target in context_apply_clear_state().
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: ed75f5ca7aae3de6afeca5dc97be9f54a140104d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed75f5ca7aae3de6afeca5dc9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 4 20:39:52 2010 +0200 wined3d: Setup the FBO for the correct target in context_apply_clear_state(). --- dlls/wined3d/context.c | 61 ++++++++++++++++++++++++++++++++-------- dlls/wined3d/device.c | 24 +--------------- dlls/wined3d/wined3d_private.h | 4 ++- 3 files changed, 53 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e205b7a..9815ce3 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -455,7 +455,7 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ context->rebind_fbo = FALSE; } - if (context->render_offscreen) + if (render_targets) { context->current_fbo = context_find_fbo_entry(context, target, render_targets, depth_stencil); context_apply_fbo_entry(context, target, context->current_fbo); @@ -469,6 +469,21 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ context_check_fbo_status(context, target); } +/* GL locking is done by the caller */ +static void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, + IWineD3DSurfaceImpl *render_target, IWineD3DSurfaceImpl *depth_stencil) +{ + if (surface_is_offscreen(render_target)) + { + context->blit_targets[0] = render_target; + context_apply_fbo_state(context, target, context->blit_targets, depth_stencil); + } + else + { + context_apply_fbo_state(context, target, NULL, NULL); + } +} + /* Context activation is done by the caller. */ void context_alloc_occlusion_query(struct wined3d_context *context, struct wined3d_occlusion_query *query) { @@ -1357,6 +1372,10 @@ struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, IWineD3 sizeof(*ret->pshader_const_dirty) * device->d3d_pshader_constantF); } + ret->blit_targets = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + gl_info->limits.buffers * sizeof(*ret->blit_targets)); + if (!ret->blit_targets) goto out; + ret->free_occlusion_query_size = 4; ret->free_occlusion_queries = HeapAlloc(GetProcessHeap(), 0, ret->free_occlusion_query_size * sizeof(*ret->free_occlusion_queries)); @@ -1490,6 +1509,7 @@ struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, IWineD3 out: HeapFree(GetProcessHeap(), 0, ret->free_event_queries); HeapFree(GetProcessHeap(), 0, ret->free_occlusion_queries); + HeapFree(GetProcessHeap(), 0, ret->blit_targets); HeapFree(GetProcessHeap(), 0, ret->pshader_const_dirty); HeapFree(GetProcessHeap(), 0, ret->vshader_const_dirty); HeapFree(GetProcessHeap(), 0, ret); @@ -1524,6 +1544,7 @@ void context_destroy(IWineD3DDeviceImpl *This, struct wined3d_context *context) destroy = FALSE; } + HeapFree(GetProcessHeap(), 0, context->blit_targets); HeapFree(GetProcessHeap(), 0, context->vshader_const_dirty); HeapFree(GetProcessHeap(), 0, context->pshader_const_dirty); device_context_remove(This, context); @@ -2010,23 +2031,30 @@ void context_apply_blit_state(struct wined3d_context *context, IWineD3DDeviceImp } /* Context activation is done by the caller. */ -void context_apply_clear_state(struct wined3d_context *context, IWineD3DDeviceImpl *device) +void context_apply_clear_state(struct wined3d_context *context, IWineD3DDeviceImpl *device, + IWineD3DSurfaceImpl *render_target, IWineD3DSurfaceImpl *depth_stencil) { const struct StateEntry *state_table = device->StateTable; + GLenum buffer; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { if (!context->render_offscreen) context_validate_onscreen_formats(device, context); ENTER_GL(); - context_apply_fbo_state(context, GL_FRAMEBUFFER, device->render_targets, device->depth_stencil); + context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, render_target, depth_stencil); LEAVE_GL(); } - if (context->draw_buffer_dirty) - { - context_apply_draw_buffer(context, FALSE); - context->draw_buffer_dirty = FALSE; - } + if (!surface_is_offscreen(render_target)) + buffer = surface_get_gl_buffer(render_target); + else if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + buffer = GL_COLOR_ATTACHMENT0; + else + buffer = device->offscreenBuffer; + + ENTER_GL(); + context_set_draw_buffer(context, buffer); + LEAVE_GL(); if (context->last_was_blit) { @@ -2056,10 +2084,19 @@ void context_apply_draw_state(struct wined3d_context *context, IWineD3DDeviceImp if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - if (!context->render_offscreen) context_validate_onscreen_formats(device, context); - ENTER_GL(); - context_apply_fbo_state(context, GL_FRAMEBUFFER, device->render_targets, device->depth_stencil); - LEAVE_GL(); + if (!context->render_offscreen) + { + context_validate_onscreen_formats(device, context); + ENTER_GL(); + context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, NULL); + LEAVE_GL(); + } + else + { + ENTER_GL(); + context_apply_fbo_state(context, GL_FRAMEBUFFER, device->render_targets, device->depth_stencil); + LEAVE_GL(); + } } if (context->draw_buffer_dirty) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 585edd5..3472d04 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4455,29 +4455,7 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac return WINED3D_OK; } - context_apply_clear_state(context, This); - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - if (!surface_is_offscreen(target)) - { - TRACE("Surface %p is onscreen\n", target); - - ENTER_GL(); - context_bind_fbo(context, GL_FRAMEBUFFER, NULL); - context_set_draw_buffer(context, surface_get_gl_buffer(target)); - LEAVE_GL(); - } - else - { - TRACE("Surface %p is offscreen\n", target); - - ENTER_GL(); - context_bind_fbo(context, GL_FRAMEBUFFER, &context->dst_fbo); - context_attach_surface_fbo(context, GL_FRAMEBUFFER, 0, target); - context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, depth_stencil, TRUE); - LEAVE_GL(); - } - } + context_apply_clear_state(context, This, target, depth_stencil); target->get_drawable_size(context, &drawable_width, &drawable_height); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fabf22a..cad88b9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1092,6 +1092,7 @@ struct wined3d_context GLuint fbo_read_binding; GLuint fbo_draw_binding; BOOL rebind_fbo; + IWineD3DSurfaceImpl **blit_targets; /* Queries */ GLuint *free_occlusion_queries; @@ -1192,7 +1193,8 @@ void context_alloc_event_query(struct wined3d_context *context, void context_alloc_occlusion_query(struct wined3d_context *context, struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; void context_apply_blit_state(struct wined3d_context *context, IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; -void context_apply_clear_state(struct wined3d_context *context, IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; +void context_apply_clear_state(struct wined3d_context *context, IWineD3DDeviceImpl *device, + IWineD3DSurfaceImpl *render_target, IWineD3DSurfaceImpl *depth_stencil) DECLSPEC_HIDDEN; void context_apply_draw_state(struct wined3d_context *context, IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; void context_attach_depth_stencil_fbo(struct wined3d_context *context, GLenum fbo_target, IWineD3DSurfaceImpl *depth_stencil, BOOL use_render_buffer) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Use context_apply_clear_state() in color_fill_fbo( ).
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 8de7d2ed4ce52147369116afe69256016c50ffb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8de7d2ed4ce52147369116afe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 4 20:39:53 2010 +0200 wined3d: Use context_apply_clear_state() in color_fill_fbo(). --- dlls/wined3d/device.c | 34 ++++++++-------------------------- 1 files changed, 8 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3472d04..3001b3b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5487,42 +5487,24 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surface, if (rect) IWineD3DSurface_LoadLocation((IWineD3DSurface *)surface, SFLAG_INDRAWABLE, NULL); IWineD3DSurface_ModifyLocation((IWineD3DSurface *)surface, SFLAG_INDRAWABLE, TRUE); - if (!surface_is_offscreen(surface)) - { - TRACE("Surface %p is onscreen\n", surface); - - context = context_acquire(This, surface); - ENTER_GL(); - context_bind_fbo(context, GL_FRAMEBUFFER, NULL); - context_set_draw_buffer(context, surface_get_gl_buffer(surface)); - } - else - { - TRACE("Surface %p is offscreen\n", surface); + context = context_acquire(This, surface); + context_apply_clear_state(context, This, surface, NULL); - context = context_acquire(This, NULL); - ENTER_GL(); - context_bind_fbo(context, GL_FRAMEBUFFER, &context->dst_fbo); - context_attach_surface_fbo(context, GL_FRAMEBUFFER, 0, surface); - context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, NULL, FALSE); - } + ENTER_GL(); - if (rect) { - glEnable(GL_SCISSOR_TEST); + if (rect) + { if (surface_is_offscreen(surface)) glScissor(rect->x1, rect->y1, rect->x2 - rect->x1, rect->y2 - rect->y1); else glScissor(rect->x1, surface->currentDesc.Height - rect->y2, rect->x2 - rect->x1, rect->y2 - rect->y1); checkGLcall("glScissor"); - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SCISSORRECT); - } else { + } + else + { glDisable(GL_SCISSOR_TEST); } - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); - - glDisable(GL_BLEND); - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_ALPHABLENDENABLE)); glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_COLORWRITEENABLE));

1 0

Damjan Jovanovic : winemenubuilder: Use a unicode WinMain.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: bc526034e04652a5a3ae22ea7b3940f6d68a3a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc526034e04652a5a3ae22ea7… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 4 21:38:21 2010 +0200 winemenubuilder: Use a unicode WinMain. --- programs/winemenubuilder/Makefile.in | 2 +- programs/winemenubuilder/winemenubuilder.c | 37 +++++++++++++++------------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/programs/winemenubuilder/Makefile.in b/programs/winemenubuilder/Makefile.in index f6142ef..beb29ee 100644 --- a/programs/winemenubuilder/Makefile.in +++ b/programs/winemenubuilder/Makefile.in @@ -4,7 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winemenubuilder.exe -APPMODE = -mwindows +APPMODE = -mwindows -municode IMPORTS = uuid shell32 shlwapi ole32 user32 advapi32 kernel32 EXTRAINCL = @PNGINCL@ diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 51f0adb..33c2208 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2729,9 +2729,9 @@ static void cleanup_menus(void) WINE_ERR("error opening registry key, menu cleanup failed\n"); } -static CHAR *next_token( LPSTR *p ) +static WCHAR *next_token( LPWSTR *p ) { - LPSTR token = NULL, t = *p; + LPWSTR token = NULL, t = *p; if( !t ) return NULL; @@ -2746,7 +2746,7 @@ static CHAR *next_token( LPSTR *p ) case '"': /* unquote the token */ token = ++t; - t = strchr( token, '"' ); + t = strchrW( token, '"' ); if( t ) *t++ = 0; break; @@ -2755,7 +2755,7 @@ static CHAR *next_token( LPSTR *p ) break; default: token = t; - t = strchr( token, ' ' ); + t = strchrW( token, ' ' ); if( t ) *t++ = 0; break; @@ -2808,11 +2808,16 @@ static BOOL init_xdg(void) /*********************************************************************** * - * WinMain + * wWinMain */ -int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) +int PASCAL wWinMain (HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int show) { - LPSTR token = NULL, p; + static const WCHAR dash_aW[] = {'-','a',0}; + static const WCHAR dash_rW[] = {'-','r',0}; + static const WCHAR dash_uW[] = {'-','u',0}; + static const WCHAR dash_wW[] = {'-','w',0}; + + LPWSTR token = NULL, p; BOOL bWait = FALSE; BOOL bURL = FALSE; int ret = 0; @@ -2825,37 +2830,35 @@ int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show token = next_token( &p ); if( !token ) break; - if( !lstrcmpA( token, "-a" ) ) + if( !strcmpW( token, dash_aW ) ) { RefreshFileTypeAssociations(); continue; } - if( !lstrcmpA( token, "-r" ) ) + if( !strcmpW( token, dash_rW ) ) { cleanup_menus(); continue; } - if( !lstrcmpA( token, "-w" ) ) + if( !strcmpW( token, dash_wW ) ) bWait = TRUE; - else if ( !lstrcmpA( token, "-u" ) ) + else if ( !strcmpW( token, dash_uW ) ) bURL = TRUE; else if( token[0] == '-' ) { - WINE_ERR( "unknown option %s\n",token); + WINE_ERR( "unknown option %s\n", wine_dbgstr_w(token) ); } else { - WCHAR link[MAX_PATH]; BOOL bRet; - MultiByteToWideChar( CP_ACP, 0, token, -1, link, sizeof(link)/sizeof(WCHAR) ); if (bURL) - bRet = Process_URL( link, bWait ); + bRet = Process_URL( token, bWait ); else - bRet = Process_Link( link, bWait ); + bRet = Process_Link( token, bWait ); if (!bRet) { - WINE_ERR( "failed to build menu item for %s\n",token); + WINE_ERR( "failed to build menu item for %s\n", wine_dbgstr_w(token) ); ret = 1; } }

1 0

Damjan Jovanovic : winemenubuilder: Use only widechar functions when dealing with registered associations.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: e04422a2b364421d94fed5456e16a280fdceb237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e04422a2b364421d94fed5456… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 4 21:40:34 2010 +0200 winemenubuilder: Use only widechar functions when dealing with registered associations. --- programs/winemenubuilder/winemenubuilder.c | 130 +++++++++++++++++---------- 1 files changed, 82 insertions(+), 48 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 33c2208..201f9ac 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1444,6 +1444,16 @@ static char* wchars_to_unix_chars(LPCWSTR string) return ret; } +static WCHAR* utf8_chars_to_wchars(LPCSTR string) +{ + WCHAR *ret; + INT size = MultiByteToWideChar(CP_UTF8, 0, string, -1, NULL, 0); + ret = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (ret) + MultiByteToWideChar(CP_UTF8, 0, string, -1, ret, size); + return ret; +} + static char *slashes_to_minuses(const char *string) { int i; @@ -1690,15 +1700,15 @@ static BOOL freedesktop_mime_type_for_extension(struct list *native_mime_types, return ret; } -static CHAR* reg_get_valA(HKEY key, LPCSTR subkey, LPCSTR name) +static WCHAR* reg_get_valW(HKEY key, LPCWSTR subkey, LPCWSTR name) { DWORD size; - if (RegGetValueA(key, subkey, name, RRF_RT_REG_SZ, NULL, NULL, &size) == ERROR_SUCCESS) + if (RegGetValueW(key, subkey, name, RRF_RT_REG_SZ, NULL, NULL, &size) == ERROR_SUCCESS) { - CHAR *ret = HeapAlloc(GetProcessHeap(), 0, size); + WCHAR *ret = HeapAlloc(GetProcessHeap(), 0, size); if (ret) { - if (RegGetValueA(key, subkey, name, RRF_RT_REG_SZ, NULL, ret, &size) == ERROR_SUCCESS) + if (RegGetValueW(key, subkey, name, RRF_RT_REG_SZ, NULL, ret, &size) == ERROR_SUCCESS) return ret; } HeapFree(GetProcessHeap(), 0, ret); @@ -1706,18 +1716,14 @@ static CHAR* reg_get_valA(HKEY key, LPCSTR subkey, LPCSTR name) return NULL; } -static WCHAR* reg_get_valW(HKEY key, LPCWSTR subkey, LPCWSTR name) +static CHAR* reg_get_val_utf8(HKEY key, LPCWSTR subkey, LPCWSTR name) { - DWORD size; - if (RegGetValueW(key, subkey, name, RRF_RT_REG_SZ, NULL, NULL, &size) == ERROR_SUCCESS) + WCHAR *valW = reg_get_valW(key, subkey, name); + if (valW) { - WCHAR *ret = HeapAlloc(GetProcessHeap(), 0, size); - if (ret) - { - if (RegGetValueW(key, subkey, name, RRF_RT_REG_SZ, NULL, ret, &size) == ERROR_SUCCESS) - return ret; - } - HeapFree(GetProcessHeap(), 0, ret); + char *val = wchars_to_utf8_chars(valW); + HeapFree(GetProcessHeap(), 0, valW); + return val; } return NULL; } @@ -1732,10 +1738,12 @@ static HKEY open_associations_reg_key(void) return NULL; } -static BOOL has_association_changed(LPCSTR extensionA, LPCWSTR extensionW, LPCSTR mimeType, LPCWSTR progId, LPCSTR appName, LPCWSTR docName) +static BOOL has_association_changed(LPCWSTR extensionW, LPCSTR mimeType, LPCWSTR progId, LPCSTR appName, LPCWSTR docName) { static const WCHAR ProgIDW[] = {'P','r','o','g','I','D',0}; static const WCHAR DocNameW[] = {'D','o','c','N','a','m','e',0}; + static const WCHAR MimeTypeW[] = {'M','i','m','e','T','y','p','e',0}; + static const WCHAR AppNameW[] = {'A','p','p','N','a','m','e',0}; HKEY assocKey; BOOL ret; @@ -1746,7 +1754,7 @@ static BOOL has_association_changed(LPCSTR extensionA, LPCWSTR extensionW, LPCST ret = FALSE; - valueA = reg_get_valA(assocKey, extensionA, "MimeType"); + valueA = reg_get_val_utf8(assocKey, extensionW, MimeTypeW); if (!valueA || lstrcmpA(valueA, mimeType)) ret = TRUE; HeapFree(GetProcessHeap(), 0, valueA); @@ -1756,7 +1764,7 @@ static BOOL has_association_changed(LPCSTR extensionA, LPCWSTR extensionW, LPCST ret = TRUE; HeapFree(GetProcessHeap(), 0, value); - valueA = reg_get_valA(assocKey, extensionA, "AppName"); + valueA = reg_get_val_utf8(assocKey, extensionW, AppNameW); if (!valueA || lstrcmpA(valueA, appName)) ret = TRUE; HeapFree(GetProcessHeap(), 0, valueA); @@ -1780,32 +1788,68 @@ static void update_association(LPCWSTR extension, LPCSTR mimeType, LPCWSTR progI { static const WCHAR ProgIDW[] = {'P','r','o','g','I','D',0}; static const WCHAR DocNameW[] = {'D','o','c','N','a','m','e',0}; - HKEY assocKey; + static const WCHAR MimeTypeW[] = {'M','i','m','e','T','y','p','e',0}; + static const WCHAR AppNameW[] = {'A','p','p','N','a','m','e',0}; + static const WCHAR DesktopFileW[] = {'D','e','s','k','t','o','p','F','i','l','e',0}; + HKEY assocKey = NULL; + HKEY subkey = NULL; + WCHAR *mimeTypeW = NULL; + WCHAR *appNameW = NULL; + WCHAR *desktopFileW = NULL; + + assocKey = open_associations_reg_key(); + if (assocKey == NULL) + { + WINE_ERR("could not open file associations key\n"); + goto done; + } - if ((assocKey = open_associations_reg_key())) + if (RegCreateKeyW(assocKey, extension, &subkey) != ERROR_SUCCESS) { - HKEY subkey; - if (RegCreateKeyW(assocKey, extension, &subkey) == ERROR_SUCCESS) - { - RegSetValueExA(subkey, "MimeType", 0, REG_SZ, (const BYTE*) mimeType, lstrlenA(mimeType) + 1); - RegSetValueExW(subkey, ProgIDW, 0, REG_SZ, (const BYTE*) progId, (lstrlenW(progId) + 1) * sizeof(WCHAR)); - RegSetValueExA(subkey, "AppName", 0, REG_SZ, (const BYTE*) appName, lstrlenA(appName) + 1); - if (docName) - RegSetValueExW(subkey, DocNameW, 0, REG_SZ, (const BYTE*) docName, (lstrlenW(docName) + 1) * sizeof(WCHAR)); - RegSetValueExA(subkey, "DesktopFile", 0, REG_SZ, (const BYTE*) desktopFile, (lstrlenA(desktopFile) + 1)); - RegCloseKey(subkey); - } - else - WINE_ERR("could not create extension subkey\n"); - RegCloseKey(assocKey); + WINE_ERR("could not create extension subkey\n"); + goto done; } - else - WINE_ERR("could not open file associations key\n"); + + mimeTypeW = utf8_chars_to_wchars(mimeType); + if (mimeTypeW == NULL) + { + WINE_ERR("out of memory\n"); + goto done; + } + + appNameW = utf8_chars_to_wchars(appName); + if (appNameW == NULL) + { + WINE_ERR("out of memory\n"); + goto done; + } + + desktopFileW = utf8_chars_to_wchars(desktopFile); + if (desktopFileW == NULL) + { + WINE_ERR("out of memory\n"); + goto done; + } + + RegSetValueExW(subkey, MimeTypeW, 0, REG_SZ, (const BYTE*) mimeTypeW, (lstrlenW(mimeTypeW) + 1) * sizeof(WCHAR)); + RegSetValueExW(subkey, ProgIDW, 0, REG_SZ, (const BYTE*) progId, (lstrlenW(progId) + 1) * sizeof(WCHAR)); + RegSetValueExW(subkey, AppNameW, 0, REG_SZ, (const BYTE*) appNameW, (lstrlenW(appNameW) + 1) * sizeof(WCHAR)); + if (docName) + RegSetValueExW(subkey, DocNameW, 0, REG_SZ, (const BYTE*) docName, (lstrlenW(docName) + 1) * sizeof(WCHAR)); + RegSetValueExW(subkey, DesktopFileW, 0, REG_SZ, (const BYTE*) desktopFile, (lstrlenW(desktopFileW) + 1) * sizeof(WCHAR)); + +done: + RegCloseKey(assocKey); + RegCloseKey(subkey); + HeapFree(GetProcessHeap(), 0, mimeTypeW); + HeapFree(GetProcessHeap(), 0, appNameW); + HeapFree(GetProcessHeap(), 0, desktopFileW); } static BOOL cleanup_associations(void) { static const WCHAR openW[] = {'o','p','e','n',0}; + static const WCHAR DesktopFileW[] = {'D','e','s','k','t','o','p','F','i','l','e',0}; HKEY assocKey; BOOL hasChanged = FALSE; if ((assocKey = open_associations_reg_key())) @@ -1815,7 +1859,6 @@ static BOOL cleanup_associations(void) for (i = 0; !done; i++) { WCHAR *extensionW = NULL; - char *extensionA = NULL; DWORD size = 1024; LSTATUS ret; @@ -1836,20 +1879,13 @@ static BOOL cleanup_associations(void) if (ret == ERROR_SUCCESS) { WCHAR *command; - extensionA = wchars_to_utf8_chars(extensionW); - if (extensionA == NULL) - { - WINE_ERR("out of memory\n"); - done = TRUE; - goto end; - } command = assoc_query(ASSOCSTR_COMMAND, extensionW, openW); if (command == NULL) { - char *desktopFile = reg_get_valA(assocKey, extensionA, "DesktopFile"); + char *desktopFile = reg_get_val_utf8(assocKey, extensionW, DesktopFileW); if (desktopFile) { - WINE_TRACE("removing file type association for %s\n", wine_dbgstr_a(extensionA)); + WINE_TRACE("removing file type association for %s\n", wine_dbgstr_w(extensionW)); remove(desktopFile); } RegDeleteKeyW(assocKey, extensionW); @@ -1864,8 +1900,6 @@ static BOOL cleanup_associations(void) WINE_ERR("error %d while reading registry\n", ret); done = TRUE; } - end: - HeapFree(GetProcessHeap(), 0, extensionA); HeapFree(GetProcessHeap(), 0, extensionW); } RegCloseKey(assocKey); @@ -2111,7 +2145,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package else goto end; /* no progID => not a file type association */ - if (has_association_changed(extensionA, extensionW, mimeTypeA, progIdW, friendlyAppNameA, friendlyDocNameW)) + if (has_association_changed(extensionW, mimeTypeA, progIdW, friendlyAppNameA, friendlyDocNameW)) { char *desktopPath = heap_printf("%s/wine-extension-%s.desktop", applications_dir, &extensionA[1]); if (desktopPath)

1 0