April 2006 - Wine-Commits - list.winehq.org

Ivan Gyurdiev : wined3d: Fix _dw modifier.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: 7e5f734ee37d14fc89a391f55aa445b10d830261 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7e5f734ee37d14fc89a391f… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Sat Apr 15 17:06:52 2006 -0400 wined3d: Fix _dw modifier. The _dw modifier needs to specify a component swizzle, just like the _dz currently does. --- dlls/wined3d/pixelshader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 56b7cd6..f0d5f8c 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -940,7 +940,7 @@ inline static int gen_input_modifier_lin strcat(line, tmpline); break; case D3DSPSM_DW: - sprintf(line, "RCP T%c, %s;", 'A' + tmpreg, regstr); + sprintf(line, "RCP T%c, %s.w;", 'A' + tmpreg, regstr); sprintf(tmpline, "MUL T%c, %s, T%c;", 'A' + tmpreg, regstr, 'A' + tmpreg); strcat(line, "\n"); /* Hack */ strcat(line, tmpline);

1 0

Ivan Gyurdiev : wined3d: Dcl opcode takes 2 parameters.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: e0a1442f6c7f1b34e5b5fcbc644200748f6c4440 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e0a1442f6c7f1b34e5b5fcb… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Sat Apr 15 15:00:36 2006 -0400 wined3d: Dcl opcode takes 2 parameters. --- dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/vertexshader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index f0d5f8c..e010452 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -662,7 +662,7 @@ CONST SHADER_OPCODE IWineD3DPixelShaderI /** FIXME: use direct access so add the others opcodes as stubs */ /* DCL is a specil operation */ - {D3DSIO_DCL, "dcl", NULL, 1, pshader_dcl, 0, 0}, + {D3DSIO_DCL, "dcl", NULL, 2, pshader_dcl, 0, 0}, {D3DSIO_POW, "pow", "POW", 3, pshader_pow, 0, 0}, {D3DSIO_CRS, "crs", "XPS", 3, pshader_crs, 0, 0}, /* TODO: sng can possibly be performed as diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index b2dd7b9..4179c0f 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -611,7 +611,7 @@ CONST SHADER_OPCODE IWineD3DVertexShader /** FIXME: use direct access so add the others opcodes as stubs */ /* DCL is a specil operation */ - {D3DSIO_DCL, "dcl", NULL, 1, vshader_dcl, 0, 0}, + {D3DSIO_DCL, "dcl", NULL, 2, vshader_dcl, 0, 0}, {D3DSIO_POW, "pow", "POW", 3, vshader_pow, 0, 0}, {D3DSIO_CRS, "crs", "XPS", 3, vshader_crs, 0, 0}, /* TODO: sng can possibly be performed as

1 0

Ivan Gyurdiev : wined3d: Fix flow control instructions number of parameters .
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: d3d56e765d9129aaa7e0719d458182d0336aa4fa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d3d56e765d9129aaa7e0719… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Sun Apr 16 05:25:15 2006 -0400 wined3d: Fix flow control instructions number of parameters. - else, endif, break take 0 parameters [not 2] - if, rep take 1 parameter [not 2] - breakp takes 1 parameter [not 2] - move all flow control instructions in one place - sync software shaders signatures with this --- dlls/wined3d/pixelshader.c | 52 +++++++++++++++++++++-------------------- dlls/wined3d/vertexshader.c | 55 ++++++++++++++++++++++--------------------- 2 files changed, 55 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=d3d56e765d9129aaa7e…

1 0

Ivan Gyurdiev : wined3d: Skip unhandled opcodes in vshaders.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: 0d6eaf363de7608de67c48011663f3e5d864b1b2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0d6eaf363de7608de67c480… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Sun Apr 16 05:43:47 2006 -0400 wined3d: Skip unhandled opcodes in vshaders. --- dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/vertexshader.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 735b633..08d194a 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -1378,7 +1378,7 @@ inline static VOID IWineD3DPixelShaderIm } else { FIXME("Can't handle opcode %s in hwShader\n", curOpcode->name); } - pToken += curOpcode->num_params; /* maybe + 1 */ + pToken += curOpcode->num_params; continue; } diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index ff33416..902a69c 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -1672,7 +1672,11 @@ inline static VOID IWineD3DVertexShaderI } else { FIXME("Can't handle opcode %s in hwShader\n", curOpcode->name); } + + pToken += curOpcode->num_params; + continue; } + if (curOpcode->num_params > 0) { vshader_program_add_param(This, *pToken, FALSE, tmpLine);

1 0

Ivan Gyurdiev : wined3d: Texkill is supported for ps2.0-3.0.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: d486b93e307d9a48da6053f37c01cb4386412895 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d486b93e307d9a48da6053f… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Sun Apr 16 05:33:30 2006 -0400 wined3d: Texkill is supported for ps2.0-3.0. --- dlls/wined3d/pixelshader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index a3533a6..735b633 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -702,7 +702,7 @@ CONST SHADER_OPCODE IWineD3DPixelShaderI {D3DSIO_TEXCOORD, "texcoord", "undefined", 1, pshader_texcoord, 0, D3DPS_VERSION(1,3)}, {D3DSIO_TEXCOORD, "texcrd", "undefined", 2, pshader_texcoord, D3DPS_VERSION(1,4), D3DPS_VERSION(1,4)}, - {D3DSIO_TEXKILL, "texkill", "KIL", 1, pshader_texkill, D3DPS_VERSION(1,0), D3DPS_VERSION(1,4)}, + {D3DSIO_TEXKILL, "texkill", "KIL", 1, pshader_texkill, D3DPS_VERSION(1,0), D3DPS_VERSION(3,0)}, {D3DSIO_TEX, "tex", "undefined", 1, pshader_tex, 0, D3DPS_VERSION(1,3)}, {D3DSIO_TEX, "texld", "undefined", 2, pshader_texld, D3DPS_VERSION(1,4), D3DPS_VERSION(1,4)}, {D3DSIO_TEX, "texld", GLNAME_REQUIRE_GLSL, 3, pshader_texld, D3DPS_VERSION(2,0), -1},

1 0

Mikołaj Zalewski : comctl32: Send Unicode notifications if required in header control.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: 84c3189445b201285ef5b598d011875d429bf2cc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=84c3189445b201285ef5b59… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Apr 17 17:09:56 2006 +0200 comctl32: Send Unicode notifications if required in header control. --- dlls/comctl32/header.c | 38 +++++++++++++++++++++++--------------- 1 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 259a4d5..ed235e8 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -94,6 +94,8 @@ typedef struct #define VERT_BORDER 3 #define DIVIDER_WIDTH 10 +#define HDN_UNICODE_OFFSET 20 +#define HDN_FIRST_UNICODE (HDN_FIRST-HDN_UNICODE_OFFSET) #define HEADER_GetInfoPtr(hwnd) ((HEADER_INFO *)GetWindowLongPtrW(hwnd,0)) @@ -567,6 +569,14 @@ HEADER_DrawTrackLine (HWND hwnd, HDC hdc SelectObject (hdc, hOldPen); } +static UINT HEADER_NotifyCodeWtoA(UINT code) +{ + /* we use the fact that all the unicode messages are in HDN_FIRST_UNICODE..HDN_LAST*/ + if (code >= HDN_LAST && code <= HDN_FIRST_UNICODE) + return code + HDN_UNICODE_OFFSET; + else + return code; +} static BOOL HEADER_SendSimpleNotify (HWND hwnd, UINT code) @@ -583,7 +593,7 @@ HEADER_SendSimpleNotify (HWND hwnd, UINT } static BOOL -HEADER_SendHeaderNotify (HWND hwnd, UINT code, INT iItem, INT mask) +HEADER_SendHeaderNotifyT (HWND hwnd, UINT code, INT iItem, INT mask) { HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); NMHEADERA nmhdr; @@ -591,7 +601,7 @@ HEADER_SendHeaderNotify (HWND hwnd, UINT nmhdr.hdr.hwndFrom = hwnd; nmhdr.hdr.idFrom = GetWindowLongPtrW (hwnd, GWLP_ID); - nmhdr.hdr.code = code; + nmhdr.hdr.code = (infoPtr->nNotifyFormat == NFR_UNICODE ? code : HEADER_NotifyCodeWtoA(code)); nmhdr.iItem = iItem; nmhdr.iButton = 0; nmhdr.pitem = &nmitem; @@ -1158,8 +1168,7 @@ HEADER_SetItemT (HWND hwnd, INT nItem, L TRACE("[nItem=%d]\n", nItem); - if (HEADER_SendHeaderNotify (hwnd, bUnicode ? HDN_ITEMCHANGINGW : HDN_ITEMCHANGINGA, - nItem, phdi->mask)) + if (HEADER_SendHeaderNotifyT (hwnd, HDN_ITEMCHANGINGW, nItem, phdi->mask)) return FALSE; lpItem = &infoPtr->items[nItem]; @@ -1237,8 +1246,7 @@ HEADER_SetItemT (HWND hwnd, INT nItem, L } } - HEADER_SendHeaderNotify (hwnd, bUnicode ? HDN_ITEMCHANGEDW : HDN_ITEMCHANGEDA, - nItem, phdi->mask); + HEADER_SendHeaderNotifyT (hwnd, HDN_ITEMCHANGEDW, nItem, phdi->mask); HEADER_SetItemBounds (hwnd); @@ -1355,9 +1363,9 @@ HEADER_LButtonDblClk (HWND hwnd, WPARAM HEADER_InternalHitTest (hwnd, &pt, &flags, &nItem); if ((GetWindowLongW (hwnd, GWL_STYLE) & HDS_BUTTONS) && (flags == HHT_ONHEADER)) - HEADER_SendHeaderNotify (hwnd, HDN_ITEMDBLCLICKA, nItem,0); + HEADER_SendHeaderNotifyT (hwnd, HDN_ITEMDBLCLICKW, nItem,0); else if ((flags == HHT_ONDIVIDER) || (flags == HHT_ONDIVOPEN)) - HEADER_SendHeaderNotify (hwnd, HDN_DIVIDERDBLCLICKA, nItem,0); + HEADER_SendHeaderNotifyT (hwnd, HDN_DIVIDERDBLCLICKW, nItem,0); return 0; } @@ -1393,7 +1401,7 @@ HEADER_LButtonDown (HWND hwnd, WPARAM wP TRACE("Pressed item %d!\n", nItem); } else if ((flags == HHT_ONDIVIDER) || (flags == HHT_ONDIVOPEN)) { - if (!(HEADER_SendHeaderNotify (hwnd, HDN_BEGINTRACKA, nItem,0))) { + if (!(HEADER_SendHeaderNotifyT (hwnd, HDN_BEGINTRACKW, nItem,0))) { SetCapture (hwnd); infoPtr->bCaptured = TRUE; infoPtr->bTracking = TRUE; @@ -1468,7 +1476,7 @@ HEADER_LButtonUp (HWND hwnd, WPARAM wPar TRACE("End tracking item %d!\n", infoPtr->iMoveItem); infoPtr->bTracking = FALSE; - HEADER_SendHeaderNotify (hwnd, HDN_ENDTRACKA, infoPtr->iMoveItem,HDI_WIDTH); + HEADER_SendHeaderNotifyT (hwnd, HDN_ENDTRACKW, infoPtr->iMoveItem,HDI_WIDTH); if (!(dwStyle & HDS_FULLDRAG)) { hdc = GetDC (hwnd); @@ -1476,7 +1484,7 @@ HEADER_LButtonUp (HWND hwnd, WPARAM wPar ReleaseDC (hwnd, hdc); } - if (HEADER_SendHeaderNotify(hwnd, HDN_ITEMCHANGINGA, infoPtr->iMoveItem, HDI_WIDTH)) + if (HEADER_SendHeaderNotifyT(hwnd, HDN_ITEMCHANGINGW, infoPtr->iMoveItem, HDI_WIDTH)) { infoPtr->items[infoPtr->iMoveItem].cxy = infoPtr->nOldWidth; } @@ -1489,7 +1497,7 @@ HEADER_LButtonUp (HWND hwnd, WPARAM wPar HEADER_SetItemBounds (hwnd); InvalidateRect(hwnd, NULL, TRUE); - HEADER_SendHeaderNotify(hwnd, HDN_ITEMCHANGEDA, infoPtr->iMoveItem, HDI_WIDTH); + HEADER_SendHeaderNotifyT(hwnd, HDN_ITEMCHANGEDW, infoPtr->iMoveItem, HDI_WIDTH); } if (infoPtr->bCaptured) { @@ -1582,13 +1590,13 @@ HEADER_MouseMove (HWND hwnd, WPARAM wPar } else if (infoPtr->bTracking) { if (dwStyle & HDS_FULLDRAG) { - if (!HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGINGA, infoPtr->iMoveItem, HDI_WIDTH)) + if (!HEADER_SendHeaderNotifyT (hwnd, HDN_ITEMCHANGINGW, infoPtr->iMoveItem, HDI_WIDTH)) { nWidth = pt.x - infoPtr->items[infoPtr->iMoveItem].rect.left + infoPtr->xTrackOffset; if (nWidth < 0) nWidth = 0; infoPtr->items[infoPtr->iMoveItem].cxy = nWidth; - HEADER_SendHeaderNotify(hwnd, HDN_ITEMCHANGEDA, infoPtr->iMoveItem, HDI_WIDTH); + HEADER_SendHeaderNotifyT(hwnd, HDN_ITEMCHANGEDW, infoPtr->iMoveItem, HDI_WIDTH); } HEADER_SetItemBounds (hwnd); InvalidateRect(hwnd, NULL, FALSE); @@ -1603,7 +1611,7 @@ HEADER_MouseMove (HWND hwnd, WPARAM wPar infoPtr->xOldTrack - infoPtr->items[infoPtr->iMoveItem].rect.left; HEADER_DrawTrackLine (hwnd, hdc, infoPtr->xOldTrack); ReleaseDC (hwnd, hdc); - HEADER_SendHeaderNotify (hwnd, HDN_TRACKA, infoPtr->iMoveItem, HDI_WIDTH); + HEADER_SendHeaderNotifyT (hwnd, HDN_TRACKW, infoPtr->iMoveItem, HDI_WIDTH); } TRACE("Tracking item %d!\n", infoPtr->iMoveItem);

1 0

Mikołaj Zalewski : comctl32: Scroll listview if changing scroll bounds changes the scroll pos.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: cb3424f642733ecdc5bdff93ab36d24558d9d4ad URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cb3424f642733ecdc5bdff9… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Apr 17 16:53:19 2006 +0200 comctl32: Scroll listview if changing scroll bounds changes the scroll pos. --- dlls/comctl32/listview.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 808dc93..4878778 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1634,6 +1634,7 @@ static void LISTVIEW_UpdateScroll(LISTVI { UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; SCROLLINFO horzInfo, vertInfo; + INT dx, dy; if ((infoPtr->dwStyle & LVS_NOSCROLL) || !is_redrawing(infoPtr)) return; @@ -1666,7 +1667,8 @@ static void LISTVIEW_UpdateScroll(LISTVI horzInfo.fMask = SIF_RANGE | SIF_PAGE; horzInfo.nMax = max(horzInfo.nMax - 1, 0); - SetScrollInfo(infoPtr->hwndSelf, SB_HORZ, &horzInfo, TRUE); + dx = GetScrollPos(infoPtr->hwndSelf, SB_HORZ); + dx -= SetScrollInfo(infoPtr->hwndSelf, SB_HORZ, &horzInfo, TRUE); TRACE("horzInfo=%s\n", debugscrollinfo(&horzInfo)); /* Setting the horizontal scroll can change the listview size @@ -1697,9 +1699,19 @@ static void LISTVIEW_UpdateScroll(LISTVI vertInfo.fMask = SIF_RANGE | SIF_PAGE; vertInfo.nMax = max(vertInfo.nMax - 1, 0); - SetScrollInfo(infoPtr->hwndSelf, SB_VERT, &vertInfo, TRUE); + dy = GetScrollPos(infoPtr->hwndSelf, SB_VERT); + dy -= SetScrollInfo(infoPtr->hwndSelf, SB_VERT, &vertInfo, TRUE); TRACE("vertInfo=%s\n", debugscrollinfo(&vertInfo)); + /* Change of the range may have changed the scroll pos. If so move the content */ + if (dx != 0 || dy != 0) + { + RECT listRect; + listRect = infoPtr->rcList; + ScrollWindowEx(infoPtr->hwndSelf, dx, dy, &listRect, &listRect, 0, 0, + SW_ERASE | SW_INVALIDATE); + } + /* Update the Header Control */ if (uView == LVS_REPORT) {

1 0

Mikołaj Zalewski : shell32: Use LVCOLUMW instead of LVCOLUMNA in LVM_INSERTCOLUMNW listview message.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: 89ed90f3e566710d7f6aa42860f895cd16b17a54 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=89ed90f3e566710d7f6aa42… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Apr 17 16:59:25 2006 +0200 shell32: Use LVCOLUMW instead of LVCOLUMNA in LVM_INSERTCOLUMNW listview message. --- dlls/shell32/shlview.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 7364f42..46a1168 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -366,10 +366,10 @@ static BOOL ShellView_CreateList (IShell */ static BOOL ShellView_InitList(IShellViewImpl * This) { - LVCOLUMNA lvColumn; + LVCOLUMNW lvColumn; SHELLDETAILS sd; int i; - char szTemp[50]; + WCHAR szTemp[50]; TRACE("%p\n",This); @@ -386,7 +386,7 @@ static BOOL ShellView_InitList(IShellVie break; lvColumn.fmt = sd.fmt; lvColumn.cx = sd.cxChar*8; /* chars->pixel */ - StrRetToStrNA( szTemp, 50, &sd.str, NULL); + StrRetToStrNW( szTemp, 50, &sd.str, NULL); SendMessageW(This->hWndList, LVM_INSERTCOLUMNW, i, (LPARAM) &lvColumn); } }

1 0

Mikołaj Zalewski : progman: Fix two simple bugs.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: d6cb3e8b98969a90954623ce9f984048e96b9792 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d6cb3e8b98969a90954623c… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Apr 17 17:01:11 2006 +0200 progman: Fix two simple bugs. Use correctly the GetOpenFileName function. Use _lcreat instead of _lopen to create a new file. --- programs/progman/dialog.c | 12 ++++++------ programs/progman/grpfile.c | 10 +--------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/programs/progman/dialog.c b/programs/progman/dialog.c index fbfdc23..50713a0 100644 --- a/programs/progman/dialog.c +++ b/programs/progman/dialog.c @@ -328,6 +328,7 @@ static BOOL CALLBACK DIALOG_PROGRAM_DlgP case PM_BROWSE: { CHAR filename[MAX_PATHNAME_LEN]; + filename[0] = 0; if (DIALOG_BrowsePrograms(hDlg, filename, sizeof(filename))) SetDlgItemText(hDlg, PM_COMMAND_LINE, filename); return TRUE; @@ -450,6 +451,7 @@ static BOOL CALLBACK DIALOG_SYMBOL_DlgPr case PM_BROWSE: { CHAR filename[MAX_PATHNAME_LEN]; + filename[0] = 0; if (DIALOG_BrowseSymbols(hDlg, filename, sizeof(filename))) SetDlgItemText(hDlg, PM_ICON_FILE, filename); return TRUE; @@ -518,6 +520,7 @@ static BOOL CALLBACK DIALOG_EXECUTE_DlgP case PM_BROWSE: { CHAR filename[MAX_PATHNAME_LEN]; + filename[0] = 0; if (DIALOG_BrowsePrograms(hDlg, filename, sizeof(filename))) SetDlgItemText(hDlg, PM_COMMAND, filename); return TRUE; @@ -559,21 +562,19 @@ static BOOL DIALOG_Browse(HWND hDlg, LPC { OPENFILENAME openfilename; - CHAR szPath[MAX_PATH]; CHAR szDir[MAX_PATH]; CHAR szDefaultExt[] = "exe"; ZeroMemory(&openfilename, sizeof(openfilename)); GetCurrentDirectory(sizeof(szDir), szDir); - lstrcpy(szPath,"*.exe"); - /* FIXME is this correct ? */ openfilename.lStructSize = sizeof(openfilename); openfilename.hwndOwner = Globals.hMainWnd; openfilename.hInstance = Globals.hInstance; - openfilename.lpstrFile = szPath; - openfilename.nMaxFile = sizeof(szPath); + openfilename.lpstrFilter = lpszzFilter; + openfilename.lpstrFile = lpstrFile; + openfilename.nMaxFile = nMaxFile; openfilename.lpstrInitialDir = szDir; openfilename.Flags = 0; openfilename.lpstrDefExt = szDefaultExt; @@ -591,7 +592,6 @@ static BOOL DIALOG_Browse(HWND hDlg, LPC openfilename.lpTemplateName = 0; return GetOpenFileName(&openfilename); - /* FIXME */ } /*********************************************************************** diff --git a/programs/progman/grpfile.c b/programs/progman/grpfile.c index 8174308..5b9d11f 100644 --- a/programs/progman/grpfile.c +++ b/programs/progman/grpfile.c @@ -399,16 +399,8 @@ BOOL GRPFILE_WriteGroupFile(HLOCAL hGrou MB_OKCANCEL | MB_DEFBUTTON2)) return FALSE; } - /* FIXME */ - if (OpenFile(szPath, &dummy, OF_EXIST) == HFILE_ERROR) - { - CHAR msg[MAX_PATHNAME_LEN + 200]; - wsprintf(msg, "Cause of a bug you must now touch the file %s\n", szPath); - MessageBox(Globals.hMainWnd, msg, "", MB_OK); - } - /* Open file */ - file = _lopen(szPath, OF_WRITE); + file = _lcreat(szPath, 0); if (file != HFILE_ERROR) { ret = GRPFILE_DoWriteGroupFile(file, group);

1 0

Mike McCormack : ole32: More tests and fixes for STGM_PRIORITY.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: 11e4b21a308930300edee16be006615cf5ed904c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=11e4b21a308930300edee16… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Apr 18 17:18:51 2006 +0900 ole32: More tests and fixes for STGM_PRIORITY. --- dlls/ole32/storage32.c | 8 +++++++- dlls/ole32/tests/storage32.c | 23 +++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index ef6b248..5e6696c 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5911,8 +5911,14 @@ HRESULT WINAPI StgOpenStorage( /* STGM_PRIORITY implies exclusive access */ if (grfMode & STGM_PRIORITY) { + if (grfMode & (STGM_TRANSACTED|STGM_SIMPLE|STGM_NOSCRATCH|STGM_NOSNAPSHOT)) + return STG_E_INVALIDFLAG; + if (grfMode & STGM_DELETEONRELEASE) + return STG_E_INVALIDFUNCTION; + if(STGM_ACCESS_MODE(grfMode) != STGM_READ) + return STG_E_INVALIDFLAG; grfMode &= ~0xf0; /* remove the existing sharing mode */ - grfMode |= STGM_SHARE_EXCLUSIVE; + grfMode |= STGM_SHARE_DENY_WRITE; } /* diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index d9668a5..e1f40f2 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -478,9 +478,32 @@ static void test_open_storage(void) stg = NULL; r = StgOpenStorage( filename, NULL, STGM_PRIORITY, NULL, 0, &stg); ok(r == S_OK, "should succeed\n"); + r = StgOpenStorage( filename, NULL, STGM_PRIORITY, NULL, 0, &stg2); + ok(r == S_OK, "should succeed\n"); + if (stg2) + IStorage_Release(stg2); if (stg) IStorage_Release(stg); + stg = NULL; + r = StgOpenStorage( filename, NULL, STGM_PRIORITY | STGM_READWRITE, NULL, 0, &stg); + ok(r == STG_E_INVALIDFLAG, "should fail\n"); + + r = StgOpenStorage( filename, NULL, STGM_TRANSACTED | STGM_PRIORITY, NULL, 0, &stg); + ok(r == STG_E_INVALIDFLAG, "should fail\n"); + + r = StgOpenStorage( filename, NULL, STGM_SIMPLE | STGM_PRIORITY, NULL, 0, &stg); + ok(r == STG_E_INVALIDFLAG, "should fail\n"); + + r = StgOpenStorage( filename, NULL, STGM_DELETEONRELEASE | STGM_PRIORITY, NULL, 0, &stg); + ok(r == STG_E_INVALIDFUNCTION, "should fail\n"); + + r = StgOpenStorage( filename, NULL, STGM_NOSCRATCH | STGM_PRIORITY, NULL, 0, &stg); + ok(r == STG_E_INVALIDFLAG, "should fail\n"); + + r = StgOpenStorage( filename, NULL, STGM_NOSNAPSHOT | STGM_PRIORITY, NULL, 0, &stg); + ok(r == STG_E_INVALIDFLAG, "should fail\n"); + r = DeleteFileW(filename); ok(r, "file didn't exist\n"); }

1 0