October 2020 - Wine-devel - list.winehq.org

[PATCH 2/5] riched20: Use row ptrs in the cursor from virtual co-ords function.
by Huw Davies 26 Oct '20

26 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 16 +++++++--------- dlls/riched20/editor.h | 2 ++ dlls/riched20/para.c | 19 +++++++++++++++++++ dlls/riched20/row.c | 4 ++-- 4 files changed, 30 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 0c5f221a7c4..5af4cd04d55 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -952,7 +952,7 @@ static BOOL cursor_from_virtual_coords( ME_TextEditor *editor, int x, int y, ME_Cursor *result, BOOL final_eop ) { ME_Paragraph *para = editor_first_para( editor ); - ME_DisplayItem *row = NULL; + ME_Row *row = NULL, *next_row; BOOL isExact = TRUE; x -= editor->rcFormat.left; @@ -966,7 +966,7 @@ static BOOL cursor_from_virtual_coords( ME_TextEditor *editor, int x, int y, if (para->nFlags & MEPF_ROWSTART) para = pixel_pos_in_table_row( x, y, para ); y -= para->pt.y; - row = ME_FindItemFwd( para_get_di( para ), diStartRow); + row = para_first_row( para ); break; } else if (para->nFlags & MEPF_ROWSTART) @@ -977,24 +977,22 @@ static BOOL cursor_from_virtual_coords( ME_TextEditor *editor, int x, int y, /* find row */ while (row) { - ME_DisplayItem *next_row; - - if (y < row->member.row.pt.y + row->member.row.nHeight) break; - next_row = ME_FindItemFwd(row, diStartRow); + if (y < row->pt.y + row->nHeight) break; + next_row = row_next( row ); if (!next_row) break; row = next_row; } - if (!row && !final_eop) + if (!row && !final_eop && para_prev( para )) { /* The position is below the last paragraph, so the last row will be used * rather than the end of the text, so the x position will be used to * determine the offset closest to the pixel position. */ isExact = FALSE; - row = ME_FindItemBack( para_get_di( para ), diStartRow); + row = para_end_row( para_prev( para ) ); } - if (row) return row_cursor( editor, &row->member.row, x, result ) && isExact; + if (row) return row_cursor( editor, row, x, result ) && isExact; ME_SetCursorToEnd(editor, result, TRUE); return FALSE; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index cf5e2d84fc2..7025ddceea7 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -213,7 +213,9 @@ void ME_SetDefaultParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPEC_ int get_total_width(ME_TextEditor *editor) DECLSPEC_HIDDEN; ME_Cell *para_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; void para_destroy( ME_TextEditor *editor, ME_Paragraph *item ) DECLSPEC_HIDDEN; +ME_Row *para_end_row( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Run *para_end_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; +ME_Row *para_first_row( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Run *para_first_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; BOOL para_in_table( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_first_fmt ) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index db258947916..e1b848cf8f9 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -130,6 +130,25 @@ ME_Cell *para_cell( ME_Paragraph *para ) return &para->pCell->member.cell; } +ME_Row *para_first_row( ME_Paragraph *para ) +{ + ME_DisplayItem *item; + + item = ME_FindItemFwd( para_get_di( para ), diStartRowOrParagraph ); + if (!item || item->type != diStartRow) return NULL; + return &item->member.row; +} + +ME_Row *para_end_row( ME_Paragraph *para ) +{ + ME_DisplayItem *item; + + para = para_next( para ); + item = ME_FindItemBack( para_get_di( para ), diStartRowOrParagraph ); + if (!item || item->type != diStartRow) return NULL; + return &item->member.row; +} + void ME_MakeFirstParagraph(ME_TextEditor *editor) { static const WCHAR cr_lf[] = {'\r','\n',0}; diff --git a/dlls/riched20/row.c b/dlls/riched20/row.c index a149231dcbe..ce8de935a19 100644 --- a/dlls/riched20/row.c +++ b/dlls/riched20/row.c @@ -28,8 +28,8 @@ ME_Row *row_next( ME_Row *row ) { ME_DisplayItem *item; - item = ME_FindItemFwd( row_get_di( row ), diStartRow ); - if (!item) return NULL; + item = ME_FindItemFwd( row_get_di( row ), diStartRowOrParagraphOrEnd ); + if (!item || item->type != diStartRow) return NULL; return &item->member.row; } -- 2.23.0

1 0

[PATCH 1/5] riched20: Pass a row ptr to the cursor from row function.
by Huw Davies 26 Oct '20

26 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 66 ++++++++++++++++++++---------------------- dlls/riched20/editor.h | 7 +++++ dlls/riched20/row.c | 29 +++++++++++++++++++ 3 files changed, 68 insertions(+), 34 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 4da6898bef8..0c5f221a7c4 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -903,40 +903,39 @@ static ME_Paragraph *pixel_pos_in_table_row( int x, int y, ME_Paragraph *para ) return para; } - -static BOOL cursor_from_row( ME_TextEditor *editor, ME_DisplayItem *pRow, - int x, ME_Cursor *cursor ) +static BOOL row_cursor( ME_TextEditor *editor, ME_Row *row, int x, + ME_Cursor *cursor ) { - ME_DisplayItem *pNext, *pLastRun; - ME_Row *row = &pRow->member.row; - BOOL exact = TRUE; + ME_Run *run, *last; + BOOL exact = TRUE; - if (x < row->pt.x) - { - x = row->pt.x; - exact = FALSE; - } - pNext = ME_FindItemFwd(pRow, diRunOrStartRow); - assert(pNext->type == diRun); - cursor->nOffset = 0; - do { - int run_x = pNext->member.run.pt.x; - int width = pNext->member.run.nWidth; - - if (x >= run_x && x < run_x+width) + if (x < row->pt.x) { - cursor->nOffset = ME_CharFromPoint(editor, x-run_x, &pNext->member.run, TRUE, TRUE); - cursor->pRun = pNext; - cursor->pPara = ME_GetParagraph( cursor->pRun ); - return exact; + x = row->pt.x; + exact = FALSE; } - pLastRun = pNext; - pNext = ME_FindItemFwd(pNext, diRunOrStartRow); - } while(pNext && pNext->type == diRun); - cursor->pRun = pLastRun; - cursor->pPara = ME_GetParagraph( cursor->pRun ); - return FALSE; + run = row_first_run( row ); + assert( run ); + cursor->nOffset = 0; + do + { + if (x >= run->pt.x && x < run->pt.x + run->nWidth) + { + cursor->nOffset = ME_CharFromPoint( editor, x - run->pt.x, run, TRUE, TRUE ); + cursor->pRun = run_get_di( run ); + cursor->pPara = para_get_di( run->para ); + return exact; + } + last = run; + run = row_next_run( row, run ); + } while (run); + + run = last; + + cursor->pRun = run_get_di( run ); + cursor->pPara = para_get_di( run->para ); + return FALSE; } /* Finds the run and offset from the pixel position. @@ -995,8 +994,7 @@ static BOOL cursor_from_virtual_coords( ME_TextEditor *editor, int x, int y, row = ME_FindItemBack( para_get_di( para ), diStartRow); } - - if (row) return cursor_from_row( editor, row, x, result ) && isExact; + if (row) return row_cursor( editor, &row->member.row, x, result ) && isExact; ME_SetCursorToEnd(editor, result, TRUE); return FALSE; @@ -1279,7 +1277,7 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs, BOOL /* row not found - ignore */ return; } - cursor_from_row( editor, pItem, x, pCursor ); + row_cursor( editor, &pItem->member.row, x, pCursor ); assert(pCursor->pRun); assert(pCursor->pRun->type == diRun); } @@ -1329,7 +1327,7 @@ static void ME_ArrowPageUp(ME_TextEditor *editor, ME_Cursor *pCursor) pLast = p; } while(1); - cursor_from_row( editor, pLast, x, pCursor ); + row_cursor( editor, &pLast->member.row, x, pCursor ); } assert(pCursor->pRun); assert(pCursor->pRun->type == diRun); @@ -1383,7 +1381,7 @@ static void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor) pLast = p; } while(1); - cursor_from_row( editor, pLast, x, pCursor ); + row_cursor( editor, &pLast->member.row, x, pCursor ); } assert(pCursor->pRun); assert(pCursor->pRun->type == diRun); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 68c54c2b328..cf5e2d84fc2 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -111,10 +111,17 @@ int ME_ReverseFindNonWhitespaceV(const ME_String *s, int nVChar) DECLSPEC_HIDDEN int ME_ReverseFindWhitespaceV(const ME_String *s, int nVChar) DECLSPEC_HIDDEN; /* row.c */ +ME_Run *row_first_run( ME_Row *row ) DECLSPEC_HIDDEN; +ME_Row *row_next( ME_Row *row ) DECLSPEC_HIDDEN; +ME_Run *row_next_run( ME_Row *row, ME_Run *run ) DECLSPEC_HIDDEN; ME_DisplayItem *ME_RowStart(ME_DisplayItem *item) DECLSPEC_HIDDEN; /* ME_DisplayItem *ME_RowEnd(ME_DisplayItem *item); */ ME_DisplayItem *ME_FindRowWithNumber(ME_TextEditor *editor, int nRow) DECLSPEC_HIDDEN; int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs) DECLSPEC_HIDDEN; +static inline ME_DisplayItem *row_get_di( ME_Row *row ) +{ + return (ME_DisplayItem *)((ptrdiff_t)row - offsetof(ME_DisplayItem, member)); +} /* run.c */ void cursor_from_char_ofs( ME_TextEditor *editor, int char_ofs, ME_Cursor *cursor ) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/row.c b/dlls/riched20/row.c index 1bf153f6ca9..a149231dcbe 100644 --- a/dlls/riched20/row.c +++ b/dlls/riched20/row.c @@ -24,6 +24,35 @@ #include "editor.h" +ME_Row *row_next( ME_Row *row ) +{ + ME_DisplayItem *item; + + item = ME_FindItemFwd( row_get_di( row ), diStartRow ); + if (!item) return NULL; + return &item->member.row; +} + +ME_Run *row_first_run( ME_Row *row ) +{ + ME_DisplayItem *item; + + item = ME_FindItemFwd( row_get_di( row ), diRunOrStartRow ); + assert( item->type == diRun ); + return &item->member.run; +} + +ME_Run *row_next_run( ME_Row *row, ME_Run *run ) +{ + ME_DisplayItem *item; + + assert( row == &ME_FindItemBack( run_get_di( run ), diStartRow )->member.row ); + + item = ME_FindItemFwd( run_get_di( run ), diRunOrStartRow ); + if (!item || item->type == diStartRow) return NULL; + return &item->member.run; +} + /* I'm sure these functions would simplify some code in caret ops etc, * I just didn't remember them when I wrote that code */ -- 2.23.0

1 0

[PATCH] wmic: Use wide-char string literals.
by Michael Stefaniuc 26 Oct '20

26 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/wmic/main.c | 81 +++++++++++--------------------------------- 1 file changed, 19 insertions(+), 62 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index f31a69a4241..1372c0986e9 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -31,36 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmic); -static const WCHAR biosW[] = - {'b','i','o','s',0}; -static const WCHAR computersystemW[] = - {'c','o','m','p','u','t','e','r','s','y','s','t','e','m',0}; -static const WCHAR cpuW[] = - {'c','p','u',0}; -static const WCHAR logicaldiskW[] = - {'L','o','g','i','c','a','l','D','i','s','k',0}; -static const WCHAR nicW[] = - {'n','i','c',0}; -static const WCHAR osW[] = - {'o','s',0}; -static const WCHAR processW[] = - {'p','r','o','c','e','s','s',0}; - -static const WCHAR win32_biosW[] = - {'W','i','n','3','2','_','B','I','O','S',0}; -static const WCHAR win32_computersystemW[] = - {'W','i','n','3','2','_','C','o','m','p','u','t','e','r','S','y','s','t','e','m',0}; -static const WCHAR win32_logicaldiskW[] = - {'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k',0}; -static const WCHAR win32_networkadapterW[] = - {'W','i','n','3','2','_','N','e','t','w','o','r','k','A','d','a','p','t','e','r',0}; -static const WCHAR win32_operatingsystemW[] = - {'W','i','n','3','2','_','O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; -static const WCHAR win32_processW[] = - {'W','i','n','3','2','_','P','r','o','c','e','s','s',0}; -static const WCHAR win32_processorW[] = - {'W','i','n','3','2','_','P','r','o','c','e','s','s','o','r',0}; - static const struct { const WCHAR *alias; @@ -68,13 +38,13 @@ static const struct } alias_map[] = { - { biosW, win32_biosW }, - { computersystemW, win32_computersystemW }, - { cpuW, win32_processorW }, - { logicaldiskW, win32_logicaldiskW }, - { nicW, win32_networkadapterW }, - { osW, win32_operatingsystemW }, - { processW, win32_processW } + { L"bios", L"Win32_BIOS" }, + { L"computersystem", L"Win32_ComputerSystem" }, + { L"cpu", L"Win32_Processor" }, + { L"LogicalDisk", L"Win32_LogicalDisk" }, + { L"nic", L"Win32_NetworkAdapter" }, + { L"os", L"Win32_OperatingSystem" }, + { L"process", L"Win32_Process" } }; static const WCHAR *find_class( const WCHAR *alias ) @@ -139,21 +109,20 @@ static int WINAPIV output_string( HANDLE handle, const WCHAR *msg, ... ) static int output_error( int msg ) { - static const WCHAR fmtW[] = {'%','s',0}; WCHAR buffer[8192]; LoadStringW( GetModuleHandleW(NULL), msg, buffer, ARRAY_SIZE(buffer)); - return output_string( GetStdHandle(STD_ERROR_HANDLE), fmtW, buffer ); + return output_string( GetStdHandle(STD_ERROR_HANDLE), L"%s", buffer ); } static int output_header( const WCHAR *prop, ULONG column_width ) { - static const WCHAR bomW[] = {0xfeff}, fmtW[] = {'%','-','*','s','\r','\n',0}; + static const WCHAR bomW[] = {0xfeff}; int len; DWORD count; WCHAR buffer[8192]; - len = swprintf( buffer, ARRAY_SIZE(buffer), fmtW, column_width, prop ); + len = swprintf( buffer, ARRAY_SIZE(buffer), L"%-*s\r\n", column_width, prop ); if (!WriteConsoleW( GetStdHandle(STD_OUTPUT_HANDLE), buffer, len, &count, NULL )) /* redirected */ { @@ -167,15 +136,11 @@ static int output_header( const WCHAR *prop, ULONG column_width ) static int output_line( const WCHAR *str, ULONG column_width ) { - static const WCHAR fmtW[] = {'%','-','*','s','\r','\n',0}; - return output_string( GetStdHandle(STD_OUTPUT_HANDLE), fmtW, column_width, str ); + return output_string( GetStdHandle(STD_OUTPUT_HANDLE), L"%-*s\r\n", column_width, str ); } static int query_prop( const WCHAR *class, const WCHAR *propname ) { - static const WCHAR select_allW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0}; - static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; - static const WCHAR wqlW[] = {'W','Q','L',0}; HRESULT hr; IWbemLocator *locator = NULL; IWbemServices *services = NULL; @@ -199,16 +164,16 @@ static int query_prop( const WCHAR *class, const WCHAR *propname ) (void **)&locator ); if (hr != S_OK) goto done; - if (!(path = SysAllocString( cimv2W ))) goto done; + if (!(path = SysAllocString(L"ROOT\\CIMV2" ))) goto done; hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); if (hr != S_OK) goto done; - len = lstrlenW( class ) + ARRAY_SIZE(select_allW); + len = lstrlenW( class ) + ARRAY_SIZE(L"SELECT * FROM "); if (!(query = SysAllocStringLen( NULL, len ))) goto done; - lstrcpyW( query, select_allW ); + lstrcpyW( query, L"SELECT * FROM " ); lstrcatW( query, class ); - if (!(wql = SysAllocString( wqlW ))) goto done; + if (!(wql = SysAllocString(L"WQL" ))) goto done; hr = IWbemServices_ExecQuery( services, wql, query, flags, NULL, &result ); if (hr != S_OK) goto done; @@ -267,12 +232,6 @@ done: int __cdecl wmain(int argc, WCHAR *argv[]) { - static const WCHAR getW[] = {'g','e','t',0}; - static const WCHAR quitW[] = {'q','u','i','t',0}; - static const WCHAR exitW[] = {'e','x','i','t',0}; - static const WCHAR pathW[] = {'p','a','t','h',0}; - static const WCHAR classW[] = {'c','l','a','s','s',0}; - static const WCHAR contextW[] = {'c','o','n','t','e','x','t',0}; const WCHAR *class, *value; int i; @@ -282,20 +241,18 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if (i >= argc) goto not_supported; - if (!wcsicmp( argv[i], quitW ) || - !wcsicmp( argv[i], exitW )) + if (!wcsicmp( argv[i], L"quit" ) || !wcsicmp( argv[i], L"exit" )) { return 0; } - if (!wcsicmp( argv[i], classW) || - !wcsicmp( argv[i], contextW )) + if (!wcsicmp( argv[i], L"class") || !wcsicmp( argv[i], L"context" )) { WINE_FIXME( "command %s not supported\n", debugstr_w(argv[i]) ); goto not_supported; } - if (!wcsicmp( argv[i], pathW )) + if (!wcsicmp( argv[i], L"path" )) { if (++i >= argc) { @@ -317,7 +274,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if (++i >= argc) goto not_supported; - if (!wcsicmp( argv[i], getW )) + if (!wcsicmp( argv[i], L"get" )) { if (++i >= argc) goto not_supported; -- 2.26.2

2 1

[PATCH] wmiutils: Use wide-char string literals.
by Michael Stefaniuc 26 Oct '20

26 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wmiutils/statuscode.c | 8 +-- dlls/wmiutils/tests/path.c | 141 +++++++++++++------------------------ 2 files changed, 50 insertions(+), 99 deletions(-) diff --git a/dlls/wmiutils/statuscode.c b/dlls/wmiutils/statuscode.c index fb2b7db21f1..7137bf1c699 100644 --- a/dlls/wmiutils/statuscode.c +++ b/dlls/wmiutils/statuscode.c @@ -92,13 +92,11 @@ static HRESULT WINAPI status_code_GetErrorCodeText( LONG flags, BSTR *text ) { - static const WCHAR fmt[] = - {'E','r','r','o','r',' ','c','o','d','e',':',' ','0','x','%','0','8','x',0}; WCHAR msg[32]; FIXME("%p, 0x%08x, 0x%04x, 0x%08x, %p\n", iface, res, lcid, flags, text); - swprintf(msg, ARRAY_SIZE(msg), fmt, res); + swprintf(msg, ARRAY_SIZE(msg), L"Error code: 0x%08x", res); *text = SysAllocString(msg); return WBEM_S_NO_ERROR; } @@ -110,13 +108,11 @@ static HRESULT WINAPI status_code_GetFacilityCodeText( LONG flags, BSTR *text ) { - static const WCHAR fmt[] = - {'F','a','c','i','l','i','t','y',' ','c','o','d','e',':',' ','0','x','%','0','8','x',0}; WCHAR msg[32]; FIXME("%p, 0x%08x, 0x%04x, 0x%08x, %p\n", iface, res, lcid, flags, text); - swprintf(msg, ARRAY_SIZE(msg), fmt, res); + swprintf(msg, ARRAY_SIZE(msg), L"Facility code: 0x%08x", res); *text = SysAllocString(msg); return WBEM_S_NO_ERROR; } diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index ecb42aa647c..0b5473c4d0d 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -25,53 +25,26 @@ #include "wbemcli.h" #include "wine/test.h" -static const WCHAR path1[] = {0}; -static const WCHAR path2[] = {'\\',0}; -static const WCHAR path3[] = {'\\','\\','s','e','r','v','e','r',0}; -static const WCHAR path4[] = {'\\','\\','s','e','r','v','e','r','\\',0}; -static const WCHAR path5[] = {'\\','\\','.','\\',0}; -static const WCHAR path6[] = {'/','/','.','/','r','o','o','t','/','c','i','m','v','2',0}; -static const WCHAR path7[] = - {'/','/','.','/','r','o','o','t','/','c','i','m','v','2',':','W','i','n','3','2','_', - 'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; -static const WCHAR path8[] = - {'/','r','o','o','t','/','c','i','m','v','2',':','W','i','n','3','2','_', - 'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; -static const WCHAR path9[] = - {'\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',':','W','i','n','3','2','_', - 'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; -static const WCHAR path10[] = - {'/','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',':','W','i','n','3','2','_', - 'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; -static const WCHAR path11[] = - {'/','/','.','\\','r','o','o','t','\\','c','i','m','v','2',':','W','i','n','3','2','_', - 'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; -static const WCHAR path12[] = - {'r','o','o','t','\\','c','i','m','v','2',':','W','i','n','3','2','_', - 'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; -static const WCHAR path13[] = - {'\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',0}; -static const WCHAR path14[] = - {'W','i','n','3','2','_','O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; -static const WCHAR path15[] = - {'r','o','o','t','\\','c','i','m','v','2',0}; -static const WCHAR path16[] = - {'\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',0}; -static const WCHAR path17[] = - {'\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',':','W','i','n','3','2','_', - 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','d','=', - '"','C',':','"',0}; -static const WCHAR path18[] = - {'\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',':','W','i','n','3','2','_', - 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','d','=', - '"','C',':','"',',','D','r','i','v','e','T','y','p','e','=','3',0}; -static const WCHAR path19[] = - {'\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',':','W','i','n','3','2','_', - 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','d','=',0}; -static const WCHAR path20[] = - {'\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',':','W','i','n','3','2','_', - 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','d',' ','=',' ', - '"','C',':','"',0}; +static const WCHAR path1[] = L""; +static const WCHAR path2[] = L"\\"; +static const WCHAR path3[] = L"\\\\server"; +static const WCHAR path4[] = L"\\\\server\\"; +static const WCHAR path5[] = L"\\\\.\\"; +static const WCHAR path6[] = L"//./root/cimv2"; +static const WCHAR path7[] = L"//./root/cimv2:Win32_OperatingSystem"; +static const WCHAR path8[] = L"/root/cimv2:Win32_OperatingSystem"; +static const WCHAR path9[] = L"\\\\.\\root\\cimv2:Win32_OperatingSystem"; +static const WCHAR path10[] = L"/\\.\\root\\cimv2:Win32_OperatingSystem"; +static const WCHAR path11[] = L"//.\\root\\cimv2:Win32_OperatingSystem"; +static const WCHAR path12[] = L"root\\cimv2:Win32_OperatingSystem"; +static const WCHAR path13[] = L"\\\\.\\root\\cimv2"; +static const WCHAR path14[] = L"Win32_OperatingSystem"; +static const WCHAR path15[] = L"root\\cimv2"; +static const WCHAR path16[] = L"\\\\.\\root\\cimv2"; +static const WCHAR path17[] = L"\\\\.\\root\\cimv2:Win32_LogicalDisk.DeviceId=\"C:\""; +static const WCHAR path18[] = L"\\\\.\\root\\cimv2:Win32_LogicalDisk.DeviceId=\"C:\",DriveType=3"; +static const WCHAR path19[] = L"\\\\.\\root\\cimv2:Win32_LogicalDisk.DeviceId="; +static const WCHAR path20[] = L"\\\\.\\root\\cimv2:Win32_LogicalDisk.DeviceId = \"C:\""; static IWbemPath *create_path(void) { @@ -161,20 +134,11 @@ static void test_IWbemPath_SetText(void) static void test_IWbemPath_GetText(void) { - static const WCHAR serviceW[] = - {'W','i','n','3','2','_','S','e','r','v','i','c','e','.','N','a','m','e','=', - '\"','S','e','r','v','i','c','e','\"',0}; - static const WCHAR classW[] = - {'W','i','n','3','2','_','C','l','a','s','s',0}; - static const WCHAR expected1W[] = - {'r','o','o','t','\\','c','i','m','v','2',':','W','i','n','3','2','_', - 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','d','=', - '"','C',':','"',0}; - static const WCHAR expected2W[] = - {'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k','.', - 'D','e','v','i','c','e','I','d','=','"','C',':','"',0}; - static const WCHAR expected3W[] = - {'\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',0}; + static const WCHAR serviceW[] = L"Win32_Service.Name=\"Service\""; + static const WCHAR classW[] = L"Win32_Class"; + static const WCHAR expected1W[] = L"root\\cimv2:Win32_LogicalDisk.DeviceId=\"C:\""; + static const WCHAR expected2W[] = L"Win32_LogicalDisk.DeviceId=\"C:\""; + static const WCHAR expected3W[] = L"\\\\.\\root\\cimv2"; WCHAR buf[128]; ULONG len, count; IWbemPath *path; @@ -364,7 +328,7 @@ static void test_IWbemPath_GetText(void) static void test_IWbemPath_GetClassName(void) { - static const WCHAR classW[] = {'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k',0}; + static const WCHAR classW[] = L"Win32_LogicalDisk"; IWbemPath *path; HRESULT hr; WCHAR buf[32]; @@ -412,8 +376,7 @@ static void test_IWbemPath_GetClassName(void) static void test_IWbemPath_SetClassName(void) { - static const WCHAR classW[] = {'c','l','a','s','s',0}; - static const WCHAR emptyW[] = {0}; + static const WCHAR classW[] = L"class"; IWbemPath *path; WCHAR buf[16]; ULONG len; @@ -425,7 +388,7 @@ static void test_IWbemPath_SetClassName(void) hr = IWbemPath_SetClassName( path, NULL ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - hr = IWbemPath_SetClassName( path, emptyW ); + hr = IWbemPath_SetClassName( path, L"" ); ok( hr == S_OK, "got %08x\n", hr ); hr = IWbemPath_SetClassName( path, classW ); @@ -450,7 +413,6 @@ static void test_IWbemPath_SetClassName(void) static void test_IWbemPath_GetServer(void) { - static const WCHAR dotW[] = {'.',0}; IWbemPath *path; HRESULT hr; WCHAR buf[32]; @@ -490,8 +452,8 @@ static void test_IWbemPath_GetServer(void) len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !lstrcmpW( buf, dotW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( dotW ) + 1, "unexpected length %u\n", len ); + ok( !lstrcmpW( buf, L"." ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( len == lstrlenW(L"." ) + 1, "unexpected length %u\n", len ); IWbemPath_Release( path ); } @@ -561,8 +523,6 @@ static void test_IWbemPath_GetInfo(void) static void test_IWbemPath_SetServer(void) { - static const WCHAR serverW[] = {'s','e','r','v','e','r',0}; - static const WCHAR emptyW[] = {0}; IWbemPath *path; WCHAR buf[16]; ULONG len; @@ -578,17 +538,17 @@ static void test_IWbemPath_SetServer(void) hr = IWbemPath_GetServer( path, &len, buf ); ok( hr == WBEM_E_NOT_AVAILABLE, "got %08x\n", hr ); - hr = IWbemPath_SetServer( path, emptyW ); + hr = IWbemPath_SetServer( path, L"" ); ok( hr == S_OK, "got %08x\n", hr ); - hr = IWbemPath_SetServer( path, serverW ); + hr = IWbemPath_SetServer( path, L"server" ); ok( hr == S_OK, "got %08x\n", hr ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !lstrcmpW( buf, serverW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( !lstrcmpW( buf, L"server" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); @@ -616,8 +576,6 @@ static void test_IWbemPath_SetServer(void) static void test_IWbemPath_GetNamespaceAt(void) { - static const WCHAR rootW[] = {'r','o','o','t',0}; - static const WCHAR cimv2W[] = {'c','i','m','v','2',0}; IWbemPath *path; HRESULT hr; WCHAR buf[32]; @@ -657,15 +615,15 @@ static void test_IWbemPath_GetNamespaceAt(void) len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !lstrcmpW( buf, rootW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( rootW ) + 1, "unexpected length %u\n", len ); + ok( !lstrcmpW( buf, L"root" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( len == lstrlenW( L"root" ) + 1, "unexpected length %u\n", len ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 1, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !lstrcmpW( buf, cimv2W ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( cimv2W ) + 1, "unexpected length %u\n", len ); + ok( !lstrcmpW( buf, L"cimv2" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %u\n", len ); IWbemPath_Release( path ); } @@ -719,7 +677,6 @@ static void test_IWbemPath_RemoveNamespaceAt(void) WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_INST_REF | WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_PATH_HAD_SERVER; - static const WCHAR cimv2W[] = {'c','i','m','v','2',0}; IWbemPath *path; WCHAR buf[16]; ULONG len, count; @@ -763,8 +720,8 @@ static void test_IWbemPath_RemoveNamespaceAt(void) len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !lstrcmpW( buf, cimv2W ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( cimv2W ) + 1, "unexpected length %u\n", len ); + ok( !lstrcmpW( buf, L"cimv2" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %u\n", len ); hr = IWbemPath_RemoveNamespaceAt( path, 0 ); ok( hr == S_OK, "got %08x\n", hr ); @@ -794,8 +751,6 @@ static void test_IWbemPath_SetNamespaceAt(void) WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_V1_COMPLIANT | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY; - static const WCHAR rootW[] = {'r','o','o','t',0}; - static const WCHAR cimv2W[] = {'c','i','m','v','2',0}; IWbemPath *path; WCHAR buf[16]; ULONG len, count; @@ -807,10 +762,10 @@ static void test_IWbemPath_SetNamespaceAt(void) hr = IWbemPath_SetNamespaceAt( path, 0, NULL ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - hr = IWbemPath_SetNamespaceAt( path, 1, cimv2W ); + hr = IWbemPath_SetNamespaceAt( path, 1, L"cimv2" ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - hr = IWbemPath_SetNamespaceAt( path, 0, cimv2W ); + hr = IWbemPath_SetNamespaceAt( path, 0, L"cimv2" ); ok( hr == S_OK, "got %08x\n", hr ); count = 0xdeadbeef; @@ -828,10 +783,10 @@ static void test_IWbemPath_SetNamespaceAt(void) len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !lstrcmpW( buf, cimv2W ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( cimv2W ) + 1, "unexpected length %u\n", len ); + ok( !lstrcmpW( buf, L"cimv2" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %u\n", len ); - hr = IWbemPath_SetNamespaceAt( path, 0, rootW ); + hr = IWbemPath_SetNamespaceAt( path, 0, L"root" ); ok( hr == S_OK, "got %08x\n", hr ); flags = 0; @@ -849,15 +804,15 @@ static void test_IWbemPath_SetNamespaceAt(void) len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !lstrcmpW( buf, rootW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( rootW ) + 1, "unexpected length %u\n", len ); + ok( !lstrcmpW( buf, L"root" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( len == lstrlenW( L"root" ) + 1, "unexpected length %u\n", len ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 1, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !lstrcmpW( buf, cimv2W ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( cimv2W ) + 1, "unexpected length %u\n", len ); + ok( !lstrcmpW( buf, L"cimv2" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %u\n", len ); IWbemPath_Release( path ); } -- 2.26.2

2 1

[PATCH] ncrypt: Add NCryptIsKeyHandle stub
by Vitaly Lipatov 26 Oct '20

26 Oct '20

Signed-off-by: Vitaly Lipatov <lav(a)etersoft.ru> --- dlls/ncrypt/main.c | 6 ++++++ dlls/ncrypt/ncrypt.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index c0cc05c43ca..a8dda3c54a0 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -132,6 +132,12 @@ SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const W return NTE_NOT_SUPPORTED; } +BOOL WINAPI NCryptIsKeyHandle(NCRYPT_KEY_HANDLE hKey) +{ + FIXME("(0x%lx): stub\n", hKey); + return FALSE; +} + SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, const WCHAR *name, DWORD keyspec, DWORD flags) { diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 2b5a4fca420..0e92609790c 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -78,7 +78,7 @@ @ stub NCryptGetProtectionDescriptorInfo @ stdcall NCryptImportKey(long long wstr ptr ptr ptr long long) @ stub NCryptIsAlgSupported(long wstr long) -@ stub NCryptIsKeyHandle +@ stdcall NCryptIsKeyHandle(long) @ stub NCryptKeyDerivation @ stub NCryptNotifyChangeKey @ stdcall NCryptOpenKey(long ptr wstr long long) -- 2.25.4

2 1

[PATCH] include: Add missing DBPARAM* types and enums
by Alistair Leslie-Hughes 26 Oct '20

26 Oct '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/dbs.idl | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/include/dbs.idl b/include/dbs.idl index 65fd5b1d365..92265882016 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -800,3 +800,28 @@ typedef struct tagDBCOLUMNINFO { BYTE bScale; DBID columnid; } DBCOLUMNINFO; + +typedef DWORD DBPARAMFLAGS; + +enum DBPARAMFLAGSENUM { + DBPARAMFLAGS_ISINPUT = 0x001, + DBPARAMFLAGS_ISOUTPUT = 0x002, + DBPARAMFLAGS_ISSIGNED = 0x010, + DBPARAMFLAGS_ISNULLABLE = 0x040, + DBPARAMFLAGS_ISLONG = 0x080 +}; + +enum DBPARAMFLAGSENUM20 { + DBPARAMFLAGS_SCALEISNEGATIVE = 0x100 +}; + +typedef struct tagDBPARAMINFO { + DBPARAMFLAGS dwFlags; + DBORDINAL iOrdinal; + LPOLESTR pwszName; + ITypeInfo *pTypeInfo; + DBLENGTH ulParamSize; + DBTYPE wType; + BYTE bPrecision; + BYTE bScale; +} DBPARAMINFO; -- 2.28.0

1 0

unsubscribe
by Alexandre Viau 25 Oct '20

25 Oct '20

1 0

[PATCH 1/3] d2d1: Implement D2D1SinCos
by Giovanni Mascellani 25 Oct '20

25 Oct '20

Signed-off-by: Giovanni Mascellani <wine(a)mascellani.eu> --- dlls/d2d1/d2d1.spec | 2 +- dlls/d2d1/factory.c | 6 ++++++ dlls/d2d1/tests/d2d1.c | 29 +++++++++++++++++++++++++++++ include/d2d1_1.idl | 1 + 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1.spec b/dlls/d2d1/d2d1.spec index 0ebcd0af553..410abfa5de6 100644 --- a/dlls/d2d1/d2d1.spec +++ b/dlls/d2d1/d2d1.spec @@ -6,6 +6,6 @@ @ stub D2D1ConvertColorSpace @ stdcall D2D1CreateDevice(ptr ptr ptr) @ stub D2D1CreateDeviceContext -@ stub D2D1SinCos +@ stdcall D2D1SinCos(float ptr ptr) @ stub D2D1Tan @ stub D2D1Vec3Length diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 2f50836bbcd..2cce8afc4a4 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -713,6 +713,12 @@ HRESULT WINAPI D2D1CreateDevice(IDXGIDevice *dxgi_device, return hr; } +void WINAPI D2D1SinCos(float angle, float *s, float *c) +{ + *s = sinf(angle); + *c = cosf(angle); +} + static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const char *name, DWORD *value) { DWORD type, data, size; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 166cdfccda6..9ec86eac3a5 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9425,6 +9425,34 @@ static void test_wic_bitmap_format(void) DestroyWindow(window); } +static void test_math(void) +{ + float s, c; + int i; + + static const struct + { + float x; + float s; + float c; + } + sc_data[] = + { + {0.0, 0.0, 1.0}, + {1.0, 8.41470957e-001, 5.40302277e-001}, + {2.0, 9.09297407e-001, -4.16146845e-001}, + {M_PI / 2.0, 1.0, -4.37113883e-008}, + {M_PI, -8.74227766e-008, -1.0}, + }; + + for (i = 0; i < ARRAY_SIZE(sc_data); ++i) + { + D2D1SinCos(sc_data[i].x, &s, &c); + ok(compare_float(s, sc_data[i].s, 0), "Wrong sin(%.8e) (%.8e instead of %.8e).\n", sc_data[i].x, s, sc_data[i].s); + ok(compare_float(c, sc_data[i].c, 0), "Wrong cos(%.8e) (%.8e instead of %.8e).\n", sc_data[i].x, c, sc_data[i].c); + } +} + START_TEST(d2d1) { unsigned int argc, i; @@ -9477,6 +9505,7 @@ START_TEST(d2d1) queue_test(test_max_bitmap_size); queue_test(test_dpi); queue_test(test_wic_bitmap_format); + queue_test(test_math); run_queued_tests(); } diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index ddb7669c24b..6fa893edbda 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -794,3 +794,4 @@ interface ID2D1Factory1 : ID2D1Factory [local] HRESULT __stdcall D2D1CreateDevice(IDXGIDevice *dxgi_device, const D2D1_CREATION_PROPERTIES *creation_properties, ID2D1Device **device); +[local] void __stdcall D2D1SinCos(float angle, float *s, float *c); -- 2.28.0

2 5

[PATCH 1/2] d3d8thk: add stub dll
by Austin English 25 Oct '20

25 Oct '20

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- configure.ac | 1 + dlls/d3d8thk/Makefile.in | 8 ++++++ dlls/d3d8thk/d3d8thk.spec | 56 +++++++++++++++++++++++++++++++++++++ dlls/d3d8thk/d3d8thk_main.c | 42 ++++++++++++++++++++++++++++ dlls/d3d8thk/version.rc | 26 +++++++++++++++++ 5 files changed, 133 insertions(+) create mode 100644 dlls/d3d8thk/Makefile.in create mode 100644 dlls/d3d8thk/d3d8thk.spec create mode 100644 dlls/d3d8thk/d3d8thk_main.c create mode 100644 dlls/d3d8thk/version.rc diff --git a/configure.ac b/configure.ac index 372785ee0fd..331ae064bdc 100644 --- a/configure.ac +++ b/configure.ac @@ -3137,6 +3137,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3d12) WINE_CONFIG_MAKEFILE(dlls/d3d12/tests) WINE_CONFIG_MAKEFILE(dlls/d3d8) WINE_CONFIG_MAKEFILE(dlls/d3d8/tests) +WINE_CONFIG_MAKEFILE(dlls/d3d8thk) WINE_CONFIG_MAKEFILE(dlls/d3d9) WINE_CONFIG_MAKEFILE(dlls/d3d9/tests) WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_33) diff --git a/dlls/d3d8thk/Makefile.in b/dlls/d3d8thk/Makefile.in new file mode 100644 index 00000000000..b84c8d171f1 --- /dev/null +++ b/dlls/d3d8thk/Makefile.in @@ -0,0 +1,8 @@ +MODULE = d3d8thk.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + d3d8thk_main.c + +RC_SRCS = version.rc diff --git a/dlls/d3d8thk/d3d8thk.spec b/dlls/d3d8thk/d3d8thk.spec new file mode 100644 index 00000000000..98e5d6c64a1 --- /dev/null +++ b/dlls/d3d8thk/d3d8thk.spec @@ -0,0 +1,56 @@ +@ stub OsThunkD3dContextCreate +@ stub OsThunkD3dContextDestroy +@ stub OsThunkD3dContextDestroyAll +@ stub OsThunkD3dDrawPrimitives2 +@ stub OsThunkD3dValidateTextureStageState +@ stub OsThunkDdAddAttachedSurface +@ stub OsThunkDdAlphaBlt +@ stub OsThunkDdAttachSurface +@ stub OsThunkDdBeginMoCompFrame +@ stub OsThunkDdBlt +@ stub OsThunkDdCanCreateD3DBuffer +@ stub OsThunkDdCanCreateSurface +@ stub OsThunkDdColorControl +@ stub OsThunkDdCreateD3DBuffer +@ stub OsThunkDdCreateDirectDrawObject +@ stub OsThunkDdCreateMoComp +@ stub OsThunkDdCreateSurface +@ stub OsThunkDdCreateSurfaceEx +@ stub OsThunkDdCreateSurfaceObject +@ stub OsThunkDdDeleteDirectDrawObject +@ stub OsThunkDdDeleteSurfaceObject +@ stub OsThunkDdDestroyD3DBuffer +@ stub OsThunkDdDestroyMoComp +@ stub OsThunkDdDestroySurface +@ stub OsThunkDdEndMoCompFrame +@ stub OsThunkDdFlip +@ stub OsThunkDdFlipToGDISurface +@ stub OsThunkDdGetAvailDriverMemory +@ stub OsThunkDdGetBltStatus +@ stub OsThunkDdGetDC +@ stub OsThunkDdGetDriverInfo +@ stub OsThunkDdGetDriverState +@ stub OsThunkDdGetDxHandle +@ stub OsThunkDdGetFlipStatus +@ stub OsThunkDdGetInternalMoCompInfo +@ stub OsThunkDdGetMoCompBuffInfo +@ stub OsThunkDdGetMoCompFormats +@ stub OsThunkDdGetMoCompGuids +@ stub OsThunkDdGetScanLine +@ stub OsThunkDdLock +@ stub OsThunkDdLockD3D +@ stub OsThunkDdQueryDirectDrawObject +@ stub OsThunkDdQueryMoCompStatus +@ stub OsThunkDdReenableDirectDrawObject +@ stub OsThunkDdReleaseDC +@ stub OsThunkDdRenderMoComp +@ stub OsThunkDdResetVisrgn +@ stub OsThunkDdSetColorKey +@ stub OsThunkDdSetExclusiveMode +@ stub OsThunkDdSetGammaRamp +@ stub OsThunkDdSetOverlayPosition +@ stub OsThunkDdUnattachSurface +@ stub OsThunkDdUnlock +@ stub OsThunkDdUnlockD3D +@ stub OsThunkDdUpdateOverlay +@ stub OsThunkDdWaitForVerticalBlank \ No newline at end of file diff --git a/dlls/d3d8thk/d3d8thk_main.c b/dlls/d3d8thk/d3d8thk_main.c new file mode 100644 index 00000000000..1d89cb48720 --- /dev/null +++ b/dlls/d3d8thk/d3d8thk_main.c @@ -0,0 +1,42 @@ +/* + * + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d8thk); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/d3d8thk/version.rc b/dlls/d3d8thk/version.rc new file mode 100644 index 00000000000..444630a7745 --- /dev/null +++ b/dlls/d3d8thk/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine d3d8thk" +#define WINE_FILENAME_STR "d3d8thk.dll" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc" -- 2.28.0

2 3

[PATCH 2/2] d3dim700: add stub dll
by Austin English 25 Oct '20

25 Oct '20

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- configure.ac | 1 + dlls/d3dim700/Makefile.in | 8 +++++++ dlls/d3dim700/d3dim700.spec | 18 +++++++++++++++ dlls/d3dim700/d3dim700_main.c | 42 +++++++++++++++++++++++++++++++++++ dlls/d3dim700/version.rc | 26 ++++++++++++++++++++++ 5 files changed, 95 insertions(+) create mode 100644 dlls/d3dim700/Makefile.in create mode 100644 dlls/d3dim700/d3dim700.spec create mode 100644 dlls/d3dim700/d3dim700_main.c create mode 100644 dlls/d3dim700/version.rc diff --git a/configure.ac b/configure.ac index 331ae064bdc..2f81fd22610 100644 --- a/configure.ac +++ b/configure.ac @@ -3156,6 +3156,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_46) WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_47) WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_47/tests) WINE_CONFIG_MAKEFILE(dlls/d3dim) +WINE_CONFIG_MAKEFILE(dlls/d3dim700) WINE_CONFIG_MAKEFILE(dlls/d3drm) WINE_CONFIG_MAKEFILE(dlls/d3drm/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_33) diff --git a/dlls/d3dim700/Makefile.in b/dlls/d3dim700/Makefile.in new file mode 100644 index 00000000000..12a28ae475a --- /dev/null +++ b/dlls/d3dim700/Makefile.in @@ -0,0 +1,8 @@ +MODULE = d3dim700.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + d3dim700_main.c + +RC_SRCS = version.rc diff --git a/dlls/d3dim700/d3dim700.spec b/dlls/d3dim700/d3dim700.spec new file mode 100644 index 00000000000..931b3dd9f68 --- /dev/null +++ b/dlls/d3dim700/d3dim700.spec @@ -0,0 +1,18 @@ +@ stub D3DFree +@ stub D3DMalloc +@ stub D3DRealloc +@ stub Direct3DCreateDevice +@ stub CreateTexture +@ stub D3DBreakVBLock +@ stub D3DTextureUpdate +@ stub DestroyTexture +@ stub Direct3DCreate +@ stub Direct3D_HALCleanUp +@ stub FlushD3DDevices +@ stub GetLOD +@ stub GetPriority +@ stub PaletteAssociateNotify +@ stub PaletteUpdateNotify +@ stub SetLOD +@ stub SetPriority +@ stub SurfaceFlipNotify \ No newline at end of file diff --git a/dlls/d3dim700/d3dim700_main.c b/dlls/d3dim700/d3dim700_main.c new file mode 100644 index 00000000000..18a211ccc74 --- /dev/null +++ b/dlls/d3dim700/d3dim700_main.c @@ -0,0 +1,42 @@ +/* + * + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dim700); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/d3dim700/version.rc b/dlls/d3dim700/version.rc new file mode 100644 index 00000000000..cff97677690 --- /dev/null +++ b/dlls/d3dim700/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine d3dim700" +#define WINE_FILENAME_STR "d3dim700.dll" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc" -- 2.28.0

1 0