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

Stefan Dösinger : wined3d: Tidy up pshader_hw_tex.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: 45799fdc4ec8529fed07a695be4078b1a820fbbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=45799fdc4ec8529fed07a695b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 18:24:45 2009 +0200 wined3d: Tidy up pshader_hw_tex. Fix the indentation and replace the get_register_name with shader_arb_get_dst_param. --- dlls/wined3d/arb_program_shader.c | 83 ++++++++++++++++++------------------- 1 files changed, 41 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index beb37cf..0eccaa0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1034,7 +1034,6 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)ins->ctx->shader; IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; const struct wined3d_shader_dst_param *dst = &ins->dst[0]; - BOOL is_color; DWORD shader_version = WINED3D_SHADER_VERSION(ins->ctx->reg_maps->shader_version.major, ins->ctx->reg_maps->shader_version.minor); BOOL projected = FALSE, bias = FALSE; @@ -1044,50 +1043,50 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) DWORD reg_sampler_code; /* All versions have a destination register */ - shader_arb_get_register_name(ins->ctx->shader, &dst->reg, reg_dest, &is_color); + shader_arb_get_dst_param(ins, dst, reg_dest); /* 1.0-1.3: Use destination register as coordinate source. 1.4+: Use provided coordinate source register. */ - if (shader_version < WINED3D_SHADER_VERSION(1,4)) - strcpy(reg_coord, reg_dest); - else - shader_arb_get_src_param(ins, &ins->src[0], 0, reg_coord); - - /* 1.0-1.4: Use destination register number as texture code. - 2.0+: Use provided sampler number as texure code. */ - if (shader_version < WINED3D_SHADER_VERSION(2,0)) - reg_sampler_code = dst->reg.idx; - else - reg_sampler_code = ins->src[1].reg.idx; - - /* projection flag: - * 1.1, 1.2, 1.3: Use WINED3DTSS_TEXTURETRANSFORMFLAGS - * 1.4: Use WINED3DSPSM_DZ or WINED3DSPSM_DW on src[0] - * 2.0+: Use WINED3DSI_TEXLD_PROJECT on the opcode - */ - if (shader_version < WINED3D_SHADER_VERSION(1,4)) - { - DWORD flags = 0; - if(reg_sampler_code < MAX_TEXTURES) { - flags = deviceImpl->stateBlock->textureState[reg_sampler_code][WINED3DTSS_TEXTURETRANSFORMFLAGS]; - } - if (flags & WINED3DTTFF_PROJECTED) { - projected = TRUE; - } - } - else if (shader_version < WINED3D_SHADER_VERSION(2,0)) - { - DWORD src_mod = ins->src[0].modifiers; - if (src_mod == WINED3DSPSM_DZ) { - projected = TRUE; - } else if(src_mod == WINED3DSPSM_DW) { - projected = TRUE; - } - } else { - if (ins->flags & WINED3DSI_TEXLD_PROJECT) projected = TRUE; - if (ins->flags & WINED3DSI_TEXLD_BIAS) bias = TRUE; - } - shader_hw_sample(ins, reg_sampler_code, reg_dest, reg_coord, projected, bias); + if (shader_version < WINED3D_SHADER_VERSION(1,4)) + strcpy(reg_coord, reg_dest); + else + shader_arb_get_src_param(ins, &ins->src[0], 0, reg_coord); + + /* 1.0-1.4: Use destination register number as texture code. + 2.0+: Use provided sampler number as texure code. */ + if (shader_version < WINED3D_SHADER_VERSION(2,0)) + reg_sampler_code = dst->reg.idx; + else + reg_sampler_code = ins->src[1].reg.idx; + + /* projection flag: + * 1.1, 1.2, 1.3: Use WINED3DTSS_TEXTURETRANSFORMFLAGS + * 1.4: Use WINED3DSPSM_DZ or WINED3DSPSM_DW on src[0] + * 2.0+: Use WINED3DSI_TEXLD_PROJECT on the opcode + */ + if (shader_version < WINED3D_SHADER_VERSION(1,4)) + { + DWORD flags = 0; + if(reg_sampler_code < MAX_TEXTURES) { + flags = deviceImpl->stateBlock->textureState[reg_sampler_code][WINED3DTSS_TEXTURETRANSFORMFLAGS]; + } + if (flags & WINED3DTTFF_PROJECTED) { + projected = TRUE; + } + } + else if (shader_version < WINED3D_SHADER_VERSION(2,0)) + { + DWORD src_mod = ins->src[0].modifiers; + if (src_mod == WINED3DSPSM_DZ) { + projected = TRUE; + } else if(src_mod == WINED3DSPSM_DW) { + projected = TRUE; + } + } else { + if (ins->flags & WINED3DSI_TEXLD_PROJECT) projected = TRUE; + if (ins->flags & WINED3DSI_TEXLD_BIAS) bias = TRUE; + } + shader_hw_sample(ins, reg_sampler_code, reg_dest, reg_coord, projected, bias); } static void pshader_hw_texcoord(const struct wined3d_shader_instruction *ins)

1 0

Stefan Dösinger : wined3d: Fix 1. 4 pshader projection in ARB.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: fc5e511dda1683c9bfd3b29011d08118e14bb842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5e511dda1683c9bfd3b2901… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 5 22:13:12 2009 +0200 wined3d: Fix 1.4 pshader projection in ARB. shader_arb_add_src_param handled DW and TXP undid it again. Remove DZ DW from the modifiers and handle it in the instruction. DZ cannot be handled by TXP as is, so move the .z component to .w and make it DW-like. Using SZW+TXP is likely more efficient than the RCP, MUL, TEX we'd get if we let shader_arb_add_src_param do the job. --- dlls/wined3d/arb_program_shader.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0eccaa0..1e97f1b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1037,6 +1037,7 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) DWORD shader_version = WINED3D_SHADER_VERSION(ins->ctx->reg_maps->shader_version.major, ins->ctx->reg_maps->shader_version.minor); BOOL projected = FALSE, bias = FALSE; + struct wined3d_shader_src_param src; char reg_dest[40]; char reg_coord[40]; @@ -1049,8 +1050,13 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) 1.4+: Use provided coordinate source register. */ if (shader_version < WINED3D_SHADER_VERSION(1,4)) strcpy(reg_coord, reg_dest); - else - shader_arb_get_src_param(ins, &ins->src[0], 0, reg_coord); + else { + /* TEX is the only instruction that can handle DW and DZ natively */ + src = ins->src[0]; + if(src.modifiers == WINED3DSPSM_DW) src.modifiers = WINED3DSPSM_NONE; + if(src.modifiers == WINED3DSPSM_DZ) src.modifiers = WINED3DSPSM_NONE; + shader_arb_get_src_param(ins, &src, 0, reg_coord); + } /* 1.0-1.4: Use destination register number as texture code. 2.0+: Use provided sampler number as texure code. */ @@ -1078,6 +1084,11 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) { DWORD src_mod = ins->src[0].modifiers; if (src_mod == WINED3DSPSM_DZ) { + /* TXP cannot handle DZ natively, so move the z coordinate to .w. reg_coord is a read-only + * varying register, so we need a temp reg + */ + shader_addline(ins->ctx->buffer, "SWZ TA, %s, x, y, z, z;\n", reg_coord); + strcpy(reg_coord, "TA"); projected = TRUE; } else if(src_mod == WINED3DSPSM_DW) { projected = TRUE;

1 0

Anders Jonsson : mshtml: Update Swedish translation.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: 0b014530e47f682617d710c537b296e668c49890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b014530e47f682617d710c53… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Tue May 12 20:12:38 2009 +0200 mshtml: Update Swedish translation. --- dlls/mshtml/Sv.rc | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/Sv.rc b/dlls/mshtml/Sv.rc index 2d9c292..b6a1fd0 100644 --- a/dlls/mshtml/Sv.rc +++ b/dlls/mshtml/Sv.rc @@ -51,6 +51,17 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS LTEXT "&URL:", -1, 10, 42, 20, 10 EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Ok", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Avbryt", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP } + +ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30 + EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Avbryt", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP +}

1 0

Nikolay Sivov : comctl32/listview: Use neutral LVITEM in ListView_SetItemState macro.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: afaa6d463549172806d1aa1dfcc711f064c2dec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afaa6d463549172806d1aa1df… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue May 12 23:16:59 2009 +0400 comctl32/listview: Use neutral LVITEM in ListView_SetItemState macro. --- include/commctrl.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 5561e1d..7f431e3 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3720,8 +3720,8 @@ typedef struct NMLVSCROLL (INT)SNDMSGW((hwnd),LVM_SETITEMW,0,(LPARAM)(const LVITEMW *)(pitem)) #define ListView_SetItem WINELIB_NAME_AW(ListView_SetItem) #define ListView_SetItemState(hwnd,i,data,dataMask) \ -{ LVITEMA _LVi; _LVi.state = data; _LVi.stateMask = dataMask;\ - SNDMSG(hwnd, LVM_SETITEMSTATE, (WPARAM)(UINT)i, (LPARAM) (LPLVITEMA)&_LVi);} +{ LVITEM _LVi; _LVi.state = data; _LVi.stateMask = dataMask;\ + SNDMSG(hwnd, LVM_SETITEMSTATE, (WPARAM)(UINT)i, (LPARAM) (LPLVITEM)&_LVi);} #define ListView_GetItemState(hwnd,i,mask) \ (UINT)SNDMSG((hwnd),LVM_GETITEMSTATE,(WPARAM)(UINT)(i),(LPARAM)(UINT)(mask)) #define ListView_GetCountPerPage(hwnd) \

1 0

Nikolay Sivov : comctl32/listview: Don' t check for state changes we are not aware to store (with some tests).
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: a1cac2c314c0755928d72920aa92b8516ac0111c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1cac2c314c0755928d72920a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed May 13 02:09:18 2009 +0400 comctl32/listview: Don't check for state changes we are not aware to store (with some tests). --- dlls/comctl32/listview.c | 6 +++- dlls/comctl32/tests/listview.c | 52 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index f31175f..e94d389 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3508,7 +3508,8 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL item.iItem = lpLVItem->iItem; item.iSubItem = lpLVItem->iSubItem; item.mask = LVIF_STATE | LVIF_PARAM; - item.stateMask = ~0; + item.stateMask = (infoPtr->dwStyle & LVS_OWNERDATA) ? LVIS_FOCUSED | LVIS_SELECTED : ~0; + item.state = 0; item.lParam = 0; if (!isNew && !LISTVIEW_GetItemW(infoPtr, &item)) return FALSE; @@ -5553,7 +5554,8 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, dispInfo.item.state = 0; /* apparently, we should not callback for lParam in LVS_OWNERDATA */ - if ((lpLVItem->mask & ~(LVIF_STATE | LVIF_PARAM)) || infoPtr->uCallbackMask) + if ((lpLVItem->mask & ~(LVIF_STATE | LVIF_PARAM)) || + ((lpLVItem->mask & LVIF_STATE) && (infoPtr->uCallbackMask & lpLVItem->stateMask))) { UINT mask = lpLVItem->mask; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 43eb274..6386655 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -180,6 +180,11 @@ static const struct message textcallback_set_again_parent_seq[] = { { 0 } }; +static const struct message single_getdispinfo_parent_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_GETDISPINFOA }, + { 0 } +}; + struct subclass_info { WNDPROC oldproc; @@ -2045,6 +2050,53 @@ static void test_ownerdata(void) ok_sequence(sequences, PARENT_SEQ_INDEX, ownderdata_select_focus_parent_seq, "ownerdata focus notification", TRUE); DestroyWindow(hwnd); + + /* check notifications on LVM_GETITEM */ + /* zero callback mask */ + hwnd = create_listview_control(LVS_OWNERDATA); + ok(hwnd != NULL, "failed to create a listview window\n"); + res = SendMessageA(hwnd, LVM_SETITEMCOUNT, 1, 0); + ok(res != 0, "Expected LVM_SETITEMCOUNT to succeed\n"); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + memset(&item, 0, sizeof(item)); + item.stateMask = LVIS_SELECTED; + item.mask = LVIF_STATE; + res = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, res); + + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "ownerdata getitem selected state 1", FALSE); + + /* non zero callback mask but not we asking for */ + res = SendMessageA(hwnd, LVM_SETCALLBACKMASK, LVIS_OVERLAYMASK, 0); + expect(TRUE, res); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + memset(&item, 0, sizeof(item)); + item.stateMask = LVIS_SELECTED; + item.mask = LVIF_STATE; + res = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, res); + + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "ownerdata getitem selected state 2", FALSE); + + /* LVIS_OVERLAYMASK callback mask, asking for index */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + memset(&item, 0, sizeof(item)); + item.stateMask = LVIS_OVERLAYMASK; + item.mask = LVIF_STATE; + res = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, res); + + ok_sequence(sequences, PARENT_SEQ_INDEX, single_getdispinfo_parent_seq, + "ownerdata getitem selected state 2", FALSE); + + DestroyWindow(hwnd); } static void test_norecompute(void)

1 0

Paul Vriens : wininet/tests: Fix some test failures with IE8 on W2K3.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: 4a781276a7a132a73743c7665238a03dc172d02d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a781276a7a132a73743c7665… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed May 13 08:05:16 2009 +0200 wininet/tests: Fix some test failures with IE8 on W2K3. --- dlls/wininet/tests/internet.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 176f3d8..5f36c3d 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -742,8 +742,9 @@ static void test_IsDomainLegalCookieDomainW(void) error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); ok(error == ERROR_SXS_KEY_NOT_FOUND || + error == ERROR_SUCCESS || /* IE8 on W2K3 */ error == 0xdeadbeef, /* up to IE7 */ - "got %u expected ERROR_SXS_KEY_NOT_FOUND or 0xdeadbeef\n", error); + "unexpected error: %u\n", error); ret = pIsDomainLegalCookieDomainW(gmail_com, gmail_com); ok(ret, "IsDomainLegalCookieDomainW failed\n"); @@ -754,9 +755,9 @@ static void test_IsDomainLegalCookieDomainW(void) ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); ok(error == ERROR_SXS_KEY_NOT_FOUND || /* IE8 on XP */ error == ERROR_FILE_NOT_FOUND || /* IE8 on Vista */ + error == ERROR_SUCCESS || /* IE8 on W2K3 */ error == 0xdeadbeef, /* up to IE7 */ - "got %u expected ERROR_SXS_KEY_NOT_FOUND, ERROR_FILE_NOT_FOUND or " - "0xdeadbeef\n", error); + "unexpected error: %u\n", error); ret = pIsDomainLegalCookieDomainW(uk, co_uk); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n");

1 0

Paul Vriens : mshtml/tests: Fix some test failures with IE8.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: f71904872ad0e4a452db63cef3734856d92e0ca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f71904872ad0e4a452db63cef… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed May 13 08:09:43 2009 +0200 mshtml/tests: Fix some test failures with IE8. --- dlls/mshtml/tests/protocol.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 36355bf..adee2cb 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -350,14 +350,18 @@ static void test_res_protocol(void) sizeof(buf)/sizeof(buf[0]), &size, 0); ok(hres == S_OK || hres == E_FAIL, "ParseUrl failed: %08x\n", hres); ok(buf[0] == '?', "buf changed\n"); - ok(size == sizeof(blank_url)/sizeof(WCHAR), "size=%d\n", size); + ok(size == sizeof(blank_url)/sizeof(WCHAR) || + size == sizeof(buf)/sizeof(buf[0]), /* IE8 */ + "size=%d\n", size); size = 0xdeadbeef; hres = IInternetProtocolInfo_ParseUrl(protocol_info, wrong_url1, PARSE_DOMAIN, 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); ok(hres == S_OK || hres == E_FAIL, "ParseUrl failed: %08x\n", hres); ok(buf[0] == '?', "buf changed\n"); - ok(size == sizeof(wrong_url1)/sizeof(WCHAR), "size=%d\n", size); + ok(size == sizeof(wrong_url1)/sizeof(WCHAR) || + size == sizeof(buf)/sizeof(buf[0]), /* IE8 */ + "size=%d\n", size); if (0) { @@ -653,7 +657,9 @@ static void test_about_protocol(void) sizeof(buf)/sizeof(buf[0]), &size, 0); ok(hres == S_OK || hres == E_FAIL, "ParseUrl failed: %08x\n", hres); ok(buf[0] == '?', "buf changed\n"); - ok(size == sizeof(about_blank_url)/sizeof(WCHAR), "size=%d\n", size); + ok(size == sizeof(about_blank_url)/sizeof(WCHAR) || + size == sizeof(buf)/sizeof(buf[0]), /* IE8 */ + "size=%d\n", size); if (0) {

1 0

Paul Vriens : shdocvw/tests: Fix a test failure with IE8.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: 52fdc9e265d5a766ad7e1691ed42abc2aa8e8d5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=52fdc9e265d5a766ad7e1691e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed May 13 11:18:18 2009 +0200 shdocvw/tests: Fix a test failure with IE8. --- dlls/shdocvw/tests/webbrowser.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index fe7df89..131b29c 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -275,6 +275,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 66: /* TODO */ case 67: /* TODO */ case 69: /* TODO */ + case 101: /* TODO (IE8) */ return E_FAIL; default: ok(0, "unexpected nCmdID %d\n", nCmdID);

1 0

Hans Leidekker : setupapi: Add stub implementations of SetupUninstallOEMInfA/W.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: d5009479bb73e1662b1cdd46fc22ec1981f237ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5009479bb73e1662b1cdd46f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 13 10:50:15 2009 +0200 setupapi: Add stub implementations of SetupUninstallOEMInfA/W. --- dlls/setupapi/misc.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/setupapi/setupapi.spec | 2 ++ include/setupapi.h | 3 +++ 3 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 63320e6..36d52ba 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -1114,6 +1114,45 @@ BOOL WINAPI SetupCopyOEMInfW( PCWSTR source, PCWSTR location, } /*********************************************************************** + * SetupUninstallOEMInfA (SETUPAPI.@) + */ +BOOL WINAPI SetupUninstallOEMInfA( PCSTR inf_file, DWORD flags, PVOID reserved ) +{ + BOOL ret; + WCHAR *inf_fileW = NULL; + + TRACE("%s, 0x%08x, %p\n", debugstr_a(inf_file), flags, reserved); + + if (inf_file && !(inf_fileW = strdupAtoW( inf_file ))) return FALSE; + ret = SetupUninstallOEMInfW( inf_fileW, flags, reserved ); + HeapFree( GetProcessHeap(), 0, inf_fileW ); + return ret; +} + +/*********************************************************************** + * SetupUninstallOEMInfW (SETUPAPI.@) + */ +BOOL WINAPI SetupUninstallOEMInfW( PCWSTR inf_file, DWORD flags, PVOID reserved ) +{ + static const WCHAR infW[] = {'\\','i','n','f','\\',0}; + WCHAR target[MAX_PATH]; + + TRACE("%s, 0x%08x, %p\n", debugstr_w(inf_file), flags, reserved); + + if (!GetWindowsDirectoryW( target, sizeof(target)/sizeof(WCHAR) )) return FALSE; + + strcatW( target, infW ); + strcatW( target, inf_file ); + + if (flags & SUOI_FORCEDELETE) + return DeleteFileW(target); + + FIXME("not deleting %s\n", debugstr_w(target)); + + return TRUE; +} + +/*********************************************************************** * InstallCatalog (SETUPAPI.@) */ DWORD WINAPI InstallCatalog( LPCSTR catalog, LPCSTR basename, LPSTR fullname ) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index cd7bf62..d620399 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -526,6 +526,8 @@ @ stdcall SetupSetSourceListW(long ptr long) @ stdcall SetupTermDefaultQueueCallback(ptr) @ stdcall SetupTerminateFileLog(long) +@ stdcall SetupUninstallOEMInfA(str long ptr) +@ stdcall SetupUninstallOEMInfW(wstr long ptr) @ stub ShouldDeviceBeExcluded @ stdcall StampFileSecurity(wstr ptr) @ stdcall StringTableAddString(ptr wstr long) diff --git a/include/setupapi.h b/include/setupapi.h index 009af29..c4e1664 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1391,6 +1391,9 @@ typedef enum { /* SetupConfigureWmiFromInfSection Flags values */ #define SCWMI_CLOBBER_SECURITY 0x00000001 +/* SetupUninstallOEMInf Flags values */ +#define SUOI_FORCEDELETE 0x00000001 + LONG WINAPI AddTagToGroupOrderList(PCWSTR lpGroupName, DWORD dwUnknown2, DWORD dwUnknown3); DWORD WINAPI CaptureAndConvertAnsiArg(PCSTR lpSrc, PWSTR *lpDst); DWORD WINAPI CaptureStringArg(PCWSTR lpSrc, PWSTR *lpDst);

1 0

Hans Leidekker : setupapi: Add stub implementations of CM_Get_Device_Interface_List_Size_ExA/W.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: 9df5fc58b1df5a065278c2f055e10287582724ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=9df5fc58b1df5a065278c2f05… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 13 10:50:35 2009 +0200 setupapi: Add stub implementations of CM_Get_Device_Interface_List_Size_ExA/W. --- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index d620399..e3fe250 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -95,8 +95,8 @@ @ stub CM_Get_Device_Interface_List_ExW @ stub CM_Get_Device_Interface_List_SizeA @ stub CM_Get_Device_Interface_List_SizeW -@ stub CM_Get_Device_Interface_List_Size_ExA -@ stub CM_Get_Device_Interface_List_Size_ExW +@ stdcall CM_Get_Device_Interface_List_Size_ExA(ptr ptr str long ptr) +@ stdcall CM_Get_Device_Interface_List_Size_ExW(ptr ptr wstr long ptr) @ stub CM_Get_First_Log_Conf @ stub CM_Get_First_Log_Conf_Ex @ stub CM_Get_Global_State diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 4478066..eed8972 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -285,3 +285,23 @@ CONFIGRET WINAPI CM_Locate_DevNode_ExW(PDEVINST pdnDevInst, DEVINSTID_W pDeviceI return CR_FAILURE; } + +/*********************************************************************** + * CM_Get_Device_Interface_List_Size_ExA (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExA(PULONG len, LPGUID class, DEVINSTID_A id, + ULONG flags, HMACHINE machine) +{ + FIXME("%p %p %s 0x%08x %p: stub\n", len, class, debugstr_a(id), flags, machine); + return CR_FAILURE; +} + +/*********************************************************************** + * CM_Get_Device_Interface_List_Size_ExW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExW(PULONG len, LPGUID class, DEVINSTID_W id, + ULONG flags, HMACHINE machine) +{ + FIXME("%p %p %s 0x%08x %p: stub\n", len, class, debugstr_w(id), flags, machine); + return CR_FAILURE; +}

1 0